Fix parallel perspective toggle to keep view 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 56255631f4c06918f0b58279f7e7a4ba1b09e632..9c444b4f7eac40aff2e6d5fe9af0f8a92c4681c3 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
@@ -168,6 +168,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 +195,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 +328,7 @@ public class vtkCameraAndSelectorAction extends vtkSwtAction implements ISelecti
                        fireSelectionChanged();
        }
 
-       private void fireSelectionChanged() {
+       protected void fireSelectionChanged() {
                Display.getDefault().asyncExec(new Runnable() {
                        @Override
                        public void run() {