From 57f4646563d6757f65ddc00ca38975c352d76de7 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Fri, 27 Sep 2019 20:06:14 -0400
Subject: [PATCH] Wireframe, box mode, and ragdoll zoffset.
---
GenericJoint.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/GenericJoint.java b/GenericJoint.java
index 67a201d..3724371 100644
--- a/GenericJoint.java
+++ b/GenericJoint.java
@@ -178,7 +178,8 @@
public void spawnRagdoll(boolean walk) // random)
{
// KIDS4
- RagDoll ragDoll = new RagDoll(null, new Vector3f(0f, 0f, 0f), 0.45f/2, walk); // Math.random() > 0.5/*true*/); // true);
+ 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;
@@ -278,6 +279,8 @@
//
ObjectArrayList<Transform> initialmatrices;
+ float myzoffset;
+
void Reset()
{
// int numObjects = dynamicsWorld.getNumCollisionObjects();
@@ -310,10 +313,12 @@
walkdefined = true;
}
- ragdolls.get(0).init(/*staticdynamicsWorld,*/ new Vector3f(0f, 0f, 0f), ragdolls.get(0).scale, walk);
+ ragdolls.get(0).init(/*staticdynamicsWorld,*/ new Vector3f(0f, 0f, 0f), ragdolls.get(0).scale, walk, myzoffset);
bRep = null;
}
+
+ static float zoffset = 0;
void DrawNode(iCameraPane display, Object3D /*Composite*/ root, boolean selected) // ??
{
@@ -487,7 +492,7 @@
tc.getFrameOffsetB(trans);
- if (false) // c == 2) // DEBUG
+ if (c == 8) // DEBUG
{
gl.glDisable(gl.GL_LIGHTING);
@@ -516,7 +521,7 @@
gl.glPopMatrix();
- tc.getFrameOffsetB(trans);
+ //tc.getFrameOffsetB(trans);
gl.glColor3f(0, 1, 0);
--
Gitblit v1.6.2