From b7dce2b3654df801a3904bc270dfcb641fcdb66e Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 02 Nov 2015 19:20:40 -0500
Subject: [PATCH] Rename GrafreeD
---
Mocap.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/Mocap.java b/Mocap.java
index 88fa618..8af85a4 100644
--- a/Mocap.java
+++ b/Mocap.java
@@ -359,7 +359,7 @@
// //GetFileRoot();
// sept 2014: //
- GraphreeD.RENDERME = 3; // patch for Merge objects
+ GrafreeD.RENDERME = 3; // patch for Merge objects
float[] thedata = bvh.animation.getBoneData(0);
os.x = (float) (path.get(i).toParent[3][0]); // - thedata[frame*6]);
@@ -938,6 +938,7 @@
groundid = floorid;
+ // green
CameraPane.debugpoint.toParent[3][0] = groundx;
CameraPane.debugpoint.toParent[3][1] = floor.y;
CameraPane.debugpoint.toParent[3][2] = groundz;
@@ -998,7 +999,7 @@
lastsoundtime = CameraPane.framecount;
- GraphreeD.hassound = true;
+ GrafreeD.hassound = true;
}
// else
// System.out.println("skipped");
@@ -1016,6 +1017,7 @@
// floor.z += posz;
// System.out.println("Allo " + sourcenode);
+ // purple
CameraPane.debugpoint2.toParent[3][0] = floor.x;// + posx;
CameraPane.debugpoint2.toParent[3][1] = ground; // floor.y;// + sourcenode.parent.toParent[3][1];
CameraPane.debugpoint2.toParent[3][2] = floor.z;// + posz;
@@ -1052,7 +1054,7 @@
v0.z = groundz - floor.z;
double distance = Math.sqrt(v0.dot(v0));
- double maxdist = 0.004;
+ double maxdist = 0.04;
if (distance > maxdist)
{
@@ -1078,8 +1080,27 @@
sourcenode.toParent = LA.newMatrix();
sourcenode.fromParent = LA.newMatrix();
}
+
+ v0.x = v0.z = 0;
+
+ this.get(0).TransformToWorld(v0);
+
+ // cyan
+ CameraPane.debugpoint3.toParent[3][0] = v0.x;
+ CameraPane.debugpoint3.toParent[3][1] = ground;
+ CameraPane.debugpoint3.toParent[3][2] = v0.z;
+
LA.matConcat(sourcenode.toParent, transformnode.toParent, sourcenode.toParent);
LA.matInvert(sourcenode.toParent, sourcenode.fromParent);
+
+ v0.x = v0.z = 0;
+
+ this.get(0).TransformToWorld(v0);
+
+ // red
+ CameraPane.debugpoint4.toParent[3][0] = v0.x;
+ CameraPane.debugpoint4.toParent[3][1] = ground;
+ CameraPane.debugpoint4.toParent[3][2] = v0.z;
}
}
@@ -1835,7 +1856,7 @@
{
SetRotation(sourcenode, new cVector(floor), new cVector(centroid));
}
-
+
if (setposition)
{
if (floorobject != null)
--
Gitblit v1.6.2