From d7bc8865056ea0d35df261e719f92e1422af7c6e Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 05 May 2019 09:00:26 -0400
Subject: [PATCH] Fix Windows issues.
---
GenericJoint.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/GenericJoint.java b/GenericJoint.java
index 90f9509..da925d6 100644
--- a/GenericJoint.java
+++ b/GenericJoint.java
@@ -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);
@@ -453,7 +455,7 @@
public void renderme(iCameraPane display)
{
- GL gl = display!=null?display.GetGL():null;
+ GL gl = display!=null?display.GetGL0():null;
// gl0 = gl;
if (GetDynamicsWorld() != null)
@@ -798,7 +800,7 @@
public void drawCube(iCameraPane display, float extent)
{
- GL gl = display.GetGL();
+ GL gl = display.GetGL0();
extent = extent * 0.5f;
@@ -871,6 +873,7 @@
if (shape.getShapeType() == BroadphaseNativeType.COMPOUND_SHAPE_PROXYTYPE)
{
+ new Exception().printStackTrace();
System.exit(0);
CompoundShape compoundShape = (CompoundShape) shape;
Transform childTrans = transformsPool.get();
@@ -901,6 +904,7 @@
{
case BOX_SHAPE_PROXYTYPE:
{
+ new Exception().printStackTrace();
System.exit(0);
BoxShape boxShape = (BoxShape) shape;
Vector3f halfExtent = boxShape.getHalfExtentsWithMargin(vectorsPool.get());
@@ -912,6 +916,7 @@
}
case SPHERE_SHAPE_PROXYTYPE:
{
+ new Exception().printStackTrace();
System.exit(0);
SphereShape sphereShape = (SphereShape) shape;
float radius = sphereShape.getMargin(); // radius doesn't include the margin, so draw with margin
@@ -958,6 +963,7 @@
case STATIC_PLANE_PROXYTYPE:
{
+ new Exception().printStackTrace();
System.exit(0);
StaticPlaneShape staticPlaneShape = (StaticPlaneShape) shape;
float planeConst = staticPlaneShape.getPlaneConstant();
@@ -1004,6 +1010,7 @@
case CYLINDER_SHAPE_PROXYTYPE:
{
+ new Exception().printStackTrace();
System.exit(0);
CylinderShape cylinder = (CylinderShape) shape;
int upAxis = cylinder.getUpAxis();
@@ -1356,6 +1363,7 @@
// for polyhedral shapes
if (shape.isPolyhedral())
{
+ new Exception().printStackTrace();
System.exit(0);
PolyhedralConvexShape polyshape = (PolyhedralConvexShape) shape;
@@ -1425,6 +1433,7 @@
if (shape.isConcave())//>getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE||shape->getShapeType() == GIMPACT_SHAPE_PROXYTYPE)
// if (shape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
{
+ new Exception().printStackTrace();
System.exit(0);
ConcaveShape concaveMesh = (ConcaveShape) shape;
//btVector3 aabbMax(btScalar(1e30),btScalar(1e30),btScalar(1e30));
@@ -1524,7 +1533,7 @@
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);
@@ -1596,7 +1605,7 @@
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