parent: cbe4e901 | patch | commit
Normand Briere
2019-09-21 68e51d528bbddd9f611836d676c8773042ee845a 
Rename back link2master
13 files modified
78 ■■■■■ changed files
CSG.java 4 ●●●●● patch | view | raw | blame | history
CSGEditor.java 2 ●●●●● patch | view | raw | blame | history
CameraPane.java 2 ●●●●● patch | view | raw | blame | history
FrameSelector.java 2 ●●●●● patch | view | raw | blame | history
Merge.java 8 ●●●●● patch | view | raw | blame | history
Mocap.java 20 ●●●●● patch | view | raw | blame | history
ObjEditor.java 4 ●●●●● patch | view | raw | blame | history
Object3D.java 22 ●●●●● patch | view | raw | blame | history
ParticleNode.java 4 ●●●●● patch | view | raw | blame | history
RandomNode.java 2 ●●●●● patch | view | raw | blame | history
ScriptNode.java 4 ●●●●● patch | view | raw | blame | history
SwitchNode.java 2 ●●●●● patch | view | raw | blame | history
cTreeModel.java 2 ●●●●● patch | view | raw | blame | history 
 CSG.java
....@@ -20,7 +20,7 @@
2020         tolerance = 0; //.1;
2121         name = "CSG";
2222         
23
-        link2support = true; // display the mesh, not the primitives
23
+        link2master = true; // display the mesh, not the primitives
2424         CreateMaterial();
2525     }
2626 
....@@ -134,7 +134,7 @@
134134     /**/
135135     void draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
136136     {
137
-        if (csgType == UNION || !link2support) // || csgType == MERGE)
137
+        if (csgType == UNION || !link2master) // || csgType == MERGE)
138138         {
139139             BoundaryRep keep = bRep;
140140             bRep = null;


 CSGEditor.java
....@@ -256,7 +256,7 @@
256256 		csg.cellSize2 = size2Slider.getInteger();
257257 		csg.tolerance = toleranceSlider.getFloat();
258258                 
259
-                if (csg.link2support)
259
+                if (csg.link2master)
260260                     csg.retile();
261261 	}
262262 	


 CameraPane.java
....@@ -1529,7 +1529,7 @@
15291529                 }
15301530             }
15311531             float b = 0;
1532
-            if (obj.support != null && obj.link2support)
1532
+            if (obj.support != null && obj.link2master)
15331533             {
15341534                 b = 1;
15351535             }


 FrameSelector.java
....@@ -25,7 +25,7 @@
2525         
2626       //  System.err.println("Select Frame # " + frame);
2727    //     frame %= (getNumFrames() - mocap.offset);
28
-        if (!link2support) // freeze current value
28
+        if (!link2master) // freeze current value
2929             frame = (int)((getNumFrames() - mocap.GetFirstFrame()) * realframe);
3030       //  System.err.println("Select Frame modulo # " + frame);
3131         boolean waslive = mocap.live;


 Merge.java
