From 767be784dc7fe293bf5c5ee6507df242526be3ed Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 24 Sep 2019 02:10:06 -0400
Subject: [PATCH] Rag doll is back.

---
 ScriptNode.java |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ScriptNode.java b/ScriptNode.java
index 073fc61..278741c 100644
--- a/ScriptNode.java
+++ b/ScriptNode.java
@@ -388,7 +388,7 @@
             {
                 System.err.println("LoadBVHFile = " + obj + "; name = " + iname + "; first frame = " + firstframe + "; last frame = " + lastframe);
         obj.blockloop = false; // to force crash right now                
-                GetRoot().editWindow.LoadBVHFile(iname, obj, false, force?firstframe:-1, lastframe);
+                GetRoot().GetWindow().LoadBVHFile(iname, obj, false, force?firstframe:-1, lastframe);
             }
             else
             {
@@ -522,7 +522,7 @@
         if (command.equals("recompile"))
         {
             // TODO assert (GetRoot() == Globals.theRenderer.object);
-            GetRoot().editWindow.Recompile();
+            GetRoot().GetWindow().Recompile();
             return;
         }
         if (command.equals("resetframecount"))
@@ -533,7 +533,7 @@
         if (command.equals("deselect") || command.equals("unselect"))
         {
             // TODO assert (GetRoot() == Globals.theRenderer.object);
-            GetRoot().editWindow.jTree.clearSelection();
+            GetRoot().GetWindow().jTree.clearSelection();
             return;
         }
         if (command.equals("stoplive") || command.equals("liveoff"))
@@ -771,7 +771,7 @@
             if (!CameraPane.BOXMODE)
             {
                 Globals.theRenderer.ToggleBoxMode();
-                GetRoot().editWindow.Recompile();
+                GetRoot().GetWindow().Recompile();
             }
             return;
         }
@@ -780,7 +780,7 @@
             if (CameraPane.BOXMODE)
             {
                 Globals.theRenderer.ToggleBoxMode();
-                GetRoot().editWindow.Recompile();
+                GetRoot().GetWindow().Recompile();
             }
             return;
         }
@@ -1155,7 +1155,7 @@
                         boolean success = false;
 
                         if (cam instanceof Camera) // ?
-                            success = Globals.theRenderer.SetCamera((Camera) cam);
+                            success = Globals.theRenderer.SetCamera((Camera) cam, true);
 
                         if (success)
                         {
@@ -1172,7 +1172,7 @@
                     Object3D root = GetObject(rootobject);
 
                     System.err.println("ZOOM: root = " + root + "; rootobject = " + rootobject);
-                    GetRoot().editWindow.objEditor.ScreenFit(root, false);
+                    GetRoot().GetWindow().objEditor.ScreenFit(root, false);
                     CameraPane.trackedobject = root;
                     CameraPane.ABORTED = true;
 System.err.println("SET ABORTED (SPEAKERFOCUS) ");
@@ -1182,14 +1182,14 @@
                 if (CameraPane.SPEAKERMOCAP)
                 {
                     // switch to talk mocap
-                    String talkmocap = //aliases.get(
-                            speakername + "talk"//)
+                    String talkmocap = aliases.get(
+                            speakername + "talk")
                             ;
                 //    while (aliases.get(talkmocap) != null)
                 //        talkmocap = aliases.get(talkmocap);
 
-                    String speakermocap = //aliases.get(
-                            speakername + "mocap"//)
+                    String speakermocap = aliases.get(
+                            speakername + "mocap")
                             ;
                     
                     String beginmocap = speakername + "talkbegin";
@@ -1235,8 +1235,8 @@
         }
         if (command.equals("setsupport"))
         {
-            boolean random = CameraPane.RANDOM;
-            CameraPane.RANDOM = false; // parse all random nodes
+            boolean random = CameraPane.SWITCH;
+            CameraPane.SWITCH = false; // parse all random nodes
             if (object.support instanceof Merge)
             {
                 ((Merge)object.support).renderme();
@@ -1245,7 +1245,7 @@
             object.linkVerticesThis(null);
             object.linkVerticesThis(GetObject(GetAlias(strs[index+2])));
       //      object.setMasterThis(content); // should be identity
-            CameraPane.RANDOM = random;
+            CameraPane.SWITCH = random;
             return;
         }
         if (command.equals("setchild"))
@@ -1464,7 +1464,7 @@
         {
             // TODO assert (GetRoot() == Globals.theRenderer.object);
             String path = GetAlias(strs[index+1]);
-            GetRoot().editWindow.Select(GetRoot().GetTreePath(path.split("/"), 0), false, false);
+            GetRoot().GetWindow().Select(GetRoot().GetTreePath(path.split("/"), 0), false, false);
             return;
         }
         if (command.equals("mocap"))
@@ -1558,7 +1558,7 @@
             boolean success = false;
             
             if (object instanceof Camera) // ?
-                success = Globals.theRenderer.SetCamera((Camera) object);
+                success = Globals.theRenderer.SetCamera((Camera) object, true);
             
             if (success && CameraPane.ABORTMODE)
             {
@@ -1821,9 +1821,9 @@
         return e;
     }
 
-    protected void deepCopySelf(Object3D other)
+    protected void deepCopyNode(Object3D other)
     {
-        super.deepCopySelf(other);
+        super.deepCopyNode(other);
 //        FrameSelector bp = (FrameSelector)other;
 //        bp.frame = (int)(Math.random()*(getNumFrames() - mocap.offset));
     }

--
Gitblit v1.6.2