From f1c718cce66e5651a0dae91375db6ebfaded1a92 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sat, 27 Apr 2019 21:33:41 -0400
Subject: [PATCH] Test unfold UV
---
GenericJoint.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/GenericJoint.java b/GenericJoint.java
index b6d18be..ab83012 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);
@@ -330,12 +330,14 @@
e.printStackTrace();
}
- display.GetGL().glPushMatrix();
+ //display.GetGL().glPushMatrix();
+ display.PushMatrix(LA.Identity, 1);
Vector3f v = ragdolls.get(0).bodies[0].worldTransform.origin;
// display.GetGL().glTranslatef(-v.x,0,-v.z);
super.DrawNode(display, root, selected);
- display.GetGL().glPopMatrix();
+ //display.GetGL().glPopMatrix();
+ display.PopMatrix(LA.Identity);
// assert(bRep != null);
@@ -451,9 +453,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.GetGL0():null;
// gl0 = gl;
if (GetDynamicsWorld() != null)
@@ -796,9 +798,9 @@
}
}
- public void drawCube(CameraPane display, float extent)
+ public void drawCube(iCameraPane display, float extent)
{
- GL gl = display.getGL();
+ GL gl = display.GetGL0();
extent = extent * 0.5f;
@@ -838,7 +840,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 +1524,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.GetGL0();
sphereKey.radius = radius;
Integer glList = sphereDisplayLists.get(sphereKey);
@@ -1594,9 +1596,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.GetGL0();
gl.glPushMatrix();
switch (upAxis)
--
Gitblit v1.6.2