Complete advanced mode.

Normand Briere

2019-05-02 c209bbe1cf788c9af3dcffea7667c830170a3f1f

 GenericJoint.java
..
..
@@ -330,12 +330,14 @@
330
330
             e.printStackTrace();
331
331
         }
332
332
             
333
-            display.GetGL().glPushMatrix();
333
+            //display.GetGL().glPushMatrix();
334
+            display.PushMatrix(LA.Identity, 1);
334
335
             Vector3f v = ragdolls.get(0).bodies[0].worldTransform.origin;
335
336
      //       display.GetGL().glTranslatef(-v.x,0,-v.z);
336
337
         
337
338
         super.DrawNode(display, root, selected);
338
-            display.GetGL().glPopMatrix();
339
+            //display.GetGL().glPopMatrix();
340
+            display.PopMatrix(LA.Identity);
339
341
         
340
342
 //        assert(bRep != null);
341
343
         
..
..
@@ -453,7 +455,7 @@
453
455
     
454
456
     public void renderme(iCameraPane display)
455
457
     {
456
-        GL gl = display!=null?display.GetGL():null;
458
+        GL gl = display!=null?display.GetGL0():null;
457
459
 
458
460
         // gl0 = gl;
459
461
         if (GetDynamicsWorld() != null)
..
..
@@ -798,7 +800,7 @@
798
800
 
799
801
     public void drawCube(iCameraPane display, float extent)
800
802
     {
801
-        GL gl = display.GetGL();
803
+        GL gl = display.GetGL0();
802
804
 
803
805
         extent = extent * 0.5f;
804
806
 
..
..
@@ -871,6 +873,7 @@
871
873
 
872
874
         if (shape.getShapeType() == BroadphaseNativeType.COMPOUND_SHAPE_PROXYTYPE)
873
875
         {
876
+                new Exception().printStackTrace();
874
877
             System.exit(0);
875
878
             CompoundShape compoundShape = (CompoundShape) shape;
876
879
             Transform childTrans = transformsPool.get();
..
..
@@ -901,6 +904,7 @@
901
904
                 {
902
905
                     case BOX_SHAPE_PROXYTYPE:
903
906
                     {
907
+                new Exception().printStackTrace();
904
908
             System.exit(0);
905
909
                         BoxShape boxShape = (BoxShape) shape;
906
910
                         Vector3f halfExtent = boxShape.getHalfExtentsWithMargin(vectorsPool.get());
..
..
@@ -912,6 +916,7 @@
912
916
                     }
913
917
                     case SPHERE_SHAPE_PROXYTYPE:
914
918
                     {
919
+                new Exception().printStackTrace();
915
920
             System.exit(0);
916
921
                         SphereShape sphereShape = (SphereShape) shape;
917
922
                         float radius = sphereShape.getMargin(); // radius doesn't include the margin, so draw with margin
..
..
@@ -958,6 +963,7 @@
958
963
 
959
964
                     case STATIC_PLANE_PROXYTYPE:
960
965
                     {
966
+                new Exception().printStackTrace();
961
967
             System.exit(0);
962
968
                         StaticPlaneShape staticPlaneShape = (StaticPlaneShape) shape;
963
969
                         float planeConst = staticPlaneShape.getPlaneConstant();
..
..
@@ -1004,6 +1010,7 @@
1004
1010
 
1005
1011
                     case CYLINDER_SHAPE_PROXYTYPE:
1006
1012
                     {
1013
+                new Exception().printStackTrace();
1007
1014
             System.exit(0);
1008
1015
                         CylinderShape cylinder = (CylinderShape) shape;
1009
1016
                         int upAxis = cylinder.getUpAxis();
..
..
@@ -1356,6 +1363,7 @@
1356
1363
                 // for polyhedral shapes
1357
1364
                 if (shape.isPolyhedral())
1358
1365
                 {
1366
+                new Exception().printStackTrace();
1359
1367
             System.exit(0);
1360
1368
                     PolyhedralConvexShape polyshape = (PolyhedralConvexShape) shape;
1361
1369
 
..
..
@@ -1425,6 +1433,7 @@
1425
1433
             if (shape.isConcave())//>getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE||shape->getShapeType() == GIMPACT_SHAPE_PROXYTYPE)
1426
1434
             //		if (shape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
1427
1435
             {
1436
+                new Exception().printStackTrace();
1428
1437
             System.exit(0);
1429
1438
                 ConcaveShape concaveMesh = (ConcaveShape) shape;
1430
1439
                 //btVector3 aabbMax(btScalar(1e30),btScalar(1e30),btScalar(1e30));
..
..
@@ -1524,7 +1533,7 @@
1524
1533
 
1525
1534
     public void drawSphere(iCameraPane display, float radius, int slices, int stacks)
1526
1535
     {
1527
-        GL gl = display.GetGL();
1536
+        GL gl = display.GetGL0();
1528
1537
 
1529
1538
         sphereKey.radius = radius;
1530
1539
         Integer glList = sphereDisplayLists.get(sphereKey);
..
..
@@ -1596,7 +1605,7 @@
1596
1605
 
1597
1606
     public void drawCylinder(iCameraPane display, float radius, float halfHeight, int upAxis)
1598
1607
     {
1599
-        GL gl = display.GetGL();
1608
+        GL gl = display.GetGL0();
1600
1609
 
1601
1610
         gl.glPushMatrix();
1602
1611
         switch (upAxis)