From 68e51d528bbddd9f611836d676c8773042ee845a Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sat, 21 Sep 2019 19:45:46 -0400
Subject: [PATCH] Rename back link2master
---
Mocap.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Mocap.java b/Mocap.java
index ce0e14b..32c8f73 100644
--- a/Mocap.java
+++ b/Mocap.java
@@ -969,7 +969,7 @@
TranslateData(offset);
- link2support = true; // mocap position
+ link2master = true; // mocap position
setPose(frame);
@@ -996,9 +996,9 @@
new cVector(path.get(i).toParent[3][0], path.get(i).toParent[3][1], path.get(i).toParent[3][2]));
}
- get(0).link2support = path.size() > 1; // hip orientation
+ get(0).link2master = path.size() > 1; // hip orientation
- if (get(0).link2support)
+ if (get(0).link2master)
{
rotateonce = 2;
}
@@ -1160,7 +1160,7 @@
{
super(s);
- link2support = true;
+ link2master = true;
}
// SET SUPPORT
@@ -1427,7 +1427,7 @@
double w = 0.00015;
//if (!sourcenode.link2master) // strong pin on floor
- if (parent.link2support) // strong pin on floor
+ if (parent.link2master) // strong pin on floor
{
w = 0.005; // .001;
}
@@ -1641,7 +1641,7 @@
// sourcenode.parent.toParent[3][1] = ground - floor.y;
// sourcenode.parent.toParent[3][2] += groundz - floor.z;
// sourcenode.parent.toParent[3][1] = K * (ground - floor.y) + (1 - K) * oldposy;
- if (footcontact && (sourcenode.parent != null && !sourcenode.parent.link2support)) // strong pin on floor
+ if (footcontact && (sourcenode.parent != null && !sourcenode.parent.link2master)) // strong pin on floor
{
v0.x = groundx - floor.x;
v0.y = 0; // groundx - floor.x;
@@ -2006,7 +2006,7 @@
// if (sourcenode.link2master)
// if (goalx != 0 || goalz != 0)
// K = 0.02; // .0625;
- if (parent.link2support) // strong pin on floor
+ if (parent.link2master) // strong pin on floor
{
K = 0.05; // 0.02;
}
@@ -2423,9 +2423,9 @@
// SetBreakPoint(get(0).toParent[0], 0);
// }
- boolean setrotation = get(0).link2support && !firsttimeafterload && frame > 0;
+ boolean setrotation = get(0).link2master && !firsttimeafterload && frame > 0;
boolean setposition = sourcenode != null && // sourcenode.parent != null && // july 2014
- sourcenode./*parent.*/link2support && !firsttimeafterload && frame > 0;
+ sourcenode./*parent.*/link2master && !firsttimeafterload && frame > 0;
// cVector centroid = new cVector();
// cVector floor = new cVector();
@@ -2858,7 +2858,7 @@
// set translation
// (currently only possible for root bone! see mocapdata.com data)
- if (bone._isRoot && link2support) // && !GetFileRoot().link2master)
+ if (bone._isRoot && link2master) // && !GetFileRoot().link2master)
{
if (hasTranslation) // && _translationEnabled)
{
--
Gitblit v1.6.2