From 13e9febe94aaeebad9c97f6d3e2aa4d73b2495c8 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 17 Jun 2019 18:49:45 -0400
Subject: [PATCH] Fix refresh info.
---
Mocap.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/Mocap.java b/Mocap.java
index 54415a3..a98d80c 100644
--- a/Mocap.java
+++ b/Mocap.java
@@ -484,6 +484,12 @@
{
Object3D hip = get(0);
+ if (toParent == null)
+ {
+ toParent = LA.newMatrix();
+ fromParent = LA.newMatrix();
+ }
+
LA.matConcat(toParent, hip.get(0).toParent, matrix);
mocaporigin.x = matrix[3][0];
@@ -638,6 +644,24 @@
// transient // aout 2013
Object3D skeleton;
+ void ExtractBigData(Object3D o)
+ {
+ super.ExtractBigData(o);
+
+ o.bvh = this.bvh;
+ o.skeleton = this.skeleton;
+ this.bvh = null;
+ this.skeleton = null;
+ }
+
+ void RestoreBigData(Object3D o)
+ {
+ super.RestoreBigData(o);
+
+ this.bvh = o.bvh;
+ this.skeleton = o.skeleton;
+ }
+
boolean smoothed;
//boolean touched;
@@ -664,8 +688,8 @@
double targetdirx;
double targetdirz;
- double goalposx = -20;
- double goalposz = -10;
+ double goalposx = 0; // -20;
+ double goalposz = 0; // -10;
boolean followpath;
@@ -2797,7 +2821,8 @@
//if (bone._rotationEnabled)
if (//frame > 0 &&
!bone.skipmocap &&
- !bone.name.contains("head") // &&
+ !bone.name.contains("head") &&
+ !bone.name.contains("Head") // &&
// !bone.name.contains("rFoot") &&
// !bone.name.contains("lFoot") &&
// !bone.name.contains("Pinky") &&
@@ -3233,8 +3258,8 @@
// aout 2013 endframe = 0; // june 2013
- //ResetZero();
- setPose(frame);
+ ResetZero();
+ //setPose(frame);
}
static int mocapsupport = 0;
@@ -3300,7 +3325,7 @@
{
if (support == null)
{
- if (new File(fullname).exists())
+ if (bvh == null && new File(fullname).exists())
ObjEditor.LoadBVHFile(fullname, this, false, beginframe, lastframetest);
else
{
@@ -3889,17 +3914,22 @@
// if (firstframe)
// return;
- if (!restarted && /*display.restartframe &&*/
- Globals.isLIVE() && live && display.DrawMode() == display.SHADOW) // FUCK
+ if (//!restarted && /*display.restartframe &&*/
+ Globals.isLIVE() && live && (display.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW))
{
//display.restartframe = false;
restarted = true;
+ //System.err.println("restarted = true");
Step();
}
else
{
- if (Globals.isLIVE() && live && display.DrawMode() != display.SHADOW)
+ //System.err.println("restarted");
+ if (Globals.isLIVE() && live && display.DrawMode() != iCameraPane.SHADOW)
+ {
restarted = false;
+ //System.err.println("restarted = false");
+ }
}
super.drawSelf(display, root, selected, blocked);
--
Gitblit v1.6.2