Merge pull request #531 from felixveysseyre/handle-pinch-fix

fix(interaction): Fixed issue when scrolling in unclicked window
Kitware · Jan 25, 2018 · 4d43eb5 · 4d43eb5
2 parents a0f40de + 24f670f
commit 4d43eb5
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/Sources/Interaction/Style/InteractorStyleTrackballCamera/index.js b/Sources/Interaction/Style/InteractorStyleTrackballCamera/index.js
@@ -183,25 +183,28 @@ function vtkInteractorStyleTrackballCamera(publicAPI, model) {
     const pos = model.interactor.getEventPosition(
       model.interactor.getPointerIndex()
     );
-    publicAPI.findPokedRenderer(pos.x, pos.y);
-    if (model.currentRenderer === null) {
-      return;
-    }
 
-    const camera = model.currentRenderer.getActiveCamera();
+    if (pos) {
+      publicAPI.findPokedRenderer(pos.x, pos.y);
+      if (model.currentRenderer === null) {
+        return;
+      }
 
-    const dyf = model.interactor.getScale() / model.interactor.getLastScale();
-    if (camera.getParallelProjection()) {
-      camera.setParallelScale(camera.getParallelScale() / dyf);
-    } else {
-      camera.dolly(dyf);
-      if (model.autoAdjustCameraClippingRange) {
-        model.currentRenderer.resetCameraClippingRange();
+      const camera = model.currentRenderer.getActiveCamera();
+
+      const dyf = model.interactor.getScale() / model.interactor.getLastScale();
+      if (camera.getParallelProjection()) {
+        camera.setParallelScale(camera.getParallelScale() / dyf);
+      } else {
+        camera.dolly(dyf);
+        if (model.autoAdjustCameraClippingRange) {
+          model.currentRenderer.resetCameraClippingRange();
+        }
       }
-    }
 
-    if (model.interactor.getLightFollowCamera()) {
-      model.currentRenderer.updateLightsGeometryToFollowCamera();
+      if (model.interactor.getLightFollowCamera()) {
+        model.currentRenderer.updateLightsGeometryToFollowCamera();
+      }
     }
   };