Test unfold UV

Normand Briere

2019-04-28 f1c718cce66e5651a0dae91375db6ebfaded1a92

 GenericJoint.java
..
..
@@ -314,7 +314,7 @@
314
314
         bRep = null;
315
315
     }
316
316
     
317
-    void DrawNode(CameraPane display, Object3D /*Composite*/ root, boolean selected) // ??
317
+    void DrawNode(iCameraPane display, Object3D /*Composite*/ root, boolean selected) // ??
318
318
     {
319
319
    //     super.DrawNode(display,root,selected);
320
320
         
..
..
@@ -330,16 +330,18 @@
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
         
342
-        if (display.isLIVE() && live && display.drawMode == display.SHADOW) // FUCK
344
+        if (Globals.isLIVE() && live && display.DrawMode() == display.SHADOW) // FUCK
343
345
         {
344
346
 //            float ms = getDeltaTimeMicroseconds();
345
347
 //            float minFPS = 1000000f / 60f;
..
..
@@ -379,7 +381,7 @@
379
381
         try
380
382
         {
381
383
             //font = FontRender.createFont("Dialog", 11, false, true);
382
-            font = new FontRender.GLFont(gl, GraphreeD.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
384
+            font = new FontRender.GLFont(gl, GrafreeD.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
383
385
         } catch (java.io.IOException e)
384
386
         {
385
387
             e.printStackTrace();
..
..
@@ -451,9 +453,9 @@
451
453
     int startvertex;
452
454
     int currentobject;
453
455
     
454
-    public void renderme(CameraPane display)
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)
..
..
@@ -796,9 +798,9 @@
796
798
         }
797
799
     }
798
800
 
799
-    public void drawCube(CameraPane display, float extent)
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
 
..
..
@@ -838,7 +840,7 @@
838
840
     
839
841
     private /*static*/ float[] glMat = new float[16];
840
842
 
841
-    public void drawOpenGL(CameraPane display, Transform trans, CollisionShape shape, Vector3f color, int debugMode)
843
+    public void drawOpenGL(iCameraPane display, Transform trans, CollisionShape shape, Vector3f color, int debugMode)
842
844
     {
843
845
         GL gl = null; // display.getGL();
844
846
 
..
..
@@ -1522,9 +1524,9 @@
1522
1524
     private static Map<SphereKey, Integer> sphereDisplayLists = new HashMap<SphereKey, Integer>();
1523
1525
     private static SphereKey sphereKey = new SphereKey();
1524
1526
 
1525
-    public void drawSphere(CameraPane display, float radius, int slices, int stacks)
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);
..
..
@@ -1594,9 +1596,9 @@
1594
1596
     private static Map<CylinderKey, Integer> cylinderDisplayLists = new HashMap<CylinderKey, Integer>();
1595
1597
     private static CylinderKey cylinderKey = new CylinderKey();
1596
1598
 
1597
-    public void drawCylinder(CameraPane display, float radius, float halfHeight, int upAxis)
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)