From 1e1c7fcdb3d0f8be350c5f6c32b6afa6705168ea Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 05 May 2019 08:58:54 -0400
Subject: [PATCH] Fix import OBJ
---
Mocap.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Mocap.java b/Mocap.java
index f451172..0bbe7d9 100644
--- a/Mocap.java
+++ b/Mocap.java
@@ -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,7 +1564,7 @@
//GraphreeD.
wav.play(volume * usedvolume); //, mywave);
- lastsoundtime = CameraPane.framecount;
+ lastsoundtime = Globals.framecount;
GrafreeD.hassound = true;
}
@@ -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
}
@@ -3496,6 +3497,7 @@
// filters out bad input data
void FilterAnimData()
{
+ new Exception().printStackTrace();
System.exit(0);
float[] data; // = bvh.animation.getBoneData(0);
@@ -3853,7 +3855,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 +3873,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 +3881,7 @@
}
else
{
- if (display.isLIVE() && live && display.drawMode != display.SHADOW)
+ if (Globals.isLIVE() && live && display.DrawMode() != display.SHADOW)
restarted = false;
}
--
Gitblit v1.6.2