Fix/patch click flicking.

Normand Briere

2019-09-28 c3c47406ac43dafd51e6ad1d7b92a794bd69b7d6

Fix/patch click flicking.

 CameraPane.java
..
..
@@ -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()
..
..
@@ -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
 //        {
..
..
@@ -15367,6 +15367,12 @@
15367
15367
 
15368
15368
     public void mouseReleased(MouseEvent e)
15369
15369
     {
15370
+        if (isRenderer && !movingcamera)
15371
+        {
15372
+            RigidBody.justclicked = true;
15373
+            System.out.println("justclicked: " + e);
15374
+        }
15375
+        
15370
15376
         Globals.MOUSEDRAGGED = false;
15371
15377
         
15372
15378
         movingcamera = false;
 GroupEditor.java
..
..
@@ -2524,6 +2524,7 @@
2524
2524
 //                    ragdoll.toParent[3][2] = -0.01;
2525
2525
                     
2526
2526
                     makeSomething(ragdoll);
2527
+                    group(new PhysicsNode());
2527
2528
 			//makeSomething(new VehicleDemo());
2528
2529
 		} else
2529
2530
                     /*
 PhysicsNode.java
..
..
@@ -80,6 +80,7 @@
80
80
         live = true;
81
81
         
82
82
         gravity = 1;
83
+        wind = 1;
83
84
     }
84
85
     
85
86
     void Reset()
 com/bulletphysics/dynamics/RigidBody.java
..
..
@@ -242,23 +242,26 @@
242
242
 //                wind.y -= worldTransform.origin.y;
243
243
 //                wind.z -= worldTransform.origin.z;
244
244
                 
245
-//                this.collisionShape.getAabb(worldTransform, min, max);
246
-//
247
-//                if (pos.x < min.x || pos.x > max.x)
248
-//                    return;
249
-//                if (pos.y < min.y || pos.y > max.y)
250
-//                    return;
251
-//                if (pos.z < min.z || pos.z > max.z)
252
-//                    return;
245
+                this.collisionShape.getAabb(worldTransform, min, max);
246
+
247
+                if (pos.x < min.x || pos.x > max.x)
248
+                    return;
249
+                if (pos.y < min.y || pos.y > max.y)
250
+                    return;
251
+                if (pos.z < min.z || pos.z > max.z)
252
+                    return;
253
253
                     
254
254
                 float dot = pos.x * wind.x + pos.y * wind.y + pos.z * wind.z;
255
255
                 
256
-                dot = 10;
256
+                dot = 100;
257
257
                 
258
258
                 w.x = wind.x * gravity.z * dot;
259
259
                 w.y = wind.y * gravity.z * dot;
260
260
                 w.z = wind.z * gravity.z * dot;
261
261
                 
262
+                System.out.print("min = " + min);
263
+                System.out.println("; max = " + max);
264
+                
262
265
 		applyCentralForce(w);
263
266
 	}
264
267