Rag doll is back.

Normand Briere

2019-09-24 767be784dc7fe293bf5c5ee6507df242526be3ed

 ScriptNode.java
..
..
@@ -388,7 +388,7 @@
388
388
             {
389
389
                 System.err.println("LoadBVHFile = " + obj + "; name = " + iname + "; first frame = " + firstframe + "; last frame = " + lastframe);
390
390
         obj.blockloop = false; // to force crash right now                
391
-                GetRoot().editWindow.LoadBVHFile(iname, obj, false, force?firstframe:-1, lastframe);
391
+                GetRoot().GetWindow().LoadBVHFile(iname, obj, false, force?firstframe:-1, lastframe);
392
392
             }
393
393
             else
394
394
             {
..
..
@@ -522,7 +522,7 @@
522
522
         if (command.equals("recompile"))
523
523
         {
524
524
             // TODO assert (GetRoot() == Globals.theRenderer.object);
525
-            GetRoot().editWindow.Recompile();
525
+            GetRoot().GetWindow().Recompile();
526
526
             return;
527
527
         }
528
528
         if (command.equals("resetframecount"))
..
..
@@ -533,7 +533,7 @@
533
533
         if (command.equals("deselect") || command.equals("unselect"))
534
534
         {
535
535
             // TODO assert (GetRoot() == Globals.theRenderer.object);
536
-            GetRoot().editWindow.jTree.clearSelection();
536
+            GetRoot().GetWindow().jTree.clearSelection();
537
537
             return;
538
538
         }
539
539
         if (command.equals("stoplive") || command.equals("liveoff"))
..
..
@@ -771,7 +771,7 @@
771
771
             if (!CameraPane.BOXMODE)
772
772
             {
773
773
                 Globals.theRenderer.ToggleBoxMode();
774
-                GetRoot().editWindow.Recompile();
774
+                GetRoot().GetWindow().Recompile();
775
775
             }
776
776
             return;
777
777
         }
..
..
@@ -780,7 +780,7 @@
780
780
             if (CameraPane.BOXMODE)
781
781
             {
782
782
                 Globals.theRenderer.ToggleBoxMode();
783
-                GetRoot().editWindow.Recompile();
783
+                GetRoot().GetWindow().Recompile();
784
784
             }
785
785
             return;
786
786
         }
..
..
@@ -1155,7 +1155,7 @@
1155
1155
                         boolean success = false;
1156
1156
 
1157
1157
                         if (cam instanceof Camera) // ?
1158
-                            success = Globals.theRenderer.SetCamera((Camera) cam);
1158
+                            success = Globals.theRenderer.SetCamera((Camera) cam, true);
1159
1159
 
1160
1160
                         if (success)
1161
1161
                         {
..
..
@@ -1172,7 +1172,7 @@
1172
1172
                     Object3D root = GetObject(rootobject);
1173
1173
 
1174
1174
                     System.err.println("ZOOM: root = " + root + "; rootobject = " + rootobject);
1175
-                    GetRoot().editWindow.objEditor.ScreenFit(root, false);
1175
+                    GetRoot().GetWindow().objEditor.ScreenFit(root, false);
1176
1176
                     CameraPane.trackedobject = root;
1177
1177
                     CameraPane.ABORTED = true;
1178
1178
 System.err.println("SET ABORTED (SPEAKERFOCUS) ");
..
..
@@ -1182,14 +1182,14 @@
1182
1182
                 if (CameraPane.SPEAKERMOCAP)
1183
1183
                 {
1184
1184
                     // switch to talk mocap
1185
-                    String talkmocap = //aliases.get(
1186
-                            speakername + "talk"//)
1185
+                    String talkmocap = aliases.get(
1186
+                            speakername + "talk")
1187
1187
                             ;
1188
1188
                 //    while (aliases.get(talkmocap) != null)
1189
1189
                 //        talkmocap = aliases.get(talkmocap);
1190
1190
 
1191
-                    String speakermocap = //aliases.get(
1192
-                            speakername + "mocap"//)
1191
+                    String speakermocap = aliases.get(
1192
+                            speakername + "mocap")
1193
1193
                             ;
1194
1194
                     
1195
1195
                     String beginmocap = speakername + "talkbegin";
..
..
@@ -1235,8 +1235,8 @@
1235
1235
         }
1236
1236
         if (command.equals("setsupport"))
1237
1237
         {
1238
-            boolean random = CameraPane.RANDOM;
1239
-            CameraPane.RANDOM = false; // parse all random nodes
1238
+            boolean random = CameraPane.SWITCH;
1239
+            CameraPane.SWITCH = false; // parse all random nodes
1240
1240
             if (object.support instanceof Merge)
1241
1241
             {
1242
1242
                 ((Merge)object.support).renderme();
..
..
@@ -1245,7 +1245,7 @@
1245
1245
             object.linkVerticesThis(null);
1246
1246
             object.linkVerticesThis(GetObject(GetAlias(strs[index+2])));
1247
1247
       //      object.setMasterThis(content); // should be identity
1248
-            CameraPane.RANDOM = random;
1248
+            CameraPane.SWITCH = random;
1249
1249
             return;
1250
1250
         }
1251
1251
         if (command.equals("setchild"))
..
..
@@ -1464,7 +1464,7 @@
1464
1464
         {
1465
1465
             // TODO assert (GetRoot() == Globals.theRenderer.object);
1466
1466
             String path = GetAlias(strs[index+1]);
1467
-            GetRoot().editWindow.Select(GetRoot().GetTreePath(path.split("/"), 0), false, false);
1467
+            GetRoot().GetWindow().Select(GetRoot().GetTreePath(path.split("/"), 0), false, false);
1468
1468
             return;
1469
1469
         }
1470
1470
         if (command.equals("mocap"))
..
..
@@ -1558,7 +1558,7 @@
1558
1558
             boolean success = false;
1559
1559
             
1560
1560
             if (object instanceof Camera) // ?
1561
-                success = Globals.theRenderer.SetCamera((Camera) object);
1561
+                success = Globals.theRenderer.SetCamera((Camera) object, true);
1562
1562
             
1563
1563
             if (success && CameraPane.ABORTMODE)
1564
1564
             {
..
..
@@ -1821,9 +1821,9 @@
1821
1821
         return e;
1822
1822
     }
1823
1823
 
1824
-    protected void deepCopySelf(Object3D other)
1824
+    protected void deepCopyNode(Object3D other)
1825
1825
     {
1826
-        super.deepCopySelf(other);
1826
+        super.deepCopyNode(other);
1827
1827
 //        FrameSelector bp = (FrameSelector)other;
1828
1828
 //        bp.frame = (int)(Math.random()*(getNumFrames() - mocap.offset));
1829
1829
     }