From 1af7d3700724834e40ad8636bc9a56cdc3b19b15 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sat, 27 Jul 2019 11:52:38 -0400
Subject: [PATCH] New layout icons
---
GLShapeDrawer.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/GLShapeDrawer.java b/GLShapeDrawer.java
index f516e61..ccf72d9 100644
--- a/GLShapeDrawer.java
+++ b/GLShapeDrawer.java
@@ -136,13 +136,13 @@
}
private static float[] glMat = new float[16];
- static public void drawOpenGL(CameraPane display, Transform trans, CollisionShape shape, Vector3f color, int debugMode) {
+ static public void drawOpenGL(iCameraPane display, Transform trans, CollisionShape shape, Vector3f color, int debugMode) {
ObjectPool<Transform> transformsPool = ObjectPool.get(Transform.class);
ObjectPool<Vector3f> vectorsPool = ObjectPool.get(Vector3f.class);
//System.out.println("shape="+shape+" type="+BroadphaseNativeTypes.forValue(shape.getShapeType()));
- GL gl = display.getGL();
+ GL gl = display.GetGL0();
gl.glPushMatrix();
trans.getOpenGLMatrix(glMat);
@@ -550,9 +550,9 @@
private static Map<SphereKey, Integer> sphereDisplayLists = new HashMap<SphereKey, Integer>();
private static SphereKey sphereKey = new SphereKey();
- static public void drawSphere(CameraPane display, float radius, int slices, int stacks)
+ static 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);
@@ -622,9 +622,9 @@
private static Map<CylinderKey, Integer> cylinderDisplayLists = new HashMap<CylinderKey, Integer>();
private static CylinderKey cylinderKey = new CylinderKey();
- static public void drawCylinder(CameraPane display, float radius, float halfHeight, int upAxis)
+ static 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