Normand Briere
2019-11-17 cb37a129d1adb403019c96e798e86e2da9667f15
GLShapeDrawer.java
....@@ -136,13 +136,13 @@
136136 }
137137 private static float[] glMat = new float[16];
138138
139
- static public void drawOpenGL(CameraPane display, Transform trans, CollisionShape shape, Vector3f color, int debugMode) {
139
+ static public void drawOpenGL(iCameraPane display, Transform trans, CollisionShape shape, Vector3f color, int debugMode) {
140140 ObjectPool<Transform> transformsPool = ObjectPool.get(Transform.class);
141141 ObjectPool<Vector3f> vectorsPool = ObjectPool.get(Vector3f.class);
142142
143143 //System.out.println("shape="+shape+" type="+BroadphaseNativeTypes.forValue(shape.getShapeType()));
144144
145
- GL gl = display.getGL();
145
+ GL gl = display.GetGL0();
146146
147147 gl.glPushMatrix();
148148 trans.getOpenGLMatrix(glMat);
....@@ -550,9 +550,9 @@
550550 private static Map<SphereKey, Integer> sphereDisplayLists = new HashMap<SphereKey, Integer>();
551551 private static SphereKey sphereKey = new SphereKey();
552552
553
- static public void drawSphere(CameraPane display, float radius, int slices, int stacks)
553
+ static public void drawSphere(iCameraPane display, float radius, int slices, int stacks)
554554 {
555
- GL gl = display.getGL();
555
+ GL gl = display.GetGL0();
556556
557557 sphereKey.radius = radius;
558558 Integer glList = sphereDisplayLists.get(sphereKey);
....@@ -622,9 +622,9 @@
622622 private static Map<CylinderKey, Integer> cylinderDisplayLists = new HashMap<CylinderKey, Integer>();
623623 private static CylinderKey cylinderKey = new CylinderKey();
624624
625
- static public void drawCylinder(CameraPane display, float radius, float halfHeight, int upAxis)
625
+ static public void drawCylinder(iCameraPane display, float radius, float halfHeight, int upAxis)
626626 {
627
- GL gl = display.getGL();
627
+ GL gl = display.GetGL0();
628628
629629 gl.glPushMatrix();
630630 switch (upAxis)