From 51e45bf615e1e2b4aca2edf9f7333b687c7d015e Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 24 Sep 2019 21:07:45 -0400
Subject: [PATCH] Remove hands.
---
ScriptNode.java | 120 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/ScriptNode.java b/ScriptNode.java
index a856be3..278741c 100644
--- a/ScriptNode.java
+++ b/ScriptNode.java
@@ -268,7 +268,7 @@
if (reader.line == null)
{
// if (CameraPane.LIVE)
-// CameraPane.theRenderer.ToggleLive();
+// Globals.theRenderer.ToggleLive();
// Reset();
//
// try
@@ -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
{
@@ -521,8 +521,8 @@
if (command.equals("recompile"))
{
- assert (GetRoot() == CameraPane.theRenderer.object);
- GetRoot().editWindow.Recompile();
+ // TODO assert (GetRoot() == Globals.theRenderer.object);
+ GetRoot().GetWindow().Recompile();
return;
}
if (command.equals("resetframecount"))
@@ -532,205 +532,205 @@
}
if (command.equals("deselect") || command.equals("unselect"))
{
- assert (GetRoot() == CameraPane.theRenderer.object);
- GetRoot().editWindow.jTree.clearSelection();
+ // TODO assert (GetRoot() == Globals.theRenderer.object);
+ GetRoot().GetWindow().jTree.clearSelection();
return;
}
if (command.equals("stoplive") || command.equals("liveoff"))
{
if (Globals.isLIVE())
- CameraPane.theRenderer.ToggleLive();
+ Globals.theRenderer.ToggleLive();
return;
}
if (command.equals("startlive") || command.equals("liveon"))
{
if (!Globals.isLIVE())
- CameraPane.theRenderer.ToggleLive();
+ Globals.theRenderer.ToggleLive();
return;
}
if (command.equals("frustumon"))
{
if (!CameraPane.FRUSTUM)
- CameraPane.theRenderer.ToggleFrustum();
+ Globals.theRenderer.ToggleFrustum();
return;
}
if (command.equals("frustumoff"))
{
if (CameraPane.FRUSTUM)
- CameraPane.theRenderer.ToggleFrustum();
+ Globals.theRenderer.ToggleFrustum();
return;
}
if (command.equals("flipon"))
{
if (!CameraPane.IMAGEFLIP)
- CameraPane.theRenderer.ToggleImageFlip();
+ Globals.theRenderer.ToggleImageFlip();
return;
}
if (command.equals("flipoff"))
{
if (CameraPane.IMAGEFLIP)
- CameraPane.theRenderer.ToggleImageFlip();
+ Globals.theRenderer.ToggleImageFlip();
return;
}
if (command.equals("smoothon"))
{
if (!CameraPane.SMOOTHFOCUS)
- CameraPane.theRenderer.ToggleSmoothFocus();
+ Globals.theRenderer.ToggleSmoothFocus();
return;
}
if (command.equals("smoothoff"))
{
if (CameraPane.SMOOTHFOCUS)
- CameraPane.theRenderer.ToggleSmoothFocus();
+ Globals.theRenderer.ToggleSmoothFocus();
return;
}
if (command.equals("inertiaon"))
{
if (!CameraPane.INERTIA)
- CameraPane.theRenderer.ToggleInertia();
+ Globals.theRenderer.ToggleInertia();
return;
}
if (command.equals("inertiaoff"))
{
if (CameraPane.INERTIA)
- CameraPane.theRenderer.ToggleInertia();
+ Globals.theRenderer.ToggleInertia();
return;
}
if (command.equals("mocapon"))
{
if (!CameraPane.SPEAKERMOCAP)
- CameraPane.theRenderer.ToggleSpeakerMocap();
+ Globals.theRenderer.ToggleSpeakerMocap();
return;
}
if (command.equals("mocapoff"))
{
if (CameraPane.SPEAKERMOCAP)
- CameraPane.theRenderer.ToggleSpeakerMocap();
+ Globals.theRenderer.ToggleSpeakerMocap();
return;
}
if (command.equals("cameraon"))
{
if (!CameraPane.SPEAKERCAMERA)
- CameraPane.theRenderer.ToggleSpeakerCamera();
+ Globals.theRenderer.ToggleSpeakerCamera();
return;
}
if (command.equals("cameraoff"))
{
if (CameraPane.SPEAKERCAMERA)
- CameraPane.theRenderer.ToggleSpeakerCamera();
+ Globals.theRenderer.ToggleSpeakerCamera();
return;
}
if (command.equals("zoomon"))
{
if (!CameraPane.SPEAKERFOCUS)
- CameraPane.theRenderer.ToggleSpeakerFocus();
+ Globals.theRenderer.ToggleSpeakerFocus();
return;
}
if (command.equals("zoomoff"))
{
if (CameraPane.SPEAKERFOCUS)
- CameraPane.theRenderer.ToggleSpeakerFocus();
+ Globals.theRenderer.ToggleSpeakerFocus();
return;
}
if (command.equals("shadowon"))
{
if (!CameraPane.SHADOWTRACK)
- CameraPane.theRenderer.ToggleShadowTrack();
+ Globals.theRenderer.ToggleShadowTrack();
return;
}
if (command.equals("shadowoff"))
{
if (CameraPane.SHADOWTRACK)
- CameraPane.theRenderer.ToggleShadowTrack();
+ Globals.theRenderer.ToggleShadowTrack();
return;
}
if (command.equals("trackon"))
{
CameraPane.TRACK = false; // force selection to be used
if (!CameraPane.TRACK)
- CameraPane.theRenderer.ToggleTrack();
+ Globals.theRenderer.ToggleTrack();
return;
}
if (command.equals("trackoff"))
{
if (CameraPane.TRACK)
- CameraPane.theRenderer.ToggleTrack();
+ Globals.theRenderer.ToggleTrack();
return;
}
if (command.equals("trackonceon"))
{
if (!CameraPane.TRACKONCE)
- CameraPane.theRenderer.ToggleTrackOnce();
+ Globals.theRenderer.ToggleTrackOnce();
return;
}
if (command.equals("trackonceoff"))
{
if (CameraPane.TRACKONCE)
- CameraPane.theRenderer.ToggleTrackOnce();
+ Globals.theRenderer.ToggleTrackOnce();
return;
}
if (command.equals("oeilon"))
{
if (!CameraPane.OEIL && !CameraPane.OEILONCE)
- CameraPane.theRenderer.ToggleOeil();
+ Globals.theRenderer.ToggleOeil();
return;
}
if (command.equals("oeiloff"))
{
if (CameraPane.OEIL && !CameraPane.OEILONCE)
- CameraPane.theRenderer.ToggleOeil();
+ Globals.theRenderer.ToggleOeil();
return;
}
if (command.equals("oeilonceon"))
{
if (!CameraPane.OEILONCE)
- CameraPane.theRenderer.ToggleOeilOnce();
+ Globals.theRenderer.ToggleOeilOnce();
return;
}
if (command.equals("oeilonceoff"))
{
if (CameraPane.OEILONCE)
- CameraPane.theRenderer.ToggleOeilOnce();
+ Globals.theRenderer.ToggleOeilOnce();
return;
}
if (command.equals("faston"))
{
if (!CameraPane.FAST)
- CameraPane.theRenderer.ToggleFast();
+ Globals.theRenderer.ToggleFast();
return;
}
if (command.equals("fastoff"))
{
if (CameraPane.FAST)
- CameraPane.theRenderer.ToggleFast();
+ Globals.theRenderer.ToggleFast();
return;
}
if (command.equals("slowposeon"))
{
if (!CameraPane.SLOWPOSE)
- CameraPane.theRenderer.ToggleSlowPose();
+ Globals.theRenderer.ToggleSlowPose();
return;
}
if (command.equals("slowposeoff"))
{
if (CameraPane.SLOWPOSE)
- CameraPane.theRenderer.ToggleSlowPose();
+ Globals.theRenderer.ToggleSlowPose();
return;
}
if (command.equals("supporton"))
{
if (!CameraPane.SUPPORT)
- CameraPane.theRenderer.ToggleSupport();
+ Globals.theRenderer.ToggleSupport();
return;
}
if (command.equals("supportoff"))
{
if (CameraPane.SUPPORT)
- CameraPane.theRenderer.ToggleSupport();
+ Globals.theRenderer.ToggleSupport();
return;
}
@@ -756,13 +756,13 @@
if (command.equals("aborton"))
{
if (!CameraPane.ABORTMODE)
- CameraPane.theRenderer.ToggleAbort();
+ Globals.theRenderer.ToggleAbort();
return;
}
if (command.equals("abortoff"))
{
if (CameraPane.ABORTMODE)
- CameraPane.theRenderer.ToggleAbort();
+ Globals.theRenderer.ToggleAbort();
return;
}
@@ -770,8 +770,8 @@
{
if (!CameraPane.BOXMODE)
{
- CameraPane.theRenderer.ToggleBoxMode();
- GetRoot().editWindow.Recompile();
+ Globals.theRenderer.ToggleBoxMode();
+ GetRoot().GetWindow().Recompile();
}
return;
}
@@ -779,8 +779,8 @@
{
if (CameraPane.BOXMODE)
{
- CameraPane.theRenderer.ToggleBoxMode();
- GetRoot().editWindow.Recompile();
+ Globals.theRenderer.ToggleBoxMode();
+ GetRoot().GetWindow().Recompile();
}
return;
}
@@ -800,7 +800,7 @@
{
if (!CameraPane.textureon)
{
- CameraPane.theRenderer.ToggleTexture();
+ Globals.theRenderer.ToggleTexture();
}
return;
}
@@ -808,7 +808,7 @@
{
if (CameraPane.textureon)
{
- CameraPane.theRenderer.ToggleTexture();
+ Globals.theRenderer.ToggleTexture();
}
return;
}
@@ -1155,7 +1155,7 @@
boolean success = false;
if (cam instanceof Camera) // ?
- success = CameraPane.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"))
@@ -1462,9 +1462,9 @@
}
if (command.equals("select"))
{
- assert (GetRoot() == CameraPane.theRenderer.object);
+ // 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 = CameraPane.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