Normand Briere
2019-04-22 4a5b9e0b9ecc97203d4089ca0cd0d6df8c76bf1c
GenericJoint.java
....@@ -314,7 +314,7 @@
314314 bRep = null;
315315 }
316316
317
- void DrawNode(CameraPane display, Object3D /*Composite*/ root, boolean selected) // ??
317
+ void DrawNode(iCameraPane display, Object3D /*Composite*/ root, boolean selected) // ??
318318 {
319319 // super.DrawNode(display,root,selected);
320320
....@@ -339,7 +339,7 @@
339339
340340 // assert(bRep != null);
341341
342
- if (display.isLIVE() && live && display.drawMode == display.SHADOW) // FUCK
342
+ if (Globals.isLIVE() && live && display.DrawMode() == display.SHADOW) // FUCK
343343 {
344344 // float ms = getDeltaTimeMicroseconds();
345345 // float minFPS = 1000000f / 60f;
....@@ -451,9 +451,9 @@
451451 int startvertex;
452452 int currentobject;
453453
454
- public void renderme(CameraPane display)
454
+ public void renderme(iCameraPane display)
455455 {
456
- GL gl = display!=null?display.getGL():null;
456
+ GL gl = display!=null?display.GetGL():null;
457457
458458 // gl0 = gl;
459459 if (GetDynamicsWorld() != null)
....@@ -796,9 +796,9 @@
796796 }
797797 }
798798
799
- public void drawCube(CameraPane display, float extent)
799
+ public void drawCube(iCameraPane display, float extent)
800800 {
801
- GL gl = display.getGL();
801
+ GL gl = display.GetGL();
802802
803803 extent = extent * 0.5f;
804804
....@@ -838,7 +838,7 @@
838838
839839 private /*static*/ float[] glMat = new float[16];
840840
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)
842842 {
843843 GL gl = null; // display.getGL();
844844
....@@ -1522,9 +1522,9 @@
15221522 private static Map<SphereKey, Integer> sphereDisplayLists = new HashMap<SphereKey, Integer>();
15231523 private static SphereKey sphereKey = new SphereKey();
15241524
1525
- public void drawSphere(CameraPane display, float radius, int slices, int stacks)
1525
+ public void drawSphere(iCameraPane display, float radius, int slices, int stacks)
15261526 {
1527
- GL gl = display.getGL();
1527
+ GL gl = display.GetGL();
15281528
15291529 sphereKey.radius = radius;
15301530 Integer glList = sphereDisplayLists.get(sphereKey);
....@@ -1594,9 +1594,9 @@
15941594 private static Map<CylinderKey, Integer> cylinderDisplayLists = new HashMap<CylinderKey, Integer>();
15951595 private static CylinderKey cylinderKey = new CylinderKey();
15961596
1597
- public void drawCylinder(CameraPane display, float radius, float halfHeight, int upAxis)
1597
+ public void drawCylinder(iCameraPane display, float radius, float halfHeight, int upAxis)
15981598 {
1599
- GL gl = display.getGL();
1599
+ GL gl = display.GetGL();
16001600
16011601 gl.glPushMatrix();
16021602 switch (upAxis)