Fix camera version + VR using spacebar.

Normand Briere

2019-08-27 dce400da7c65d659129abf9bc6e8f38b360a63d2

 CameraPane.java
..
..
@@ -9840,7 +9840,10 @@
9840
9840
             DrawSkyBox(gl, (float)rati);
9841
9841
             gl.glEnable(GL.GL_FRAGMENT_PROGRAM_ARB);
9842
9842
             gl.glEnable(GL.GL_VERTEX_PROGRAM_ARB);
9843
-            accPerspective(gl, renderCamera.shaper_fovy / ratio,
9843
+            
9844
+            boolean vr = capsLocked && !lightMode;
9845
+            
9846
+            accPerspective(gl, renderCamera.shaper_fovy / ratio * (vr ? 2 : 1),
9844
9847
                     ratio,
9845
9848
                     //near_plane, far_plane,
9846
9849
                     renderCamera.shaper_zNear * renderCamera.Distance(), renderCamera.shaper_zFar * renderCamera.Distance(),
..
..
@@ -11397,7 +11400,9 @@
11397
11400
                 //gl.glOrtho(-BOOST, BOOST, -BOOST, BOOST, 0.001, 1000);
11398
11401
                 } else
11399
11402
                 {
11400
-                    glu.gluPerspective(cam.shaper_fovy / ratio, ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
11403
+                    boolean vr = capsLocked && !lightMode;
11404
+                    
11405
+                    glu.gluPerspective(cam.shaper_fovy / ratio * (vr ? 2 : 1), ratio, cam.shaper_zNear * cam.Distance(), cam.shaper_zFar * cam.Distance());
11401
11406
                 }
11402
11407
             }
11403
11408
 
..
..
@@ -14250,10 +14255,12 @@
14250
14255
             return;
14251
14256
 	}
14252
14257
         
14253
-        boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14258
+        //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
14259
+        
14260
+        boolean vr = capsLocked && !lightMode;
14254
14261
         
14255
14262
         // TIMER
14256
-        if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !capsLocked) // VR
14263
+        if (ZOOMBOXMODE && !wheeltimer.isRunning() && e.getModifiersEx() == 0 && !vr) // VR
14257
14264
         {
14258
14265
             keepboxmode = BOXMODE;
14259
14266
             keepsupport = SUPPORT;
..
..
@@ -15239,8 +15246,10 @@
15239
15246
             mouseMode |= ZOOM;
15240
15247
         }
15241
15248
         
15242
-        boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15243
-        if (capsLocked) // || (modifiers & META) == META)
15249
+        //boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
15250
+        boolean vr = capsLocked && !lightMode;
15251
+
15252
+        if (vr) // || (modifiers & META) == META)
15244
15253
         {
15245
15254
             mouseMode |= VR; // BACKFORTH;
15246
15255
         }
..
..
@@ -15456,8 +15465,8 @@
15456
15465
                 RevertCamera();
15457
15466
                 repaint();
15458
15467
                 break;
15459
-            case 'l':
15460
-            //case 'L':
15468
+            //case 'l':
15469
+            case 'L':
15461
15470
                 if (lightMode)
15462
15471
                 {
15463
15472
                     lightMode = false;
..
..
@@ -15515,8 +15524,8 @@
15515
15524
                 break;
15516
15525
             case 'O':
15517
15526
                 // Too dangerous. Use menu. Globals.drawMode = OCCLUSION; // WARNING
15518
-                repaint();
15519
-                break;
15527
+                //repaint();
15528
+                //break;
15520
15529
             case 'o':
15521
15530
                 OCCLUSION_CULLING ^= true;
15522
15531
                 System.out.println("OCCLUSION CULLING = " + OCCLUSION_CULLING);
..
..
@@ -15608,6 +15617,10 @@
15608
15617
 //                kompactbit = 6;
15609
15618
 //                break;
15610
15619
             case ' ':
15620
+                capsLocked ^= true;
15621
+                repaint();
15622
+                break;
15623
+            case 'l':
15611
15624
                 lightMode ^= true;
15612
15625
                 Globals.lighttouched = true;
15613
15626
                 manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
..
..
@@ -17911,6 +17924,9 @@
17911
17924
     static boolean DEBUG_SELECTION = false;
17912
17925
     boolean OCCLUSION_CULLING = false; //true;
17913
17926
     public boolean lightMode = false;
17927
+    
17928
+    public boolean capsLocked = false; // VR
17929
+    
17914
17930
     static public int indexcount = 0;
17915
17931
     /*static*/ cColor vertexOcclusion = new cColor();
17916
17932
     //private int selection_view = -1;