From 51e45bf615e1e2b4aca2edf9f7333b687c7d015e Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 24 Sep 2019 21:07:45 -0400
Subject: [PATCH] Remove hands.
---
RagDoll.java | 60 ++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/RagDoll.java b/RagDoll.java
index 7e67857..e22ffb2 100644
--- a/RagDoll.java
+++ b/RagDoll.java
@@ -89,11 +89,11 @@
BODYPART_LEFT_UPPER_ARM,
BODYPART_LEFT_LOWER_ARM,
- BODYPART_LEFT_HAND,
+ //BODYPART_LEFT_HAND,
BODYPART_RIGHT_UPPER_ARM,
BODYPART_RIGHT_LOWER_ARM,
- BODYPART_RIGHT_HAND,
+ //BODYPART_RIGHT_HAND,
//BODYPART_GROUND,
@@ -114,11 +114,11 @@
JOINT_LEFT_SHOULDER,
JOINT_LEFT_ELBOW,
- JOINT_LEFT_WRIST,
+ //JOINT_LEFT_WRIST,
JOINT_RIGHT_SHOULDER,
JOINT_RIGHT_ELBOW,
- JOINT_RIGHT_WRIST,
+ //JOINT_RIGHT_WRIST,
JOINT_COUNT
}
@@ -174,19 +174,19 @@
shapes[BodyPart.BODYPART_LEFT_UPPER_LEG.ordinal()] = new CapsuleShape(scale_ragdoll * 0.4f * thin, scale_ragdoll * 0.4f, node);
shapes[BodyPart.BODYPART_LEFT_LOWER_LEG.ordinal()] = new CapsuleShape(scale_ragdoll * 0.37f * thin, scale_ragdoll * 0.37f, node);
- shapes[BodyPart.BODYPART_LEFT_FOOT.ordinal()] = new CapsuleShape(scale_ragdoll * 0.1f * thin, scale_ragdoll * 0.1f, node);
+ shapes[BodyPart.BODYPART_LEFT_FOOT.ordinal()] = new CapsuleShape(scale_ragdoll * 0.2f * thin, scale_ragdoll * 0.2f, node);
shapes[BodyPart.BODYPART_RIGHT_UPPER_LEG.ordinal()] = new CapsuleShape(scale_ragdoll * 0.4f * thin, scale_ragdoll * 0.4f, node);
shapes[BodyPart.BODYPART_RIGHT_LOWER_LEG.ordinal()] = new CapsuleShape(scale_ragdoll * 0.37f * thin, scale_ragdoll * 0.37f, node);
- shapes[BodyPart.BODYPART_RIGHT_FOOT.ordinal()] = new CapsuleShape(scale_ragdoll * 0.1f * thin, scale_ragdoll * 0.1f, node);
+ shapes[BodyPart.BODYPART_RIGHT_FOOT.ordinal()] = new CapsuleShape(scale_ragdoll * 0.2f * thin, scale_ragdoll * 0.2f, node);
shapes[BodyPart.BODYPART_LEFT_UPPER_ARM.ordinal()] = new CapsuleShape(scale_ragdoll * upperarmlength * thin, scale_ragdoll * upperarmlength, node);
shapes[BodyPart.BODYPART_LEFT_LOWER_ARM.ordinal()] = new CapsuleShape(scale_ragdoll * lowerarmlength * thin, scale_ragdoll * lowerarmlength, node);
- shapes[BodyPart.BODYPART_LEFT_HAND.ordinal()] = new CapsuleShape(scale_ragdoll * handlength * thin, scale_ragdoll * handlength, node);
+ //shapes[BodyPart.BODYPART_LEFT_HAND.ordinal()] = new CapsuleShape(scale_ragdoll * handlength * thin, scale_ragdoll * handlength, node);
shapes[BodyPart.BODYPART_RIGHT_UPPER_ARM.ordinal()] = new CapsuleShape(scale_ragdoll * upperarmlength * thin, scale_ragdoll * upperarmlength, node);
shapes[BodyPart.BODYPART_RIGHT_LOWER_ARM.ordinal()] = new CapsuleShape(scale_ragdoll * lowerarmlength * thin, scale_ragdoll * lowerarmlength, node);
- shapes[BodyPart.BODYPART_RIGHT_HAND.ordinal()] = new CapsuleShape(scale_ragdoll * handlength * thin, scale_ragdoll * handlength, node);
+ //shapes[BodyPart.BODYPART_RIGHT_HAND.ordinal()] = new CapsuleShape(scale_ragdoll * handlength * thin, scale_ragdoll * handlength, node);
}
//scale_ragdoll *= 1.25;
@@ -329,15 +329,15 @@
body.getMotionState().setWorldTransform(tmpTrans);
((cRigidBody)body).anchor.set(tmpTrans.origin);
- transform.setIdentity();
- if ((body = bodies[BodyPart.BODYPART_LEFT_HAND.ordinal()]) == null)
- body = bodies[BodyPart.BODYPART_LEFT_HAND.ordinal()] = localCreateRigidBody(1f, 0, transform, shapes[BodyPart.BODYPART_LEFT_HAND.ordinal()]);
- transform.origin.set(-(handlength/2 + lowerarmlength + upperarmlength + upperarmdist) * scale_ragdoll, 1.325f * scale_ragdoll, depth);
- MatrixUtil.setEulerZYX(transform.basis, 0, 0, BulletGlobals.SIMD_HALF_PI);
- tmpTrans.mul(offset, transform);
- body.worldTransform.set(tmpTrans);
- body.getMotionState().setWorldTransform(tmpTrans);
- ((cRigidBody)body).anchor.set(tmpTrans.origin);
+// transform.setIdentity();
+// if ((body = bodies[BodyPart.BODYPART_LEFT_HAND.ordinal()]) == null)
+// body = bodies[BodyPart.BODYPART_LEFT_HAND.ordinal()] = localCreateRigidBody(1f, 0, transform, shapes[BodyPart.BODYPART_LEFT_HAND.ordinal()]);
+// transform.origin.set(-(handlength/2 + lowerarmlength + upperarmlength + upperarmdist) * scale_ragdoll, 1.325f * scale_ragdoll, depth);
+// MatrixUtil.setEulerZYX(transform.basis, 0, 0, BulletGlobals.SIMD_HALF_PI);
+// tmpTrans.mul(offset, transform);
+// body.worldTransform.set(tmpTrans);
+// body.getMotionState().setWorldTransform(tmpTrans);
+// ((cRigidBody)body).anchor.set(tmpTrans.origin);
transform.setIdentity();
if ((body = bodies[BodyPart.BODYPART_RIGHT_UPPER_ARM.ordinal()]) == null)
@@ -359,15 +359,15 @@
body.getMotionState().setWorldTransform(tmpTrans);
((cRigidBody)body).anchor.set(tmpTrans.origin);
- transform.setIdentity();
- if ((body = bodies[BodyPart.BODYPART_RIGHT_HAND.ordinal()]) == null)
- body = bodies[BodyPart.BODYPART_RIGHT_HAND.ordinal()] = localCreateRigidBody(1f, 0, transform, shapes[BodyPart.BODYPART_RIGHT_HAND.ordinal()]);
- transform.origin.set((handlength/2 + lowerarmlength + upperarmlength + upperarmdist) * scale_ragdoll, 1.325f * scale_ragdoll, depth);
- MatrixUtil.setEulerZYX(transform.basis, 0, 0, -BulletGlobals.SIMD_HALF_PI);
- tmpTrans.mul(offset, transform);
- body.worldTransform.set(tmpTrans);
- body.getMotionState().setWorldTransform(tmpTrans);
- ((cRigidBody)body).anchor.set(tmpTrans.origin);
+// transform.setIdentity();
+// if ((body = bodies[BodyPart.BODYPART_RIGHT_HAND.ordinal()]) == null)
+// body = bodies[BodyPart.BODYPART_RIGHT_HAND.ordinal()] = localCreateRigidBody(1f, 0, transform, shapes[BodyPart.BODYPART_RIGHT_HAND.ordinal()]);
+// transform.origin.set((handlength/2 + lowerarmlength + upperarmlength + upperarmdist) * scale_ragdoll, 1.325f * scale_ragdoll, depth);
+// MatrixUtil.setEulerZYX(transform.basis, 0, 0, -BulletGlobals.SIMD_HALF_PI);
+// tmpTrans.mul(offset, transform);
+// body.worldTransform.set(tmpTrans);
+// body.getMotionState().setWorldTransform(tmpTrans);
+// ((cRigidBody)body).anchor.set(tmpTrans.origin);
// Setup some damping on the m_bodies
for (int i = 0; i < BodyPart.BODYPART_COUNT.ordinal(); ++i)
@@ -533,6 +533,7 @@
/// *************************** ///
/// ******* LEFT WRIST ******** ///
+ /**
if (links)
{
localA.setIdentity();
@@ -556,9 +557,11 @@
joints[JointType.JOINT_LEFT_WRIST.ordinal()] = joint6DOF;
// ownerWorld.addConstraint(joints[JointType.JOINT_LEFT_WRIST.ordinal()], !selfcollision);
}
+ /**/
/// *************************** ///
/// ******* RIGHT WRIST ******** ///
+ /**
if (links)
{
localA.setIdentity();
@@ -582,6 +585,7 @@
joints[JointType.JOINT_RIGHT_WRIST.ordinal()] = joint6DOF;
// ownerWorld.addConstraint(joints[JointType.JOINT_RIGHT_WRIST.ordinal()], !selfcollision);
}
+ /**/
/// ******* PELVIS ******** ///
if (links)
@@ -723,6 +727,7 @@
/// *************************** ///
/// ******* LEFT ANKLE ******** ///
+ /**/
if (links)
{
localA.setIdentity();
@@ -746,9 +751,11 @@
joints[JointType.JOINT_LEFT_ANKLE.ordinal()] = joint6DOF;
// ownerWorld.addConstraint(joints[JointType.JOINT_LEFT_KNEE.ordinal()], !selfcollision);
}
+ /**/
/// *************************** ///
/// ******* RIGHT ANKLE ******** ///
+ /**/
if (links)
{
localA.setIdentity();
@@ -772,6 +779,7 @@
joints[JointType.JOINT_RIGHT_ANKLE.ordinal()] = joint6DOF;
// ownerWorld.addConstraint(joints[JointType.JOINT_RIGHT_KNEE.ordinal()], !selfcollision);
}
+ /**/
/// *************************** ///
--
Gitblit v1.6.2