Fix navigation and hide cursor.

Normand Briere

2019-09-15 d5fac992bb6a91e52a90e8318060f5f26ddab982

 CameraPane.java
..
..
@@ -9854,7 +9854,7 @@
9854
9854
             
9855
9855
             boolean vr = capsLocked && !lightMode;
9856
9856
             
9857
-            accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 2 : 1),
9857
+            accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 1.2 : 1),
9858
9858
                     ratio,
9859
9859
                     //near_plane, far_plane,
9860
9860
                     renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..
..
@@ -11513,7 +11513,8 @@
11513
11513
                 {
11514
11514
                     boolean vr = capsLocked && !lightMode;
11515
11515
                     
11516
-                    glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 2 : 1), ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
11516
+                    glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 1.2 : 1),
11517
+                            ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
11517
11518
                 }
11518
11519
             }
11519
11520
 
..
..
@@ -14603,8 +14604,8 @@
14603
14604
         
14604
14605
         //if (drawing)
14605
14606
         //return;
14606
-        if ((e.getModifiersEx() & CTRL) != 0
14607
-            || (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
14607
+        if ((e.getModifiersEx() & CTRL) != 0 ||
14608
+            (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
14608
14609
         {
14609
14610
             //System.out.println("mouseDragged: " + e);
14610
14611
             clickEnd(e.getX(), e.getY(), e.getModifiersEx());
..
..
@@ -14750,7 +14751,7 @@
14750
14751
             {
14751
14752
                 if (LOOKAT)
14752
14753
                     manipCamera.lookAt.add(tmp);
14753
-                if (OEIL)
14754
+                if (OEIL && !capsLocked)
14754
14755
                     manipCamera.location.add(tmp);
14755
14756
                 
14756
14757
                 {
..
..
@@ -14765,7 +14766,10 @@
14765
14766
                     lightCamera.computeTransform();
14766
14767
                     }
14767
14768
                 }
14768
-                manipCamera.computeTransform();
14769
+                if (tmp.x != 0 || tmp.y != 0 || tmp.z != 0)
14770
+                {
14771
+                    manipCamera.computeTransform();
14772
+                }
14769
14773
             }
14770
14774
 // ??????            mouseDown = true;
14771
14775
             //System.out.println("----------------   ----------      Paint " + tmp.length2());
..
..
@@ -15195,6 +15199,9 @@
15195
15199
         
15196
15200
     public void mouseMoved(MouseEvent e)
15197
15201
     {
15202
+//object.editWindow.frame.
15203
+        setCursor(Cursor.getDefaultCursor());
15204
+
15198
15205
         //System.out.println("mouseMoved: " + e);
15199
15206
         if (isRenderer)
15200
15207
             return;
..
..
@@ -15439,8 +15446,18 @@
15439
15446
     float SATPOW = 1; // 2; // 0.5f;
15440
15447
     float BRIPOW = 1; // 0.5f; // 0.5f;
15441
15448
     
15449
+static BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB);
15450
+
15451
+// Create a new blank cursor.
15452
+static Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor(
15453
+    cursorImg, new Point(0, 0), "blank cursor");
15454
+    
15442
15455
     public void keyPressed(int key)
15443
15456
     {
15457
+// Set the blank cursor to the JFrame.
15458
+//object.editWindow.frame.
15459
+        setCursor(blankCursor);
15460
+
15444
15461
         if (key >= '0' && key <= '5')
15445
15462
             clampbit = (key-'0');
15446
15463