Gitignore 'entwine' for locally hosted data capability. Don't alter relative EPT URLs.

Author: connormanning

.gitignore

@@ -1,3 +1,4 @@
 private/*
 data/test.html
+entwine/
 

build/potree/potree.js

@@ -11391,8 +11391,12 @@ void main() {
 					exports.lru.touch(node);
 					this.highestLevelServed = Math.max(node.getLevel(), this.highestLevelServed);
 
-					let doTraverse = (node.level % node.pcoGeometry.hierarchyStepSize) === 0 && node.hasChildren;
-					doTraverse = doTraverse || node.getLevel() === 0;
+					var geom = node.pcoGeometry;
+					var hierarchyStepSize = geom ? geom.hierarchyStepSize : 1;
+
+					var doTraverse = node.getLevel() === 0 ||
+						(node.level % hierarchyStepSize === 0 && node.hasChildren);
+
 					if (doTraverse) {
 						this.traverse(node);
 					}
@@ -11456,7 +11460,7 @@ void main() {
 					view[i * 3 + 0],
 					view[i * 3 + 1],
 					view[i * 3 + 2]);
-			
+
 				pos.applyMatrix4(matrix);
 				let distance = Math.abs(segment.cutPlane.distanceToPoint(pos));
 				let centerDistance = Math.abs(segment.halfPlane.distanceToPoint(pos));
@@ -11520,7 +11524,7 @@ void main() {
 
 						let start = new THREE.Vector3(segment.start.x, segment.start.y, bsWorld.center.z);
 						let end = new THREE.Vector3(segment.end.x, segment.end.y, bsWorld.center.z);
-							
+
 						let closest = new THREE.Line3(start, end).closestPointToPoint(bsWorld.center, true, new THREE.Vector3());
 						let distance = closest.distanceTo(bsWorld.center);
 
@@ -11594,7 +11598,7 @@ void main() {
 						for(let i = 0; i < accepted.length; i++){
 
 							let index = accepted[i];
-							
+
 							let start = index * numElements;
 							let end = start + numElements;
 							let sub = source.subarray(start, end);
@@ -21179,7 +21183,7 @@ ENDSEC
 					let range = material.elevationRange;
 
 					panel.find('#lblHeightRange').html(`${range[0].toFixed(2)} to ${range[1].toFixed(2)}`);
-					panel.find('#sldHeightRang').slider({min: bMin, max: bMax, values: range});
+					panel.find('#sldHeightRange').slider({min: bMin, max: bMax, values: range});
 				};
 
 				let updateIntensityRange = function () {

build/potree/potree.js.map

@@ -309,7 +309,9 @@ var normalizePath = (p) => {
 
     if (!path.endsWith('ept.json')) {
         path = appendSlash(path) + 'ept.json';
-        if (!path.startsWith('http')) path = 'http://' + path;
+        if (!path.startsWith('http') && !path.startsWith('/')) {
+            path = 'http://' + path;
+        }
     }
 
     name = path.replace('/ept.json', '').split('/').pop();
@@ -404,6 +406,18 @@ resources.forEach((p, i) => {
         if (pcs.every((v) => v)) {
             console.log('All point clouds loaded');
             init(resources.length == 1 ? name : null);
+
+            if (window.config.color &&
+                window.config.color.length == resources.length) {
+                var fromRgb = function(a) {
+                    a = a.map(v => v / 255)
+                    return { r: a[0], g: a[1], b: a[2] }
+                }
+                for (var c = 0; c < resources.length; ++c) {
+                    viewer.scene.pointclouds[c].material.color =
+                        fromRgb(window.config.color[c])
+                }
+            }
         }
     });
 });