....@@ -88,7 +88,7 @@
8888         
8989         CreateMaterial();
9090         
91
-        link2support = true;
91
+        link2master = true;
9292     }
9393     
9494     void resetMasterNode(boolean smooth)
....@@ -122,11 +122,11 @@
122122                     
123123         name = "Merge:" + _name;
124124         
125
-        link2support = GetObject() != null;
125
+        link2master = GetObject() != null;
126126         
127127         bRep = null;
128128         
129
-        if (link2support)
129
+        if (link2master)
130130             renderme(); // null);
131131     }
132132     
....@@ -144,7 +144,7 @@
144144         if (bRep == null && GetObject() != null)
145145             renderme(); // display); // only once
146146         
147
-        if (/*display.LIVE && live &&*/link2support) // && display.drawMode == display.SHADOW) // FUCK!!!
147
+        if (/*display.LIVE && live &&*/link2master) // && display.drawMode == display.SHADOW) // FUCK!!!
148148         {
149149             try
150150             {


 Mocap.java
....@@ -969,7 +969,7 @@
969969                             
970970                     TranslateData(offset);
971971                     
972
-                    link2support = true; // mocap position
972
+                    link2master = true; // mocap position
973973                     
974974                     setPose(frame);
975975                     
....@@ -996,9 +996,9 @@
996996                       new cVector(path.get(i).toParent[3][0],  path.get(i).toParent[3][1],  path.get(i).toParent[3][2]));
997997         }
998998         
999
-        get(0).link2support = path.size() > 1; // hip orientation
999
+        get(0).link2master = path.size() > 1; // hip orientation
10001000         
1001
-        if (get(0).link2support)
1001
+        if (get(0).link2master)
10021002         {
10031003             rotateonce = 2;
10041004         }
....@@ -1160,7 +1160,7 @@
11601160     {
11611161         super(s);
11621162         
1163
-        link2support = true;
1163
+        link2master = true;
11641164     }
11651165     
11661166     // SET SUPPORT
....@@ -1427,7 +1427,7 @@
14271427         double w = 0.00015;
14281428 
14291429         //if (!sourcenode.link2master) // strong pin on floor
1430
-        if (parent.link2support) // strong pin on floor
1430
+        if (parent.link2master) // strong pin on floor
14311431         {
14321432             w = 0.005; // .001;
14331433         }
....@@ -1641,7 +1641,7 @@
16411641 //            sourcenode.parent.toParent[3][1] = ground - floor.y;
16421642 //            sourcenode.parent.toParent[3][2] += groundz - floor.z;
16431643 //            sourcenode.parent.toParent[3][1] = K * (ground - floor.y) + (1 - K) * oldposy;
1644
-            if (footcontact && (sourcenode.parent != null && !sourcenode.parent.link2support)) // strong pin on floor
1644
+            if (footcontact && (sourcenode.parent != null && !sourcenode.parent.link2master)) // strong pin on floor
16451645             {
16461646         v0.x = groundx - floor.x;
16471647         v0.y = 0; // groundx - floor.x;
....@@ -2006,7 +2006,7 @@
20062006 //        if (sourcenode.link2master)
20072007 //        if (goalx != 0 || goalz != 0)
20082008 //            K = 0.02; // .0625;
2009
-        if (parent.link2support) // strong pin on floor
2009
+        if (parent.link2master) // strong pin on floor
20102010         {
20112011             K = 0.05; // 0.02;
20122012         }
....@@ -2423,9 +2423,9 @@
24232423 //            SetBreakPoint(get(0).toParent[0], 0);
24242424 //        }
24252425         
2426
-        boolean setrotation = get(0).link2support && !firsttimeafterload && frame > 0;
2426
+        boolean setrotation = get(0).link2master && !firsttimeafterload && frame > 0;
24272427         boolean setposition = sourcenode != null && // sourcenode.parent != null && // july 2014
2428
-                              sourcenode./*parent.*/link2support && !firsttimeafterload && frame > 0;
2428
+                              sourcenode./*parent.*/link2master && !firsttimeafterload && frame > 0;
24292429         
24302430 //        cVector centroid = new cVector();
24312431 //        cVector floor = new cVector();
....@@ -2858,7 +2858,7 @@
28582858 
28592859                 // set translation
28602860                 // (currently only possible for root bone! see mocapdata.com data)
2861
-                if (bone._isRoot && link2support) // && !GetFileRoot().link2master)
2861
+                if (bone._isRoot && link2master) // && !GetFileRoot().link2master)
28622862                 {
28632863                     if (hasTranslation) // && _translationEnabled)
28642864                     {


 ObjEditor.java
....@@ -1421,7 +1421,7 @@
14211421         randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
14221422         randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
14231423 
1424
-        link2masterCB = AddCheckBox(setupPanel2, GetSupportText(), copy.link2support);
1424
+        link2masterCB = AddCheckBox(setupPanel2, GetSupportText(), copy.link2master);
14251425         link2masterCB.setToolTipText("Link to support");
14261426         
14271427         if (Globals.ADVANCED)
....@@ -4339,7 +4339,7 @@
43394339             return;
43404340         } else if (event.getSource() == link2masterCB)
43414341         {
4342
-            copy.link2support ^= true;
4342
+            copy.link2master ^= true;
43434343             objEditor.refreshContents();
43444344             return;
43454345         }


 Object3D.java
....@@ -100,7 +100,7 @@
100100         other.softtouched = softtouched;
101101         
102102         other.random = random;
103
-        other.link2support = link2support;
103
+        other.link2master = link2master;
104104         other.transformcount = transformcount;
105105         other.marked = marked;
106106         other.skip = skip;
....@@ -220,10 +220,10 @@
220220             return;
221221 
222222         transientsupport = support;
223
-        transientlink2master = link2support;
223
+        transientlink2master = link2master;
224224 
225225         support = null;
226
-        link2support = false;
226
+        link2master = false;
227227 
228228         if (bRep != null)
229229         {
....@@ -247,7 +247,7 @@
247247             return;
248248 
249249         support = transientsupport;
250
-        link2support = transientlink2master;
250
+        link2master = transientlink2master;
251251         transientsupport = null;
252252         transientlink2master = false;
253253 
....@@ -633,7 +633,7 @@
633633     transient boolean keepdontselect;
634634     boolean dontselect = false;
635635     boolean hide = false;
636
-    boolean link2support = false; // performs reset support/master at each frame
636
+    boolean link2master = false; // performs reset support/master at each frame (cannot rename due to serialization)
637637     boolean marked = false; // animation node
638638     boolean skip = false; // centroid issue
639639     boolean skipmocap = false; // mocap data
....@@ -2202,7 +2202,7 @@
22022202         {
22032203             support = other;
22042204 
2205
-            link2support = support != null;
2205
+            link2master = support != null;
22062206 
22072207             if (support != null && bRep.trimmed)
22082208             {
....@@ -3921,7 +3921,7 @@
39213921         //if (bRep != null)
39223922         if (//marked || // does not make sense
39233923                 (bRep != null || material != null)) // borderline...
3924
-            link2support = h;
3924
+            link2master = h;
39253925         
39263926         for (int i = 0; i < Size(); i++)
39273927         {
....@@ -6159,7 +6159,7 @@
61596159     boolean NeedSupport()
61606160     {
61616161         return
6162
-                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2support && /*live &&*/ support != null
6162
+                CameraPane.SUPPORT && (!CameraPane.movingcamera || (!Globals.FREEZEONMOVE && Globals.isLIVE())) && link2master && /*live &&*/ support != null
61636163                  // PROBLEM with CROWD!!
61646164                     && (Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || Globals.CROWD);
61656165     }
....@@ -6243,7 +6243,7 @@
62436243             support = support;
62446244         
62456245         boolean usecalllists = !IsDynamic() &&
6246
-                                    IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2support); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
6246
+                                    IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
62476247         //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
62486248         
62496249         //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
....@@ -6350,7 +6350,7 @@
63506350         {
63516351             if (display.DrawMode() == iCameraPane.SHADOW)
63526352             {
6353
-                if (!link2support // tricky to cull in shadow mode.
6353
+                if (!link2master // tricky to cull in shadow mode.
63546354                          && GetBRep().FrustumCull(this, null, display.LightCamera(), true))
63556355                 {
63566356                     //System.out.print("CULLED");
....@@ -8894,7 +8894,7 @@
88948894         
88958895         boolean touch = false;
88968896         
8897
-        if (bRep != null && link2support)
8897
+        if (bRep != null && link2master)
88988898         {
88998899             if (bbox == null)
89008900             {


 ParticleNode.java
....@@ -304,7 +304,7 @@
304304     {
305305         support = other;
306306 
307
-        link2support = support != null;
307
+        link2master = support != null;
308308     }
309309     
310310     void resetMasterNode(boolean smooth)
....@@ -353,7 +353,7 @@
353353         
354354         Object3D geo = test;
355355         
356
-        if (support != null && link2support)
356
+        if (support != null && link2master)
357357             geo = support;
358358         
359359         if (live && Globals.isLIVE() && (display.DrawMode() == display.SHADOW || !Globals.RENDERSHADOW)) // june 2013


 RandomNode.java
....@@ -36,7 +36,7 @@
3636     
3737     boolean IsSwitch()
3838     {
39
-        return CameraPane.SWITCH && !this.link2support;
39
+        return CameraPane.SWITCH && !this.link2master;
4040     }
4141     
4242     public int size()


 ScriptNode.java
....@@ -1508,12 +1508,12 @@
15081508         }
15091509         if (command.equals("support"))
15101510         {
1511
-            object.link2support = true;
1511
+            object.link2master = true;
15121512             return;
15131513         }
15141514         if (command.equals("unsupport"))
15151515         {
1516
-            object.link2support = false;
1516
+            object.link2master = false;
15171517             return;
15181518         }
15191519         if (command.equals("resettransform"))


 SwitchNode.java
....@@ -63,7 +63,7 @@
6363             {
6464                 countspeed = speed;
6565                 
66
-                if (toggleneutral || !link2support)
66
+                if (toggleneutral || !link2master)
6767                 {
6868                     do
6969                     {


 cTreeModel.java
....@@ -96,7 +96,7 @@
9696                 r = 192;
9797             }
9898 
99
-            if (obj.link2support)
99
+            if (obj.link2master)
100100             {
101101                 b = 192;
102102             }