Show busy cursor and block UI input while committing changes

[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 56255631f4c06918f0b58279f7e7a4ba1b09e632..ebdfb245219a43990271074a2d8f253ffdf774cf 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
@@ -43,6 +43,7 @@ public class vtkCameraAndSelectorAction extends vtkSwtAction implements ISelecti
        protected double activeRate = 5.0;
        protected double passiveRate = 0.01;
        protected boolean doNotRotate = true;
+       private double[] upDirection = new double[] { 0, 1, 0 };
 
        public vtkCameraAndSelectorAction(InteractiveVtkComposite panel) {
                super(panel);
@@ -50,6 +51,10 @@ public class vtkCameraAndSelectorAction extends vtkSwtAction implements ISelecti
                this.rw = panel.getRenderWindow();
                this.cam = ren.GetActiveCamera();
        }
+       
+       public void setUpDirection(double[] upDirection) {
+               this.upDirection = upDirection;
+       }
 
        public void Lock() {
                panel.lock();
@@ -116,7 +121,7 @@ public class vtkCameraAndSelectorAction extends vtkSwtAction implements ISelecti
                        cam.Azimuth(lastX - x);
                        cam.Elevation(y - lastY);
                        if (doNotRotate)
-                               cam.SetRoll(0);
+                               cam.SetViewUp(upDirection);
                        cam.OrthogonalizeViewUp();
                        resetCameraClippingRange();
                        // panel.UpdateLight();
@@ -125,9 +130,8 @@ public class vtkCameraAndSelectorAction extends vtkSwtAction implements ISelecti
                if (this.InteractionMode == 2) {
                        double FPoint[];
                        double PPoint[];
-                       double APoint[] = new double[3];
+                       double APoint[];
                        double RPoint[];
-                       double focalDepth;
 
                        // get the current focal point and position
                        FPoint = cam.GetFocalPoint();
@@ -136,14 +140,15 @@ public class vtkCameraAndSelectorAction extends vtkSwtAction implements ISelecti
                        // calculate the focal depth since we'll be using it a lot
                        ren.SetWorldPoint(FPoint[0], FPoint[1], FPoint[2], 1.0);
                        ren.WorldToDisplay();
-                       focalDepth = ren.GetDisplayPoint()[2];
-
-                       APoint[0] = rw.GetSize()[0] / 2.0 + (x - lastX);
-                       APoint[1] = rw.GetSize()[1] / 2.0 - (y - lastY);
-                       APoint[2] = focalDepth;
+                       APoint = ren.GetDisplayPoint();
+                       
+//                     int[] size = rw.GetSize();
+                       APoint[0] -= x - lastX;
+                       APoint[1] += y - lastY;
                        ren.SetDisplayPoint(APoint);
                        ren.DisplayToWorld();
                        RPoint = ren.GetWorldPoint();
+                       
                        if (RPoint[3] != 0.0) {
                                RPoint[0] = RPoint[0] / RPoint[3];
                                RPoint[1] = RPoint[1] / RPoint[3];
@@ -154,10 +159,9 @@ public class vtkCameraAndSelectorAction extends vtkSwtAction implements ISelecti
                         * Compute a translation vector, moving everything 1/2 the distance to the
                         * cursor. (Arbitrary scale factor)
                         */
-                       cam.SetFocalPoint((FPoint[0] - RPoint[0]) / 2.0 + FPoint[0], (FPoint[1] - RPoint[1]) / 2.0 + FPoint[1],
-                                       (FPoint[2] - RPoint[2]) / 2.0 + FPoint[2]);
-                       cam.SetPosition((FPoint[0] - RPoint[0]) / 2.0 + PPoint[0], (FPoint[1] - RPoint[1]) / 2.0 + PPoint[1],
-                                       (FPoint[2] - RPoint[2]) / 2.0 + PPoint[2]);
+                       cam.SetFocalPoint(RPoint);
+                       cam.SetPosition((RPoint[0] - FPoint[0]) + PPoint[0], (RPoint[1] - FPoint[1]) + PPoint[1],
+                                       (RPoint[2] - FPoint[2]) + PPoint[2]);
                        resetCameraClippingRange();
                }
                // zoom
@@ -168,6 +172,7 @@ public class vtkCameraAndSelectorAction extends vtkSwtAction implements ISelecti
                        zoomFactor = Math.pow(1.02, (y - lastY));
                        if (cam.GetParallelProjection() == 1) {
                                cam.SetParallelScale(cam.GetParallelScale() / zoomFactor);
+                               resetCameraClippingRange();
                        } else {
                                cam.Dolly(zoomFactor);
                                resetCameraClippingRange();
@@ -194,8 +199,8 @@ public class vtkCameraAndSelectorAction extends vtkSwtAction implements ISelecti
                return true;
        }
 
-       private List<vtkProp> selectActors = new ArrayList<vtkProp>();
-       private List<vtkProp> hoverActor = new ArrayList<vtkProp>();
+       protected List<vtkProp> selectActors = new ArrayList<vtkProp>();
+       protected List<vtkProp> hoverActor = new ArrayList<vtkProp>();
 
        @Override
        public boolean mouseClicked(MouseEvent e) {
@@ -327,7 +332,7 @@ public class vtkCameraAndSelectorAction extends vtkSwtAction implements ISelecti
                        fireSelectionChanged();
        }
 
-       private void fireSelectionChanged() {
+       protected void fireSelectionChanged() {
                Display.getDefault().asyncExec(new Runnable() {
                        @Override
                        public void run() {
@@ -378,7 +383,7 @@ public class vtkCameraAndSelectorAction extends vtkSwtAction implements ISelecti
                Lock();
                cam.SetFocalPoint(x, y, z);
                if (doNotRotate)
-                       cam.SetRoll(0);
+                       cam.SetViewUp(upDirection);
                cam.OrthogonalizeViewUp();
                resetCameraClippingRange();
                // panel.UpdateLight();