From 4a5b9e0b9ecc97203d4089ca0cd0d6df8c76bf1c Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 22 Apr 2019 17:29:27 -0400
Subject: [PATCH] Fix theRenderer
---
GenericJoint.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/GenericJoint.java b/GenericJoint.java
index 231796a..90f9509 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);
@@ -339,7 +339,7 @@
// assert(bRep != null);
- if (display.isLIVE() && live && display.drawMode == display.SHADOW) // FUCK
+ if (Globals.isLIVE() && live && display.DrawMode() == display.SHADOW) // FUCK
{
// float ms = getDeltaTimeMicroseconds();
// float minFPS = 1000000f / 60f;
@@ -379,7 +379,7 @@
try
{
//font = FontRender.createFont("Dialog", 11, false, true);
- font = new FontRender.GLFont(gl, GraphreeD.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 +451,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.GetGL():null;
// gl0 = gl;
if (GetDynamicsWorld() != null)
@@ -796,9 +796,9 @@
}
}
- public void drawCube(CameraPane display, float extent)
+ public void drawCube(iCameraPane display, float extent)
{
- GL gl = display.getGL();
+ GL gl = display.GetGL();
extent = extent * 0.5f;
@@ -838,7 +838,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();
@@ -1522,9 +1522,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.GetGL();
sphereKey.radius = radius;
Integer glList = sphereDisplayLists.get(sphereKey);
@@ -1594,9 +1594,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.GetGL();
gl.glPushMatrix();
switch (upAxis)
--
Gitblit v1.6.2