From cd87df088b1850ba0c90beb6c866c443e4eaf3b9 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sat, 08 Jun 2019 23:56:42 -0400
Subject: [PATCH] Fix shadow and bump issue.
---
Mocap.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/Mocap.java b/Mocap.java
index fc0ff2e..246c834 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];
@@ -664,8 +670,8 @@
double targetdirx;
double targetdirz;
- double goalposx = -20;
- double goalposz = -10;
+ double goalposx = 0; // -20;
+ double goalposz = 0; // -10;
boolean followpath;
@@ -921,7 +927,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]);
@@ -1566,7 +1572,7 @@
lastsoundtime = Globals.framecount;
- GrafreeD.hassound = true;
+ Grafreed.hassound = true;
}
// else
// System.out.println("skipped");
@@ -2797,7 +2803,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 +3240,8 @@
// aout 2013 endframe = 0; // june 2013
- //ResetZero();
- setPose(frame);
+ ResetZero();
+ //setPose(frame);
}
static int mocapsupport = 0;
@@ -3300,7 +3307,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 +3896,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