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
---
ObjEditor.java | 4 +-
SwitchNode.java | 2
Merge.java | 8 ++--
CSG.java | 4 +-
Mocap.java | 20 +++++-----
ScriptNode.java | 4 +-
FrameSelector.java | 2
CameraPane.java | 2
cTreeModel.java | 2
ParticleNode.java | 4 +-
RandomNode.java | 2
CSGEditor.java | 2
Object3D.java | 22 +++++-----
13 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/CSG.java b/CSG.java
index 854a935..5a4e95c 100644
--- a/CSG.java
+++ b/CSG.java
@@ -20,7 +20,7 @@
tolerance = 0; //.1;
name = "CSG";
- link2support = true; // display the mesh, not the primitives
+ link2master = true; // display the mesh, not the primitives
CreateMaterial();
}
@@ -134,7 +134,7 @@
/**/
void draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
{
- if (csgType == UNION || !link2support) // || csgType == MERGE)
+ if (csgType == UNION || !link2master) // || csgType == MERGE)
{
BoundaryRep keep = bRep;
bRep = null;
diff --git a/CSGEditor.java b/CSGEditor.java
index 7e8e1be..01423e2 100644
--- a/CSGEditor.java
+++ b/CSGEditor.java
@@ -256,7 +256,7 @@
csg.cellSize2 = size2Slider.getInteger();
csg.tolerance = toleranceSlider.getFloat();
- if (csg.link2support)
+ if (csg.link2master)
csg.retile();
}
diff --git a/CameraPane.java b/CameraPane.java
index 517889f..7627a95 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -1529,7 +1529,7 @@
}
}
float b = 0;
- if (obj.support != null && obj.link2support)
+ if (obj.support != null && obj.link2master)
{
b = 1;
}
diff --git a/FrameSelector.java b/FrameSelector.java
index 42e8231..08538f9 100644
--- a/FrameSelector.java
+++ b/FrameSelector.java
@@ -25,7 +25,7 @@
// System.err.println("Select Frame # " + frame);
// frame %= (getNumFrames() - mocap.offset);
- if (!link2support) // freeze current value
+ if (!link2master) // freeze current value
frame = (int)((getNumFrames() - mocap.GetFirstFrame()) * realframe);
// System.err.println("Select Frame modulo # " + frame);
boolean waslive = mocap.live;
diff --git a/Merge.java b/Merge.java
index 0c09962..03408c4 100644
--- a/Merge.java
+++ b/Merge.java
@@ -88,7 +88,7 @@
CreateMaterial();
- link2support = true;
+ link2master = true;
}
void resetMasterNode(boolean smooth)
@@ -122,11 +122,11 @@
name = "Merge:" + _name;
- link2support = GetObject() != null;
+ link2master = GetObject() != null;
bRep = null;
- if (link2support)
+ if (link2master)
renderme(); // null);
}
@@ -144,7 +144,7 @@
if (bRep == null && GetObject() != null)
renderme(); // display); // only once
- if (/*display.LIVE && live &&*/link2support) // && display.drawMode == display.SHADOW) // FUCK!!!
+ if (/*display.LIVE && live &&*/link2master) // && display.drawMode == display.SHADOW) // FUCK!!!
{
try
{
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)
{
diff --git a/ObjEditor.java b/ObjEditor.java
index 997eb44..d5be27b 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -1421,7 +1421,7 @@
randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
- link2masterCB = AddCheckBox(setupPanel2, GetSupportText(), copy.link2support);
+ link2masterCB = AddCheckBox(setupPanel2, GetSupportText(), copy.link2master);
link2masterCB.setToolTipText("Link to support");
if (Globals.ADVANCED)
@@ -4339,7 +4339,7 @@
return;
} else if (event.getSource() == link2masterCB)
{
- copy.link2support ^= true;
+ copy.link2master ^= true;
objEditor.refreshContents();
return;
}
diff --git a/Object3D.java b/Object3D.java
index 24c90ab..ba7e5c6 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -100,7 +100,7 @@
other.softtouched = softtouched;
other.random = random;
- other.link2support = link2support;
+ other.link2master = link2master;
other.transformcount = transformcount;
other.marked = marked;
other.skip = skip;
@@ -220,10 +220,10 @@
return;
transientsupport = support;
- transientlink2master = link2support;
+ transientlink2master = link2master;
support = null;
- link2support = false;
+ link2master = false;
if (bRep != null)
{
@@ -247,7 +247,7 @@
return;
support = transientsupport;
- link2support = transientlink2master;
+ link2master = transientlink2master;
transientsupport = null;
transientlink2master = false;
@@ -633,7 +633,7 @@
transient boolean keepdontselect;
boolean dontselect = false;
boolean hide = false;
- boolean link2support = false; // performs reset support/master at each frame
+ boolean link2master = false; // performs reset support/master at each frame (cannot rename due to serialization)
boolean marked = false; // animation node
boolean skip = false; // centroid issue
boolean skipmocap = false; // mocap data
@@ -2202,7 +2202,7 @@
{
support = other;
- link2support = support != null;
+ link2master = support != null;
if (support != null && bRep.trimmed)
{
@@ -3921,7 +3921,7 @@
//if (bRep != null)
if (//marked || // does not make sense
(bRep != null || material != null)) // borderline...
- link2support = h;
+ link2master = h;
for (int i = 0; i < Size(); i++)
{
@@ -6159,7 +6159,7 @@
boolean NeedSupport()
{
return
- CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2support && /*live &&*/ support != null
+ CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
// PROBLEM with CROWD!!
&& (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
}
@@ -6243,7 +6243,7 @@
support = support;
boolean usecalllists = !IsDynamic() &&
- IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2support); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
+ IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
//boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
//usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
@@ -6350,7 +6350,7 @@
{
if (display.DrawMode() == iCameraPane.SHADOW)
{
- if (!link2support // tricky to cull in shadow mode.
+ if (!link2master // tricky to cull in shadow mode.
&& GetBRep().FrustumCull(this, null, display.LightCamera(), true))
{
//System.out.print("CULLED");
@@ -8894,7 +8894,7 @@
boolean touch = false;
- if (bRep != null && link2support)
+ if (bRep != null && link2master)
{
if (bbox == null)
{
diff --git a/ParticleNode.java b/ParticleNode.java
index 24079f0..ffb1d1f 100644
--- a/ParticleNode.java
+++ b/ParticleNode.java
@@ -304,7 +304,7 @@
{
support = other;
- link2support = support != null;
+ link2master = support != null;
}
void resetMasterNode(boolean smooth)
@@ -353,7 +353,7 @@
Object3D geo = test;
- if (support != null && link2support)
+ if (support != null && link2master)
geo = support;
if (live && Globals.isLIVE() && (display.DrawMode() == display.SHADOW || !Globals.RENDERSHADOW)) // june 2013
diff --git a/RandomNode.java b/RandomNode.java
index 82dbc83..5551439 100644
--- a/RandomNode.java
+++ b/RandomNode.java
@@ -36,7 +36,7 @@
boolean IsSwitch()
{
- return CameraPane.SWITCH && !this.link2support;
+ return CameraPane.SWITCH && !this.link2master;
}
public int size()
diff --git a/ScriptNode.java b/ScriptNode.java
index 1055a61..278741c 100644
--- a/ScriptNode.java
+++ b/ScriptNode.java
@@ -1508,12 +1508,12 @@
}
if (command.equals("support"))
{
- object.link2support = true;
+ object.link2master = true;
return;
}
if (command.equals("unsupport"))
{
- object.link2support = false;
+ object.link2master = false;
return;
}
if (command.equals("resettransform"))
diff --git a/SwitchNode.java b/SwitchNode.java
index 8792782..edfdfe0 100644
--- a/SwitchNode.java
+++ b/SwitchNode.java
@@ -63,7 +63,7 @@
{
countspeed = speed;
- if (toggleneutral || !link2support)
+ if (toggleneutral || !link2master)
{
do
{
diff --git a/cTreeModel.java b/cTreeModel.java
index 09d1c16..85f893d 100644
--- a/cTreeModel.java
+++ b/cTreeModel.java
@@ -96,7 +96,7 @@
r = 192;
}
- if (obj.link2support)
+ if (obj.link2master)
{
b = 192;
}
--
Gitblit v1.6.2