Fix navigation arrows.

Normand Briere

2019-09-08 4a303a7b3635adfee8f46ac76af4e1b7b4a7029b

Fix navigation arrows.

 CameraPane.java
..
..
@@ -10867,30 +10867,53 @@
10867
10867
                 
10868
10868
                 if (keys[DOWN_ARROW])
10869
10869
                 {
10870
+                    speed = ++speedkey[DOWN_ARROW];
10871
+                    if (speed > 20)
10872
+                        speed = 20;
10870
10873
                     GoDown(modifiers);
10871
10874
                     keyon = true;
10872
10875
                 }
10876
+                else
10877
+                    speedkey[DOWN_ARROW] = 0;
10873
10878
 
10874
10879
                 if (keys[UP_ARROW])
10875
10880
                 {
10881
+                    speed = ++speedkey[UP_ARROW];
10882
+                    if (speed > 20)
10883
+                        speed = 20;
10876
10884
                     GoUp(modifiers);
10877
10885
                     keyon = true;
10878
10886
                 }
10887
+                else
10888
+                    speedkey[UP_ARROW] = 0;
10879
10889
 
10880
10890
                 if (keys[LEFT_ARROW])
10881
10891
                 {
10892
+                    speed = ++speedkey[LEFT_ARROW];
10893
+                    if (speed > 20)
10894
+                        speed = 20;
10882
10895
                     GoLeft(modifiers);
10883
10896
                     keyon = true;
10884
10897
                 }
10898
+                else 
10899
+                    speedkey[LEFT_ARROW] = 0;
10885
10900
 
10886
10901
                 if (keys[RIGHT_ARROW])
10887
10902
                 {
10903
+                    speed = ++speedkey[RIGHT_ARROW];
10904
+                    if (speed > 20)
10905
+                        speed = 20;
10888
10906
                     GoRight(modifiers);
10889
10907
                     keyon = true;
10890
10908
                 }
10909
+                else
10910
+                    speedkey[RIGHT_ARROW] = 0;
10891
10911
                 
10892
10912
                 if (keyon)
10913
+                {
10893
10914
                     repaint();
10915
+                }
10916
+                
10894
10917
                 //pingthread.mute = false;
10895
10918
             }
10896
10919
             
..
..
@@ -14828,9 +14851,10 @@
14828
14851
             }
14829
14852
         }
14830
14853
         }
14854
+    
14831
14855
     PingThread pingthread = new PingThread();
14832
-    int delta = 2;
14833
-    int speed = 2;
14856
+    int delta = 1;
14857
+    int speed = 1;
14834
14858
     boolean autorepeat = false;
14835
14859
 
14836
14860
     void GoDown(int mod)
..
..
@@ -14840,21 +14864,27 @@
14840
14864
         /**/
14841
14865
         if((mod&SHIFT) == SHIFT)
14842
14866
         {
14867
+//            if (isVR)
14868
+//                manipCamera.RotateInterest(0, speed);
14869
+//            else
14870
+                manipCamera.Translate(0, -speed*delta, getWidth());
14871
+        }
14872
+        else
14873
+        {
14843
14874
             if (isVR)
14844
-                manipCamera.RotateInterest(0, speed);
14875
+                manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
14845
14876
             else
14846
14877
                 manipCamera.RotatePosition(0, -speed);
14847
14878
         }
14848
-        else
14849
-            manipCamera.BackForth(0, -speed*delta, isVR?1000:0); // getWidth());
14879
+        
14850
14880
         /**/
14851
-        if ((mod & SHIFT) == SHIFT)
14852
-        {
14853
-            mouseMode = mouseMode; // VR??
14854
-        } else
14855
-        {
14856
-            mouseMode |= BACKFORTH;
14857
-        }
14881
+//        if ((mod & SHIFT) == SHIFT)
14882
+//        {
14883
+//            mouseMode = mouseMode; // VR??
14884
+//        } else
14885
+//        {
14886
+//            mouseMode |= BACKFORTH;
14887
+//        }
14858
14888
 
14859
14889
         targetLookAt.set(manipCamera.lookAt);
14860
14890
         
..
..
@@ -14870,21 +14900,27 @@
14870
14900
         
14871
14901
         if((mod&SHIFT) == SHIFT)
