Refactoring phase 3

Normand Briere

2019-04-22 3c4c16e0a4ca3949a7a37a24607df7f89abfe7ea

 ScriptNode.java
..
..
@@ -538,13 +538,13 @@
538
538
         }
539
539
         if (command.equals("stoplive") || command.equals("liveoff"))
540
540
         {
541
-            if (CameraPane.isLIVE())
541
+            if (Globals.isLIVE())
542
542
                 CameraPane.theRenderer.ToggleLive();
543
543
             return;
544
544
         }
545
545
         if (command.equals("startlive") || command.equals("liveon"))
546
546
         {
547
-            if (!CameraPane.isLIVE())
547
+            if (!Globals.isLIVE())
548
548
                 CameraPane.theRenderer.ToggleLive();
549
549
             return;
550
550
         }
..
..
@@ -972,37 +972,37 @@
972
972
         
973
973
         if (command.equals("targetx"))
974
974
         {
975
-            ((Mocap) object).targetx = Float.parseFloat(strs[index+2]);
975
+            ((Mocap) object).targetdirx = Float.parseFloat(strs[index+2]);
976
976
             return;
977
977
         }
978
978
         
979
979
         if (command.equals("targetz"))
980
980
         {
981
-            ((Mocap) object).targetz = Float.parseFloat(strs[index+2]);
981
+            ((Mocap) object).targetdirz = Float.parseFloat(strs[index+2]);
982
982
             return;
983
983
         }
984
984
         
985
985
         if (command.equals("goalx"))
986
986
         {
987
-            ((Mocap) object).goalx = Float.parseFloat(strs[index+2]);
987
+            ((Mocap) object).goalposx = Float.parseFloat(strs[index+2]);
988
988
             return;
989
989
         }
990
990
         
991
991
         if (command.equals("goalz"))
992
992
         {
993
-            ((Mocap) object).goalz = Float.parseFloat(strs[index+2]);
993
+            ((Mocap) object).goalposz = Float.parseFloat(strs[index+2]);
994
994
             return;
995
995
         }
996
996
         
997
997
         if (command.equals("fromto"))
998
998
         {
999
999
             cVector from = new cVector(Float.parseFloat(strs[index+2]),
1000
-                                        Float.parseFloat(strs[index+3]),
1001
-                                        Float.parseFloat(strs[index+4]));
1000
+                                        0, // Float.parseFloat(strs[index+3]),
1001
+                                        Float.parseFloat(strs[index+3]));
1002
1002
             
1003
-            cVector to = new cVector(Float.parseFloat(strs[index+5]),
1004
-                                        Float.parseFloat(strs[index+6]),
1005
-                                        Float.parseFloat(strs[index+7]));
1003
+            cVector to = new cVector(Float.parseFloat(strs[index+4]),
1004
+                                        0, // Float.parseFloat(strs[index+6]),
1005
+                                        Float.parseFloat(strs[index+5]));
1006
1006
 
1007
1007
             ((Mocap) object).AddFromTo(from, to);
1008
1008
             return;
..
..
@@ -1301,7 +1301,9 @@
1301
1301
             {
1302
1302
                 Mocap mocap = (Mocap) object;
1303
1303
                 
1304
-                mocap.SetPositionDelta(false, true, false, true);
1304
+                //mocap.SetPositionDelta(false, true, false, true);
1305
+                mocap.Rewind();
1306
+                mocap.Fade();
1305
1307
             }
1306
1308
             else
1307
1309
                 new Exception().printStackTrace();
..
..
@@ -1783,7 +1785,7 @@
1783
1785
         return live;
1784
1786
     }
1785
1787
     
1786
-    void DrawNode(CameraPane display, Object3D /*Composite*/ root, boolean selected)
1788
+    void DrawNode(iCameraPane display, Object3D /*Composite*/ root, boolean selected)
1787
1789
     {
1788
1790
         if (CameraPane.ABORTED)
1789
1791
         {
..
..
@@ -1791,7 +1793,7 @@
1791
1793
             return;
1792
1794
         }
1793
1795
         
1794
-        if (isLive() && display.isLIVE() && display.drawMode == display.SHADOW)
1796
+        if (isLive() && Globals.isLIVE() && display.DrawMode() == display.SHADOW)
1795
1797
         {
1796
1798
             if (reader == null)
1797
1799
                 Init();