From c60a1ad4f6aa4904e80280586b440a584b5ff061 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 22 Apr 2019 15:17:45 -0400
Subject: [PATCH] Refactoring phase 2
---
ScriptNode.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ScriptNode.java b/ScriptNode.java
index 9cd6e9c..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,37 +972,37 @@
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;
}
if (command.equals("fromto"))
{
cVector from = new cVector(Float.parseFloat(strs[index+2]),
- Float.parseFloat(strs[index+3]),
- Float.parseFloat(strs[index+4]));
+ 0, // Float.parseFloat(strs[index+3]),
+ Float.parseFloat(strs[index+3]));
- cVector to = new cVector(Float.parseFloat(strs[index+5]),
- Float.parseFloat(strs[index+6]),
- Float.parseFloat(strs[index+7]));
+ cVector to = new cVector(Float.parseFloat(strs[index+4]),
+ 0, // Float.parseFloat(strs[index+6]),
+ Float.parseFloat(strs[index+5]));
((Mocap) object).AddFromTo(from, to);
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