From d1e1417edc8a6ccf195b6da3270f22234dda61e4 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 01 May 2019 16:02:52 -0400
Subject: [PATCH] Fix random/switch node.
---
ObjEditor.java | 7 ++-----
ScriptNode.java | 8 ++++----
Globals.java | 2 ++
GroupEditor.java | 29 +++++++++++++----------------
RandomNode.java | 4 ++--
5 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/Globals.java b/Globals.java
index 1b91781..4e04949 100644
--- a/Globals.java
+++ b/Globals.java
@@ -1,6 +1,8 @@
public class Globals
{
+ public static boolean ADVANCED = false;
+
static iCameraPane theRenderer;
private static boolean LIVE = false;
diff --git a/GroupEditor.java b/GroupEditor.java
index 9679b9d..397b6c7 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -239,16 +239,16 @@
ungroupItem = menu.add(new MenuItem("Ungroup"));
ungroupItem.addActionListener(this);
menu.add("-");
- randomItem = menu.add(new MenuItem("Random"));
+ randomItem = menu.add(new MenuItem("Switch node"));
randomItem.addActionListener(this);
- physicsItem = menu.add(new MenuItem("Physics"));
- physicsItem.addActionListener(this);
- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
- frameselectorItem.addActionListener(this);
switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
switchGeoItem.addActionListener(this);
switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
switchTransfoItem.addActionListener(this);
+ physicsItem = menu.add(new MenuItem("Physics"));
+ physicsItem.addActionListener(this);
+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
+ frameselectorItem.addActionListener(this);
morphItem = menu.add(new MenuItem("Morph"));
morphItem.addActionListener(this);
scriptNodeItem = menu.add(new MenuItem("Script Node"));
@@ -454,17 +454,14 @@
// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
// screenfitpointButton.addActionListener(this);
-// oe.aConstraints.gridx += 1;
- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
- snapobjectButton.addActionListener(this);
- snapobjectButton.setToolTipText("Snap Object");
- oe.aConstraints.gridx += 1;
- //aConstraints.gridx = 0;
- //aConstraints.gridy += 1;
- oe.aConstraints.weighty = 0;
- oe.aConstraints.gridwidth = 1;
-
+ if (Globals.ADVANCED)
+ {
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ snapobjectButton.addActionListener(this);
+ snapobjectButton.setToolTipText("Snap Object");
+ }
+
oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
flashSelectionButton.setToolTipText("Show selection");
flashSelectionButton.addActionListener(this);
@@ -2238,7 +2235,7 @@
RandomNode random = new RandomNode();
group(random);
if (random.size() > 0)
- random.name = random.get(0).name + "Rnd";
+ random.name = random.get(0).name + "Switch";
} else
if (source == physicsItem)
{
diff --git a/ObjEditor.java b/ObjEditor.java
index 177b5d2..d3eefb5 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -951,10 +951,6 @@
void SetupUI2(ObjEditor oe)
{
-// oe.aConstraints.weightx = 0;
-// oe.aConstraints.weighty = 0;
-// oe.aConstraints.gridx = 0;
-// oe.aConstraints.gridy = 0;
//SetupName(oe);
namePanel = new cGridBag();
@@ -971,7 +967,8 @@
setupPanel = new cGridBag().setVertical(false);
liveCB = AddCheckBox(setupPanel, "Live", copy.live);
- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
+ if (Globals.ADVANCED)
+ link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
// Return();
markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
diff --git a/RandomNode.java b/RandomNode.java
index 20dd4e6..d2f6489 100644
--- a/RandomNode.java
+++ b/RandomNode.java
@@ -66,7 +66,7 @@
// if (!link2master && rnd != -1)
// new Exception().printStackTrace();
- if (link2master && rnd != -1) // freeze current value
+ if (!random && rnd != -1) // freeze current value
return super.reserve(rnd);
if (firstchoice == 0)
@@ -142,7 +142,7 @@
super.get(rnd).count++;
//assert (child.count >= 0);
- if (!link2master) // volatile value
+ if (random) // volatile value
rnd = -1;
}
diff --git a/ScriptNode.java b/ScriptNode.java
index 073fc61..a7fa7df 100644
--- a/ScriptNode.java
+++ b/ScriptNode.java
@@ -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";
--
Gitblit v1.6.2