Merge branch 'master' of https://github.com/xeokit/xeokit-sdk

xeokit · Jan 27, 2021 · 0a03432 · 0a03432
2 parents 631d29d + 7a5c2d4
commit 0a03432
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/viewer/scene/CameraControl/lib/controllers/PickController.js b/src/viewer/scene/CameraControl/lib/controllers/PickController.js
@@ -111,7 +111,7 @@ class PickController {
 
             this.pickResult = this._scene.pick({
                 pickSurface: true,
-                pickSurfaceNormal: true,
+                pickSurfaceNormal: false,
                 canvasPos: this.pickCursorPos
             });
 

diff --git a/src/viewer/scene/scene/Scene.js b/src/viewer/scene/scene/Scene.js
@@ -1988,7 +1988,7 @@ class Scene extends Component {
         pickResult = this._renderer.pick(params, pickResult);
 
         if (pickResult) {
-            if (pickResult.entity.fire) {
+            if (pickResult.entity && pickResult.entity.fire) {
                 pickResult.entity.fire("picked", pickResult); // TODO: PerformanceModelNode doesn't fire events
             }
             return pickResult;

diff --git a/src/viewer/scene/webgl/Renderer.js b/src/viewer/scene/webgl/Renderer.js
@@ -894,7 +894,9 @@ const Renderer = function (scene, options) {
                         nearAndFar[1] = scene.camera.project.far;
 
                         pickWorldPos(pickable, canvasX, canvasY, pickViewMatrix, pickProjMatrix, nearAndFar, pickResult);
-                        pickWorldNormal(pickable, canvasX, canvasY, pickViewMatrix, pickProjMatrix, nearAndFar, pickResult);
+                        if (params.pickSurfaceNormal !== false) {
+                            pickWorldNormal(pickable, canvasX, canvasY, pickViewMatrix, pickProjMatrix, nearAndFar, pickResult);
+                        }
                     }
                 }
             }