From 3966454055db8e04700e881a091c2d33dcfda232 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 30 Sep 2019 19:22:19 -0400
Subject: [PATCH] tab index
---
GenericJoint.java | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/GenericJoint.java b/GenericJoint.java
index b6d18be..0ea1429 100644
--- a/GenericJoint.java
+++ b/GenericJoint.java
@@ -177,7 +177,9 @@
public void spawnRagdoll(boolean walk) // random)
{
- RagDoll ragDoll = new RagDoll(null, new Vector3f(0f, 0f, 0f), 0.45f, walk); // Math.random() > 0.5/*true*/); // true);
+ // KIDS4
+ RagDoll ragDoll = new RagDoll(null, new Vector3f(0f, 0f, 0f), 0.45f/2, walk, myzoffset = zoffset); // Math.random() > 0.5/*true*/); // true);
+ zoffset += 0.1f;
ragdolls.add(ragDoll);
bRep = null;
@@ -277,6 +279,8 @@
//
ObjectArrayList<Transform> initialmatrices;
+ float myzoffset;
+
void Reset()
{
// int numObjects = dynamicsWorld.getNumCollisionObjects();
@@ -309,12 +313,14 @@
walkdefined = true;
}
- ragdolls.get(0).init(/*staticdynamicsWorld,*/ new Vector3f(0f, 0f, 0f), 0.45f, walk);
+ ragdolls.get(0).init(/*staticdynamicsWorld,*/ new Vector3f(0f, 0f, 0f), ragdolls.get(0).scale, walk, myzoffset);
bRep = null;
}
- void DrawNode(CameraPane display, Object3D /*Composite*/ root, boolean selected) // ??
+ static float zoffset = 0;
+
+ void DrawNode(iCameraPane display, Object3D /*Composite*/ root, boolean selected) // ??
{
// super.DrawNode(display,root,selected);
@@ -330,16 +336,18 @@
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);
- if (Globals.isLIVE() && live && display.DrawMode() == display.SHADOW) // FUCK
+ if (Globals.isLIVE() && live && display.DrawMode() == display.SHADOW) // SHADOW
{
// float ms = getDeltaTimeMicroseconds();
// float minFPS = 1000000f / 60f;
@@ -379,7 +387,7 @@
try
{
//font = FontRender.createFont("Dialog", 11, false, true);
- font = new FontRender.GLFont(gl, GrafreeD.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 +459,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)
@@ -484,7 +492,7 @@
tc.getFrameOffsetB(trans);
- if (false) // c == 2) // DEBUG
+ if (false) //c == 8) // DEBUG
{
gl.glDisable(gl.GL_LIGHTING);
@@ -513,7 +521,7 @@
gl.glPopMatrix();
- tc.getFrameOffsetB(trans);
+ //tc.getFrameOffsetB(trans);
gl.glColor3f(0, 1, 0);
@@ -555,7 +563,8 @@
bRep.startvertices = new int[numObjects];
bRep.averagepoints = new float[(bRep.startvertices.length-1) * 3];
bRep.extremepoints = new float[(bRep.startvertices.length-1) * 3];
- bRep.supportsizes = new float[(bRep.startvertices.length-1)];
+ bRep.supportminsize = new float[(bRep.startvertices.length-1)];
+ bRep.supportmaxsize = new float[(bRep.startvertices.length-1)];
buildrep = true;
initialmatrices = new ObjectArrayList<Transform>();
@@ -796,9 +805,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 +847,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();
@@ -871,6 +880,7 @@
if (shape.getShapeType() == BroadphaseNativeType.COMPOUND_SHAPE_PROXYTYPE)
{
+ new Exception().printStackTrace();
System.exit(0);
CompoundShape compoundShape = (CompoundShape) shape;
Transform childTrans = transformsPool.get();
@@ -901,6 +911,7 @@
{
case BOX_SHAPE_PROXYTYPE:
{
+ new Exception().printStackTrace();
System.exit(0);
BoxShape boxShape = (BoxShape) shape;
Vector3f halfExtent = boxShape.getHalfExtentsWithMargin(vectorsPool.get());
@@ -912,6 +923,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 +970,7 @@
case STATIC_PLANE_PROXYTYPE:
{
+ new Exception().printStackTrace();
System.exit(0);
StaticPlaneShape staticPlaneShape = (StaticPlaneShape) shape;
float planeConst = staticPlaneShape.getPlaneConstant();
@@ -1004,6 +1017,7 @@
case CYLINDER_SHAPE_PROXYTYPE:
{
+ new Exception().printStackTrace();
System.exit(0);
CylinderShape cylinder = (CylinderShape) shape;
int upAxis = cylinder.getUpAxis();
@@ -1218,11 +1232,12 @@
}
else
{
- if (bRep.averagepoints == null || bRep.extremepoints == null || bRep.supportsizes == null)
+ if (bRep.averagepoints == null || bRep.extremepoints == null || bRep.supportminsize == null || bRep.supportmaxsize == null)
{
bRep.averagepoints = new float[(bRep.startvertices.length-1) * 3];
bRep.extremepoints = new float[(bRep.startvertices.length-1) * 3];
- bRep.supportsizes = new float[(bRep.startvertices.length-1)];
+ bRep.supportminsize = new float[(bRep.startvertices.length-1)];
+ bRep.supportmaxsize = new float[(bRep.startvertices.length-1)];
}
float averagex = 0;
@@ -1292,7 +1307,8 @@
}
}
- bRep.supportsizes[currentobject-1] = (float)Math.sqrt(mindist2);
+ bRep.supportminsize[currentobject-1] = (float)Math.sqrt(mindist2);
+ bRep.supportmaxsize[currentobject-1] = (float)Math.sqrt(maxdist2);
}
// if (hull.numTriangles() > 0)
@@ -1356,6 +1372,7 @@
// for polyhedral shapes
if (shape.isPolyhedral())
{
+ new Exception().printStackTrace();
System.exit(0);
PolyhedralConvexShape polyshape = (PolyhedralConvexShape) shape;
@@ -1425,6 +1442,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));
@@ -1522,9 +1540,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 +1612,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