From 42107f9a01652cb2f47228d20c1148a2a22f6a63 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 22 May 2018 19:33:31 -0400
Subject: [PATCH] new torus code and VR
---
Mocap.java | 46 ++++++++++++++++++++++++++++++++++------------
1 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/Mocap.java b/Mocap.java
index d01cb85..99ef9dc 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]);
@@ -754,7 +754,7 @@
//long
// june 2014 floorid = sourcenode.getFloor(floor); // , sourcenode.parent);
- CameraPane.debugpoints[0].name = "Floor = " + floorid;
+ CameraPane.debugpoints[0].name = ""; // "Floor = " + 0; // floorid;
CameraPane.debugpoints[0].toParent[3][0] = floor.x;
CameraPane.debugpoints[0].toParent[3][1] = floor.y;
CameraPane.debugpoints[0].toParent[3][2] = floor.z;
@@ -770,7 +770,7 @@
this.count--; // currently drawing itself
- CameraPane.debugpoints[7].name = "Centroid = " + groundid; // centroid;
+ CameraPane.debugpoints[7].name = ""; // Centroid = " + 0; // groundid; // centroid;
CameraPane.debugpoints[7].toParent[3][0] = centroid.x;
CameraPane.debugpoints[7].toParent[3][1] = centroid.y;
CameraPane.debugpoints[7].toParent[3][2] = centroid.z;
@@ -795,7 +795,7 @@
// jan 2014 sourcenode.parent.TransformToWorld(tmp);
- CameraPane.debugpoints[1].name = "C+";
+ CameraPane.debugpoints[1].name = ""; // "C+";
CameraPane.debugpoints[1].toParent[3][0] = tmp.x;
CameraPane.debugpoints[1].toParent[3][1] = tmp.y;
CameraPane.debugpoints[1].toParent[3][2] = tmp.z;
@@ -814,7 +814,7 @@
tmp.z = pinz;
}
- CameraPane.debugpoints[2].name = "Pin";
+ CameraPane.debugpoints[2].name = ""; // "Pin";
CameraPane.debugpoints[2].toParent[3][0] = tmp.x;
CameraPane.debugpoints[2].toParent[3][1] = tmp.y;
CameraPane.debugpoints[2].toParent[3][2] = tmp.z;
@@ -822,7 +822,7 @@
//if (sourcenode.parent.parent != null)
// jan 2014 sourcenode.parent.TransformToLocal(tmp); //, tmp);
- CameraPane.debugpoints[3].name = "C-";
+ CameraPane.debugpoints[3].name = ""; // "C-";
CameraPane.debugpoints[3].toParent[3][0] = tmp.x;
CameraPane.debugpoints[3].toParent[3][1] = tmp.y;
CameraPane.debugpoints[3].toParent[3][2] = tmp.z;
@@ -895,14 +895,14 @@
// if (sourcenode.parent.parent != null)
// sourcenode.parent.parent.TransformToWorld(floor); //, floor);
- CameraPane.debugpoints[5].name = "F++";
+ CameraPane.debugpoints[5].name = ""; // "F++";
CameraPane.debugpoints[5].toParent[3][0] = floor.x;
CameraPane.debugpoints[5].toParent[3][1] = floor.y;
CameraPane.debugpoints[5].toParent[3][2] = floor.z;
floor.y = tempg;
- CameraPane.debugpoints[6].name = "F+-";
+ CameraPane.debugpoints[6].name = ""; // "F+-";
CameraPane.debugpoints[6].toParent[3][0] = floor.x;
CameraPane.debugpoints[6].toParent[3][1] = floor.y;
CameraPane.debugpoints[6].toParent[3][2] = floor.z;
@@ -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;
}
}
@@ -1318,7 +1339,7 @@
rotsourcenode.TransformToWorld(test);
- CameraPane.debugpoints[4].name = "ROT = "; // + test;
+ CameraPane.debugpoints[4].name = ""; // "ROT = "; // + test;
CameraPane.debugpoints[4].toParent[3][0] = test.x;
CameraPane.debugpoints[4].toParent[3][1] = test.y;
CameraPane.debugpoints[4].toParent[3][2] = test.z;
@@ -1835,7 +1856,7 @@
{
SetRotation(sourcenode, new cVector(floor), new cVector(centroid));
}
-
+
if (setposition)
{
if (floorobject != null)
@@ -2833,6 +2854,7 @@
if (lastframetest == 0)
lastframetest = bvh.animation.getNumFrames();
+ // WARNING: RESET DESTROYS EVERYTHING
if (baseframe >= lastframetest) // july 2013 // - GetFirstFrame())
{
System.out.println("MOCAP reset: " + this.GetFileRoot() +
--
Gitblit v1.6.2