Refactoring phase 3

Normand Briere

2019-04-22 3c4c16e0a4ca3949a7a37a24607df7f89abfe7ea

 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
         
..
..
@@ -339,7 +339,7 @@
339
339
         
340
340
 //        assert(bRep != null);
341
341
         
342
-        if (display.isLIVE() && live && display.drawMode == display.SHADOW) // FUCK
342
+        if (Globals.isLIVE() && live && display.DrawMode() == display.SHADOW) // FUCK
343
343
         {
344
344
 //            float ms = getDeltaTimeMicroseconds();
345
345
 //            float minFPS = 1000000f / 60f;
..
..
@@ -379,7 +379,7 @@
379
379
         try
380
380
         {
381
381
             //font = FontRender.createFont("Dialog", 11, false, true);
382
-            font = new FontRender.GLFont(gl, GraphreeD.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
382
+            font = new FontRender.GLFont(gl, GrafreeD.class.getResourceAsStream("DejaVu_Sans_11.fnt"));
383
383
         } catch (java.io.IOException e)
384
384
         {
385
385
             e.printStackTrace();
..
..
@@ -451,9 +451,9 @@
451
451
     int startvertex;
452
452
     int currentobject;
453
453
     
454
-    public void renderme(CameraPane display)
454
+    public void renderme(iCameraPane display)
455
455
     {
456
-        GL gl = display!=null?display.getGL():null;
456
+        GL gl = display!=null?display.GetGL():null;
457
457
 
458
458
         // gl0 = gl;
459
459
         if (GetDynamicsWorld() != null)
..
..
@@ -796,9 +796,9 @@
796
796
         }
797
797
     }
798
798
 
799
-    public void drawCube(CameraPane display, float extent)
799
+    public void drawCube(iCameraPane display, float extent)
800
800
     {
801
-        GL gl = display.getGL();
801
+        GL gl = display.GetGL();
802
802
 
803
803
         extent = extent * 0.5f;
804
804
 
..
..
@@ -838,7 +838,7 @@
838
838
     
839
839
     private /*static*/ float[] glMat = new float[16];
840
840
 
841
-    public void drawOpenGL(CameraPane display, Transform trans, CollisionShape shape, Vector3f color, int debugMode)
841
+    public void drawOpenGL(iCameraPane display, Transform trans, CollisionShape shape, Vector3f color, int debugMode)
842
842
     {
843
843
         GL gl = null; // display.getGL();
844
844
 
..
..
@@ -1522,9 +1522,9 @@
1522
1522
     private static Map<SphereKey, Integer> sphereDisplayLists = new HashMap<SphereKey, Integer>();
1523
1523
     private static SphereKey sphereKey = new SphereKey();
1524
1524
 
1525
-    public void drawSphere(CameraPane display, float radius, int slices, int stacks)
1525
+    public void drawSphere(iCameraPane display, float radius, int slices, int stacks)
1526
1526
     {
1527
-        GL gl = display.getGL();
1527
+        GL gl = display.GetGL();
1528
1528
 
1529
1529
         sphereKey.radius = radius;
1530
1530
         Integer glList = sphereDisplayLists.get(sphereKey);
..
..
@@ -1594,9 +1594,9 @@
1594
1594
     private static Map<CylinderKey, Integer> cylinderDisplayLists = new HashMap<CylinderKey, Integer>();
1595
1595
     private static CylinderKey cylinderKey = new CylinderKey();
1596
1596
 
1597
-    public void drawCylinder(CameraPane display, float radius, float halfHeight, int upAxis)
1597
+    public void drawCylinder(iCameraPane display, float radius, float halfHeight, int upAxis)
1598
1598
     {
1599
-        GL gl = display.getGL();
1599
+        GL gl = display.GetGL();
1600
1600
 
1601
1601
         gl.glPushMatrix();
1602
1602
         switch (upAxis)