From f69d25e4682ca33edfc8cfad26187050f4eb558a Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 05 May 2019 14:06:57 -0400
Subject: [PATCH] Remove "D".

---
 GenericJoint.java |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/GenericJoint.java b/GenericJoint.java
index b6d18be..1119276 100644
--- a/GenericJoint.java
+++ b/GenericJoint.java
@@ -314,7 +314,7 @@
         bRep = null;
     }
     
-    void DrawNode(CameraPane display, Object3D /*Composite*/ root, boolean selected) // ??
+    void DrawNode(iCameraPane display, Object3D /*Composite*/ root, boolean selected) // ??
     {
    //     super.DrawNode(display,root,selected);
         
@@ -330,12 +330,14 @@
             e.printStackTrace();
         }
             
-            display.GetGL().glPushMatrix();
+            //display.GetGL().glPushMatrix();
+            display.PushMatrix(LA.Identity, 1);
             Vector3f v = ragdolls.get(0).bodies[0].worldTransform.origin;
      //       display.GetGL().glTranslatef(-v.x,0,-v.z);
         
         super.DrawNode(display, root, selected);
-            display.GetGL().glPopMatrix();
+            //display.GetGL().glPopMatrix();
+            display.PopMatrix(LA.Identity);
         
 //        assert(bRep != null);
         
@@ -379,7 +381,7 @@
         try
         {
             //font = FontRender.createFont("Dialog", 11, false, true);
-            font = new FontRender.GLFont(gl, GrafreeD.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
+            font = new FontRender.GLFont(gl, Grafreed.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
         } catch (java.io.IOException e)
         {
             e.printStackTrace();
@@ -451,9 +453,9 @@
     int startvertex;
     int currentobject;
     
-    public void renderme(CameraPane display)
+    public void renderme(iCameraPane display)
     {
-        GL gl = display!=null?display.getGL():null;
+        GL gl = display!=null?display.GetGL0():null;
 
         // gl0 = gl;
         if (GetDynamicsWorld() != null)
@@ -796,9 +798,9 @@
         }
     }
 
-    public void drawCube(CameraPane display, float extent)
+    public void drawCube(iCameraPane display, float extent)
     {
-        GL gl = display.getGL();
+        GL gl = display.GetGL0();
 
         extent = extent * 0.5f;
 
@@ -838,7 +840,7 @@
     
     private /*static*/ float[] glMat = new float[16];
 
-    public void drawOpenGL(CameraPane display, Transform trans, CollisionShape shape, Vector3f color, int debugMode)
+    public void drawOpenGL(iCameraPane display, Transform trans, CollisionShape shape, Vector3f color, int debugMode)
     {
         GL gl = null; // display.getGL();
 
@@ -871,6 +873,7 @@
 
         if (shape.getShapeType() == BroadphaseNativeType.COMPOUND_SHAPE_PROXYTYPE)
         {
+                new Exception().printStackTrace();
             System.exit(0);
             CompoundShape compoundShape = (CompoundShape) shape;
             Transform childTrans = transformsPool.get();
@@ -901,6 +904,7 @@
                 {
                     case BOX_SHAPE_PROXYTYPE:
                     {
+                new Exception().printStackTrace();
             System.exit(0);
                         BoxShape boxShape = (BoxShape) shape;
                         Vector3f halfExtent = boxShape.getHalfExtentsWithMargin(vectorsPool.get());
@@ -912,6 +916,7 @@
                     }
                     case SPHERE_SHAPE_PROXYTYPE:
                     {
+                new Exception().printStackTrace();
             System.exit(0);
                         SphereShape sphereShape = (SphereShape) shape;
                         float radius = sphereShape.getMargin(); // radius doesn't include the margin, so draw with margin
@@ -958,6 +963,7 @@
 
                     case STATIC_PLANE_PROXYTYPE:
                     {
+                new Exception().printStackTrace();
             System.exit(0);
                         StaticPlaneShape staticPlaneShape = (StaticPlaneShape) shape;
                         float planeConst = staticPlaneShape.getPlaneConstant();
@@ -1004,6 +1010,7 @@
 
                     case CYLINDER_SHAPE_PROXYTYPE:
                     {
+                new Exception().printStackTrace();
             System.exit(0);
                         CylinderShape cylinder = (CylinderShape) shape;
                         int upAxis = cylinder.getUpAxis();
@@ -1356,6 +1363,7 @@
                 // for polyhedral shapes
                 if (shape.isPolyhedral())
                 {
+                new Exception().printStackTrace();
             System.exit(0);
                     PolyhedralConvexShape polyshape = (PolyhedralConvexShape) shape;
 
@@ -1425,6 +1433,7 @@
             if (shape.isConcave())//>getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE||shape->getShapeType() == GIMPACT_SHAPE_PROXYTYPE)
             //		if (shape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
             {
+                new Exception().printStackTrace();
             System.exit(0);
                 ConcaveShape concaveMesh = (ConcaveShape) shape;
                 //btVector3 aabbMax(btScalar(1e30),btScalar(1e30),btScalar(1e30));
@@ -1522,9 +1531,9 @@
     private static Map<SphereKey, Integer> sphereDisplayLists = new HashMap<SphereKey, Integer>();
     private static SphereKey sphereKey = new SphereKey();
 
-    public void drawSphere(CameraPane display, float radius, int slices, int stacks)
+    public void drawSphere(iCameraPane display, float radius, int slices, int stacks)
     {
-        GL gl = display.getGL();
+        GL gl = display.GetGL0();
 
         sphereKey.radius = radius;
         Integer glList = sphereDisplayLists.get(sphereKey);
@@ -1594,9 +1603,9 @@
     private static Map<CylinderKey, Integer> cylinderDisplayLists = new HashMap<CylinderKey, Integer>();
     private static CylinderKey cylinderKey = new CylinderKey();
 
-    public void drawCylinder(CameraPane display, float radius, float halfHeight, int upAxis)
+    public void drawCylinder(iCameraPane display, float radius, float halfHeight, int upAxis)
     {
-        GL gl = display.getGL();
+        GL gl = display.GetGL0();
 
         gl.glPushMatrix();
         switch (upAxis)

--
Gitblit v1.6.2