Fix camera focus method to handle special case of vertical direction.

[simantics/3d.git] / org.simantics.g3d.vtk / src / org / simantics / g3d / vtk / swt / vtkCameraAndSelectorAction.java

diff --git a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/vtkCameraAndSelectorAction.java b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/vtkCameraAndSelectorAction.java
index 7a0cc0314d228a793e73ce3b2c49fe6c70e425da..7a6f0d894173ad29e8eebb48be2c18da39ad20e6 100644 (file)
--- a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/vtkCameraAndSelectorAction.java
+++ b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/vtkCameraAndSelectorAction.java
@@ -401,8 +401,15 @@ public class vtkCameraAndSelectorAction extends vtkSwtAction implements ISelecti
        public void focus(double x, double y, double z) {
                Lock();
                cam.SetFocalPoint(x, y, z);
-               if (doNotRotate)
-                       cam.SetViewUp(upDirection);
+               if (doNotRotate) {
+                       double[] proj = cam.GetDirectionOfProjection();
+                       if (Math.abs(proj[1] * upDirection[2] - proj[2] * upDirection[1]) < 1e-6 &&
+                               Math.abs(proj[2] * upDirection[0] - proj[0] * upDirection[2]) < 1e-6 &&
+                               Math.abs(proj[0] * upDirection[1] - proj[1] * upDirection[0]) < 1e-6)
+                               cam.SetViewUp(upDirection[1], upDirection[2], upDirection[0]);
+                       else
+                               cam.SetViewUp(upDirection);
+               }
                cam.OrthogonalizeViewUp();
                resetCameraClippingRange();
                // panel.UpdateLight();