From 3c4c16e0a4ca3949a7a37a24607df7f89abfe7ea Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 22 Apr 2019 16:52:58 -0400
Subject: [PATCH] Refactoring phase 3

---
 ScriptNode.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ScriptNode.java b/ScriptNode.java
index 6e25865..a856be3 100644
--- a/ScriptNode.java
+++ b/ScriptNode.java
@@ -538,13 +538,13 @@
         }
         if (command.equals("stoplive") || command.equals("liveoff"))
         {
-            if (CameraPane.isLIVE())
+            if (Globals.isLIVE())
                 CameraPane.theRenderer.ToggleLive();
             return;
         }
         if (command.equals("startlive") || command.equals("liveon"))
         {
-            if (!CameraPane.isLIVE())
+            if (!Globals.isLIVE())
                 CameraPane.theRenderer.ToggleLive();
             return;
         }
@@ -972,25 +972,25 @@
         
         if (command.equals("targetx"))
         {
-            ((Mocap) object).targetx = Float.parseFloat(strs[index+2]);
+            ((Mocap) object).targetdirx = Float.parseFloat(strs[index+2]);
             return;
         }
         
         if (command.equals("targetz"))
         {
-            ((Mocap) object).targetz = Float.parseFloat(strs[index+2]);
+            ((Mocap) object).targetdirz = Float.parseFloat(strs[index+2]);
             return;
         }
         
         if (command.equals("goalx"))
         {
-            ((Mocap) object).goalx = Float.parseFloat(strs[index+2]);
+            ((Mocap) object).goalposx = Float.parseFloat(strs[index+2]);
             return;
         }
         
         if (command.equals("goalz"))
         {
-            ((Mocap) object).goalz = Float.parseFloat(strs[index+2]);
+            ((Mocap) object).goalposz = Float.parseFloat(strs[index+2]);
             return;
         }
         
@@ -1785,7 +1785,7 @@
         return live;
     }
     
-    void DrawNode(CameraPane display, Object3D /*Composite*/ root, boolean selected)
+    void DrawNode(iCameraPane display, Object3D /*Composite*/ root, boolean selected)
     {
         if (CameraPane.ABORTED)
         {
@@ -1793,7 +1793,7 @@
             return;
         }
         
-        if (isLive() && display.isLIVE() && display.drawMode == display.SHADOW)
+        if (isLive() && Globals.isLIVE() && display.DrawMode() == display.SHADOW)
         {
             if (reader == null)
                 Init();

--
Gitblit v1.6.2