14872
14902
         {
14903
+//            if (isVR)
14904
+//                manipCamera.RotateInterest(0, -speed);
14905
+//            else
14906
+                manipCamera.Translate(0, speed*delta, getWidth());
14907
+        }
14908
+        else
14909
+        {
14873
14910
             if (isVR)
14874
-                manipCamera.RotateInterest(0, -speed);
14911
+                manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
14875
14912
             else
14876
14913
                 manipCamera.RotatePosition(0, speed);
14877
14914
         }
14878
-        else
14879
-            manipCamera.BackForth(0, speed*delta, isVR?1000:0); // getWidth());
14915
+        
14880
14916
         /**/
14881
-        if ((mod & SHIFT) == SHIFT)
14882
-        {
14883
-            mouseMode = mouseMode;
14884
-        } else
14885
-        {
14886
-            mouseMode |= BACKFORTH;
14887
-        }
14917
+//        if ((mod & SHIFT) == SHIFT)
14918
+//        {
14919
+//            mouseMode = mouseMode;
14920
+//        } else
14921
+//        {
14922
+//            mouseMode |= BACKFORTH;
14923
+//        }
14888
14924
 
14889
14925
         targetLookAt.set(manipCamera.lookAt);
14890
14926
         
..
..
@@ -14905,14 +14941,15 @@
14905
14941
             else
14906
14942
                 manipCamera.RotatePosition(speed, 0);
14907
14943
         }
14944
+        
14908
14945
         /**/
14909
-        if ((mod & SHIFT) == SHIFT)
14910
-        {
14911
-            mouseMode = mouseMode;
14912
-        } else
14913
-        {
14914
-            mouseMode |= ROTATE;
14915
-        } // TRANSLATE;
14946
+//        if ((mod & SHIFT) == SHIFT)
14947
+//        {
14948
+//            mouseMode = mouseMode;
14949
+//        } else
14950
+//        {
14951
+//            mouseMode |= ROTATE;
14952
+//        } // TRANSLATE;
14916
14953
 
14917
14954
         //System.err.println("lookAt = " + manipCamera.lookAt);
14918
14955
         //System.err.println("location = " + manipCamera.location);
..
..
@@ -14938,13 +14975,13 @@
14938
14975
         }
14939
14976
         
14940
14977
         /**/
14941
-        if ((mod & SHIFT) == SHIFT)
14942
-        {
14943
-            mouseMode = mouseMode;
14944
-        } else
14945
-        {
14946
-            mouseMode |= ROTATE;
14947
-        } // TRANSLATE;
14978
+//        if ((mod & SHIFT) == SHIFT)
14979
+//        {
14980
+//            mouseMode = mouseMode;
14981
+//        } else
14982
+//        {
14983
+//            mouseMode |= ROTATE;
14984
+//        } // TRANSLATE;
14948
14985
 
14949
14986
         targetLookAt.set(manipCamera.lookAt);
14950
14987
         
..
..
@@ -15350,7 +15387,8 @@
15350
15387
         {
15351
15388
             mouseMode |= SELECT;
15352
15389
         }
15353
-        if ((modifiersex & SHIFT) == SHIFT || forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15390
+        if (//(modifiersex & SHIFT) == SHIFT ||
15391
+                forcetranslate || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15354
15392
         {
15355
15393
             mouseMode &= ~VR;
15356
15394
             mouseMode |= TRANSLATE;
..
..
@@ -15862,6 +15900,7 @@
15862
15900
     }
15863
15901
 
15864
15902
     boolean keys[] = new boolean[256];
15903
+    int speedkey[] = new int[256];
15865
15904
     int modifiers = 0;
15866
15905
     
15867
15906
     public void processKeyEvent(KeyEvent e)
 Grafreed.java
..
..
@@ -1033,7 +1033,6 @@
1033
1033
         grafreed.universe.root = true;
1034
1034
         grafreed.universe.openEditWindow(null, true); //, true);
1035
1035
         grafreed.universe.editWindow.New();
1036
-        grafreed.universe.editWindow.DuplicateVersion();
1037
1036
         
1038
1037
         //mon.stop();
1039
1038
         //System.out.println(mon);
 ObjEditor.java
..
..
@@ -4407,6 +4407,9 @@
4407
4407
         }
4408
4408
         
4409
4409
         ResetModel();
4410
+        
4411
+        DuplicateVersion();
4412
+        
4410
4413
         this.SetVersionStates();
4411
4414
         objEditor.refreshContents();
4412
4415
     }