review

iTowns · Jun 29, 2018 · 005bb62 · 005bb62
1 parent fe850ac
commit 005bb62
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 27 deletions.
diff --git a/src/Parser/PotreeBinParser.js b/src/Parser/PotreeBinParser.js
@@ -55,11 +55,10 @@ for (const potreeName of Object.keys(POINT_ATTTRIBUTES)) {
     attr.byteSize = attr.numElements * attr.numByte;
     attr.normalized = attr.normalized || false;
     // chrome is known to perform badly when we call a method without respecting its arity
-    // also, not using ternary because I measured a 25% perf hit on firefox doing so...
     const fnName = `getUint${attr.numByte * 8}`;
-    attr.value = attr.numByte === 1 ?
-        function value(view, offset) { return view[fnName](offset); } :
-        function value(view, offset) { return view[fnName](offset, true); };
+    attr.getValue = attr.numByte === 1 ?
+        function getValue(view, offset) { return view[fnName](offset); } :
+        function getValue(view, offset) { return view[fnName](offset, true); };
 }
 
 export default {
@@ -93,7 +92,7 @@ export default {
             const array = new attr.arrayType(arrayLength);
             for (let arrayOffset = 0; arrayOffset < arrayLength; arrayOffset += attr.numElements) {
                 for (let elemIdx = 0; elemIdx < attr.numElements; elemIdx++) {
-                    array[arrayOffset + elemIdx] = attr.value(view, attrOffset + elemIdx * attr.numByte);
+                    array[arrayOffset + elemIdx] = attr.getValue(view, attrOffset + elemIdx * attr.numByte);
                 }
                 attrOffset += pointByteSize;
             }

diff --git a/src/Process/PointCloudProcessing.js b/src/Process/PointCloudProcessing.js
@@ -103,7 +103,6 @@ export default {
             layer.material.opacity = layer.opacity;
             layer.material.transparent = layer.opacity < 1;
             layer.material.size = layer.pointSize;
-            layer.material.mode = layer.mode;
         }
 
         // lookup lowest common ancestor of changeSources

diff --git a/src/Provider/PointCloudProvider.js b/src/Provider/PointCloudProvider.js
@@ -168,6 +168,7 @@ export default {
         layer.type = 'geometry';
         layer.material = layer.material || {};
         layer.material = layer.material.isMaterial ? layer.material : new PointsMaterial(layer.material);
+        layer.material.defines = layer.material.defines || {};
         layer.mode = MODE.COLOR;
 
         // default update methods

diff --git a/src/Renderer/PointsMaterial.js b/src/Renderer/PointsMaterial.js
@@ -5,10 +5,9 @@ import Capabilities from '../Core/System/Capabilities';
 
 export const MODE = {
     COLOR: 0,
-    PICKING: 1,
-    INTENSITY: 2,
-    CLASSIFICATION: 3,
-    NORMAL: 4,
+    INTENSITY: 1,
+    CLASSIFICATION: 2,
+    NORMAL: 3,
 };
 
 class PointsMaterial extends RawShaderMaterial {
@@ -21,7 +20,7 @@ class PointsMaterial extends RawShaderMaterial {
         this.scale = options.scale || 0.05 * 0.5 / Math.tan(1.0 / 2.0); // autosizing scale
         this.overlayColor = options.overlayColor || new Vector4(0, 0, 0, 0);
         this.mode = options.mode || MODE.COLOR;
-        this.oldMode = null;
+        this.picking = false;
 
         for (const key in MODE) {
             if (Object.prototype.hasOwnProperty.call(MODE, key)) {
@@ -31,7 +30,7 @@ class PointsMaterial extends RawShaderMaterial {
 
         this.uniforms.size = new Uniform(this.size);
         this.uniforms.mode = new Uniform(this.mode);
-        this.uniforms.pickingMode = new Uniform(false);
+        this.uniforms.pickingMode = new Uniform(this.picking);
         this.uniforms.opacity = new Uniform(this.opacity);
         this.uniforms.overlayColor = new Uniform(this.overlayColor);
 
@@ -46,24 +45,17 @@ class PointsMaterial extends RawShaderMaterial {
         this.updateUniforms();
     }
 
-    enablePicking(pickingMode) {
-        // we don't want pixels to blend over already drawn pixels
-        this.blending = pickingMode ? NoBlending : NormalBlending;
-        if (pickingMode) {
-            if (this.uniforms.mode.value !== MODE.PICKING) {
-                this.oldMode = this.uniforms.mode.value;
-                this.uniforms.mode.value = MODE.PICKING;
-            }
-        } else {
-            this.uniforms.mode.value = this.oldMode || this.uniforms.mode.value;
-            this.oldMode = null;
-        }
+    enablePicking(picking) {
+        this.picking = picking;
+        this.blending = picking ? NoBlending : NormalBlending;
+        this.updateUniforms();
     }
 
     updateUniforms() {
         // if size is null, switch to autosizing using the canvas height
         this.uniforms.size.value = (this.size > 0) ? this.size : -this.scale * window.innerHeight;
-        this.uniforms.mode.value = this.mode || MODE.COLOR;
+        this.uniforms.mode.value = this.mode;
+        this.uniforms.pickingMode.value = this.picking;
         this.uniforms.opacity.value = this.opacity;
         this.uniforms.overlayColor.value = this.overlayColor;
     }
@@ -74,6 +66,7 @@ class PointsMaterial extends RawShaderMaterial {
         this.transparent = source.transparent;
         this.size = source.size;
         this.mode = source.mode;
+        this.picking = source.picking;
         this.scale = source.scale;
         this.overlayColor.copy(source.overlayColor);
         this.updateUniforms();

diff --git a/src/Renderer/Shader/PointsVS.glsl b/src/Renderer/Shader/PointsVS.glsl
@@ -9,6 +9,7 @@ uniform mat4 projectionMatrix;
 uniform mat4 modelViewMatrix;
 uniform float size;
 
+uniform bool pickingMode;
 uniform int mode;
 uniform float opacity;
 uniform vec4 overlayColor;
@@ -57,7 +58,7 @@ vec3 decodeSphereMappedNormal(vec2 encodedNormal) {
 #endif
 
 void main() {
-    if (mode == MODE_PICKING) {
+    if (pickingMode) {
         vColor = unique_id;
     } else if (mode == MODE_INTENSITY) {
         vColor = vec4(intensity, intensity, intensity, opacity);

diff --git a/utils/debug/PointCloudDebug.js b/utils/debug/PointCloudDebug.js
@@ -31,10 +31,13 @@ export default {
         layer.dbgDisplaybbox = false;
 
         var styleUI = layer.debugUI.addFolder('Styling');
-        styleUI.add(layer, 'mode', MODE).name('Display mode').onChange(update);
+        styleUI.add(layer.material, 'mode', MODE).name('Display mode').onChange(update);
         styleUI.add(layer, 'opacity', 0, 1).name('Layer Opacity').onChange(update);
         styleUI.add(layer, 'pointSize', 0, 15).name('Point Size').onChange(update);
         styleUI.add(layer, 'dbgDisplaybbox').name('Display Bounding Boxes').onChange(update);
+        styleUI.add(layer.material, 'picking').name('Display picking id').onChange((value) => {
+            update();
+        });
 
         // UI
         const sticky = layer.debugUI.addFolder('Sticky');