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 | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/ScriptNode.java b/ScriptNode.java
index 93f6266..a856be3 100644
--- a/ScriptNode.java
+++ b/ScriptNode.java
@@ -285,7 +285,7 @@
else
{
if (speaker != null)
- System.err.println(speaker.GetFileRoot().name + " (not a command) : " + reader.line);
+ System.err.println(speaker.GetFileRoot().name + " (speaking) : " + reader.line);
else
System.err.println("no speaker (not a command) : " + reader.line);
}
@@ -412,7 +412,7 @@
{
//path += "/" + Filename(readers[i].script);
ScriptReader reader = readers[i];
- path += Filename(readers[i].script) + "; duration=" + reader.duration + "; total=" + reader.totalduration +
+ path += Filename(reader.script) + "; duration=" + reader.duration + "; total=" + reader.totalduration +
"; line#" + reader.linecount + ": " + reader.line;
if (reader.line != null && // sept 2014
reader.line.startsWith("_"))
@@ -488,7 +488,7 @@
reader = readers[stack] = new ScriptReader(new BufferedReader(new FileReader(script)), reader.totalduration, /*0, 0, "",*/ script);
//duration = 0; // june 2014
//linecount = 0;
- //reader.script = script;
+ reader.script = script; // oct 2014
return;
}
if (command.equals("return")) // line.startsWith("; return"))
@@ -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;
@@ -1301,7 +1301,9 @@
{
Mocap mocap = (Mocap) object;
- mocap.SetPositionDelta(false, true, false, true);
+ //mocap.SetPositionDelta(false, true, false, true);
+ mocap.Rewind();
+ mocap.Fade();
}
else
new Exception().printStackTrace();
@@ -1438,7 +1440,7 @@
object.skip = false;
return;
}
- if (command.equals("skipmocap"))
+ if (command.equals("skipmocap") || command.equals("mocapskip")) // oct 2014
{
object.skipmocap = true;
return;
@@ -1783,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)
{
@@ -1791,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