Fix lighttouched

Normand Briere

2019-10-04 57c5b6cd8d12ffdaa3e0b099451e3c031012750a

 CameraPane.java
..
..
@@ -124,7 +124,7 @@
124
124
 static    boolean LOCALTRANSFORM = false;
125
125
 static    boolean FULLSCREEN = false;
126
126
 static    boolean SUPPORT = true;
127
-static    boolean INERTIA = true;
127
+static    boolean INERTIA = false; // true;
128
128
 static    boolean FAST = false;
129
129
 static    boolean SLOWPOSE = false;
130
130
 static    boolean FOOTCONTACT = true;
..
..
@@ -250,7 +250,7 @@
250
250
     
251
251
     public javax.media.opengl.GL GetGL0()
252
252
     {
253
-            return null;
253
+            return currentGL;
254
254
     }
255
255
     
256
256
     public int GenList()
..
..
@@ -1530,7 +1530,7 @@
1530
1530
                 }
1531
1531
             }
1532
1532
             float b = 0;
1533
-            if (obj.support != null && obj.link2master)
1533
+            if (obj.support != null && obj.Link2Support())
1534
1534
             {
1535
1535
                 b = 1;
1536
1536
             }
..
..
@@ -10761,7 +10761,9 @@
10761
10761
         }
10762
10762
         /**/
10763
10763
 
10764
-        if (selection)
10764
+        boolean control = ((modifiers & CTRL) != 0);
10765
+        
10766
+        if (selection && (!Globals.isLIVE() || control))
10765
10767
         {
10766
10768
             selectbuffer.display();
10767
10769
             return;
..
..
@@ -14346,8 +14348,6 @@
14346
14348
 
14347
14349
     public void mousePressed(MouseEvent e)
14348
14350
     {
14349
-        RigidBody.justclicked = true;
14350
-        System.out.println("justclicked: " + e);
14351
14351
         //System.out.println("mousePressed: " + e);
14352
14352
         clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
14353
14353
     }
..
..
@@ -14655,7 +14655,7 @@
14655
14655
         boolean jump;
14656
14656
         boolean live;
14657
14657
         
14658
-        boolean mute;
14658
+        boolean mute = false;
14659
14659
         
14660
14660
 //        void JumpToTarget()
14661
14661
 //        {
..
..
@@ -14676,9 +14676,16 @@
14676
14676
             RigidBody.pos.z = 0;
14677
14677
             if (RigidBody.justclicked)
14678
14678
             {
14679
-                RigidBody.pos.x = (float)manipCamera.lookAt.x;
14680
-                RigidBody.pos.y = (float)manipCamera.lookAt.y;
14681
-                RigidBody.pos.z = (float)manipCamera.lookAt.z;
14679
+//                RigidBody.pos.x = (float)manipCamera.lookAt.x;
14680
+//                RigidBody.pos.y = (float)manipCamera.lookAt.y;
14681
+//                RigidBody.pos.z = (float)manipCamera.lookAt.z;
14682
+                                 //       System.err.println("selected point = " + Trunk(selectedpoint.toParent[3][0]) + " " + Trunk(selectedpoint.toParent[3][1]) + " " + Trunk(selectedpoint.toParent[3][2]));
14683
+                CreateSelectedPoint();
14684
+                
14685
+                RigidBody.pos.x = (float)selectedpoint.toParent[3][0];
14686
+                RigidBody.pos.y = (float)selectedpoint.toParent[3][1];
14687
+                RigidBody.pos.z = (float)selectedpoint.toParent[3][2];
14688
+
14682
14689
                 RigidBody.wind.set(RigidBody.pos);
14683
14690
                 RigidBody.wind.x -= (float)manipCamera.location.x;
14684
14691
                 RigidBody.wind.y -= (float)manipCamera.location.y;
..
..
@@ -15367,6 +15374,12 @@
15367
15374
 
15368
15375
     public void mouseReleased(MouseEvent e)
15369
15376
     {
15377
+        if (isRenderer && !movingcamera)
15378
+        {
15379
+            RigidBody.justclicked = true;
15380
+            System.out.println("justclicked: " + e);
15381
+        }
15382
+        
15370
15383
         Globals.MOUSEDRAGGED = false;
15371
15384
         
15372
15385
         movingcamera = false;
..
..
@@ -17155,7 +17168,7 @@
17155
17168
             return;
17156
17169
         }
17157
17170
 
17158
-        if (WIREFRAME)
17171
+        //if (WIREFRAME)
17159
17172
             gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
17160
17173
         
17161
17174
         gl.glDisable(gl.GL_CULL_FACE);
..
..
@@ -17255,6 +17268,8 @@
17255
17268
 
17256
17269
         if (WIREFRAME)
17257
17270
             gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_LINE);
17271
+        else
17272
+            gl.glPolygonMode(gl.GL_FRONT_AND_BACK, gl.GL_FILL);
17258
17273
     }
17259
17274
 
17260
17275
     private void DrawChecker(GL gl)