new torus code and VR

Normand Briere

2018-05-22 42107f9a01652cb2f47228d20c1148a2a22f6a63

 CameraPane.java
..
..
@@ -12854,7 +12854,9 @@
12854
12854
         {
12855
12855
             mouseMode |= ZOOM;
12856
12856
         }
12857
-        if ((modifiers & META) == META)
12857
+        
12858
+        boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
12859
+        if (capsLocked || (modifiers & META) == META)
12858
12860
         {
12859
12861
             mouseMode |= VR; // BACKFORTH;
12860
12862
         }
..
..
@@ -12868,6 +12870,7 @@
12868
12870
         }
12869
12871
         if ((modifiers & SHIFT) == SHIFT || forcetranslate)
12870
12872
         {
12873
+            mouseMode &= ~VR;
12871
12874
             mouseMode |= TRANSLATE;
12872
12875
         }
12873
12876
     //    if ((modifiers & SHIFT_META) == SHIFT_META)
..
..
@@ -13257,7 +13260,8 @@
13257
13260
                 FlipTransform();
13258
13261
                 break;
13259
13262
             case ENTER:
13260
-                object.editWindow.ScreenFit(); // Edit();
13263
+                // object.editWindow.ScreenFit(); // Edit();
13264
+                ToggleLive();
13261
13265
                 break;
13262
13266
             case DELETE:
13263
13267
                 ClearSelection();
..
..
@@ -14718,6 +14722,11 @@
14718
14722
 //                System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
14719
14723
 //                System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
14720
14724
                 
14725
+                // Will fit the mesh !!!
14726
+                selectedpoint.toParent[0][0] = 0.0001;
14727
+                selectedpoint.toParent[1][1] = 0.0001;
14728
+                selectedpoint.toParent[2][2] = 0.0001;
14729
+                
14721
14730
                 glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
14722
14731
                 
14723
14732
 //                if (object.selection != null && object.selection.Size() > 0)
..
..
@@ -15340,7 +15349,7 @@
15340
15349
     int AAbuffersize = 0;
15341
15350
     
15342
15351
     //double[] selectedpoint = new double[3];
15343
-    static Sphere selectedpoint = new Sphere();
15352
+    static Superellipsoid selectedpoint = new Superellipsoid();
15344
15353
     static Sphere previousselectedpoint = null;
15345
15354
     static Sphere debugpoint = new Sphere();
15346
15355
     static Sphere debugpoint2 = new Sphere();