Cross-platform main.

Normand Briere

2019-04-24 07750666120cf38c7ad4f3a3a583a8c4d582bb0e

 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
 
..
..
@@ -1524,7 +1526,7 @@
1524
1526
 
1525
1527
     public void drawSphere(iCameraPane display, float radius, int slices, int stacks)
1526
1528
     {
1527
-        GL gl = display.GetGL();
1529
+        GL gl = display.GetGL0();
1528
1530
 
1529
1531
         sphereKey.radius = radius;
1530
1532
         Integer glList = sphereDisplayLists.get(sphereKey);
..
..
@@ -1596,7 +1598,7 @@
1596
1598
 
1597
1599
     public void drawCylinder(iCameraPane display, float radius, float halfHeight, int upAxis)
1598
1600
     {
1599
-        GL gl = display.GetGL();
1601
+        GL gl = display.GetGL0();
1600
1602
 
1601
1603
         gl.glPushMatrix();
1602
1604
         switch (upAxis)