From f69d25e4682ca33edfc8cfad26187050f4eb558a Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 05 May 2019 14:06:57 -0400
Subject: [PATCH] Remove "D".
---
Mocap.java | 57 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/Mocap.java b/Mocap.java
index f451172..54415a3 100644
--- a/Mocap.java
+++ b/Mocap.java
@@ -921,7 +921,7 @@
// //GetFileRoot();
// sept 2014: //
- GrafreeD.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]);
@@ -1519,7 +1519,7 @@
// mywave = currentwave++;
// }
// sound
- cVector eye = CameraPane.theRenderer.eyeCamera.location;
+ cVector eye = Globals.theRenderer.EyeCamera().location;
// if (sourcenode.parent.parent != null)
// sourcenode.parent.parent.TransformToWorld(floor, tmp);
@@ -1564,9 +1564,9 @@
//GraphreeD.
wav.play(volume * usedvolume); //, mywave);
- lastsoundtime = CameraPane.framecount;
+ lastsoundtime = Globals.framecount;
- GrafreeD.hassound = true;
+ Grafreed.hassound = true;
}
// else
// System.out.println("skipped");
@@ -2267,7 +2267,7 @@
}
if (!smoothed)
- for (int i=0; --i>=0;)
+ for (int i=10; --i>=0;)
SmoothAnimData(); // much reduces shakiness
smoothed = true;
@@ -3252,12 +3252,13 @@
int step = 1;
+ // patch for running hare
if (speedup) // fev 2014
step *= 2; // 4;
if (rewind) // mars 2014
step *= 4;
- if (CameraPane.FAST) // && !CameraPane.HOLD)
+ //if (CameraPane.FAST) // && !CameraPane.HOLD)
step *= CameraPane.STEP;
//System.err.println("Step Mocap frame # " + frame);
@@ -3289,7 +3290,7 @@
"; fullname = " + fullname);
//int delta = frame - baseframe;
- if (CameraPane.CROWD)
+ if (Globals.CROWD)
{
baseframe = GetFirstFrame(); // 0 initial point
}
@@ -3298,23 +3299,40 @@
// SetPositionDelta(false, true, false); // ?? false);
{
if (support == null)
- ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
+ {
+ if (new File(fullname).exists())
+ ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
+ else
+ {
+ SetGlobalTransform();
+ Rewind();
+ Fade();
+ }
+ }
else
{
- try
- {
+// try
+// {
bvh = ((Mocap)support.get(mocapsupport++ % support.Size())).bvh;
// SetPositionDelta(false, true, true, true);
LoadData();
Rewind();
Fade();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
- }
+// }
+// catch (Exception e)
+// {
+// System.err.println("An error occured while loading data. Use fallback by loading the file.");
+// //e.printStackTrace();
+// try
+// {
+// ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
+// }
+// catch (Exception e2)
+// {
+// System.err.println("Motion file not found: " + fullname);
+// }
+// }
}
}
@@ -3496,6 +3514,7 @@
// filters out bad input data
void FilterAnimData()
{
+ new Exception().printStackTrace();
System.exit(0);
float[] data; // = bvh.animation.getBoneData(0);
@@ -3853,7 +3872,7 @@
transient boolean restarted; // CROWD issue?
- void drawSelf(CameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
+ void drawSelf(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
{
//System.err.println("drawSelf Mocap frame # " + frame);
//System.err.println("drawSelf Mocap baseframe # " + baseframe);
@@ -3871,7 +3890,7 @@
// return;
if (!restarted && /*display.restartframe &&*/
- display.isLIVE() && live && display.drawMode == display.SHADOW) // FUCK
+ Globals.isLIVE() && live && display.DrawMode() == display.SHADOW) // FUCK
{
//display.restartframe = false;
restarted = true;
@@ -3879,7 +3898,7 @@
}
else
{
- if (display.isLIVE() && live && display.drawMode != display.SHADOW)
+ if (Globals.isLIVE() && live && display.DrawMode() != display.SHADOW)
restarted = false;
}
--
Gitblit v1.6.2