Fix random/switch node.

Normand Briere

2019-05-01 d1e1417edc8a6ccf195b6da3270f22234dda61e4

Fix random/switch node.

 Globals.java
..
..
@@ -1,6 +1,8 @@
1
1
 
2
2
 public class Globals
3
3
 {
4
+        public static boolean ADVANCED = false;
5
+        
4
6
     static iCameraPane theRenderer;
5
7
     
6
8
         private static boolean LIVE = false;
 GroupEditor.java
..
..
@@ -239,16 +239,16 @@
239
239
 		ungroupItem = menu.add(new MenuItem("Ungroup"));
240
240
 		ungroupItem.addActionListener(this);
241
241
 		menu.add("-");
242
-		randomItem = menu.add(new MenuItem("Random"));
242
+		randomItem = menu.add(new MenuItem("Switch node"));
243
243
 		randomItem.addActionListener(this);
244
-		physicsItem = menu.add(new MenuItem("Physics"));
245
-		physicsItem.addActionListener(this);
246
-		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247
-		frameselectorItem.addActionListener(this);
248
244
 		switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249
245
 		switchGeoItem.addActionListener(this);
250
246
 		switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251
247
 		switchTransfoItem.addActionListener(this);
248
+		physicsItem = menu.add(new MenuItem("Physics"));
249
+		physicsItem.addActionListener(this);
250
+		frameselectorItem = menu.add(new MenuItem("Frame Selector"));
251
+		frameselectorItem.addActionListener(this);
252
252
 		morphItem = menu.add(new MenuItem("Morph"));
253
253
 		morphItem.addActionListener(this);
254
254
 		scriptNodeItem = menu.add(new MenuItem("Script Node"));
..
..
@@ -454,17 +454,14 @@
454
454
 
455
455
 //		oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456
456
 //		screenfitpointButton.addActionListener(this);
457
-//			oe.aConstraints.gridx += 1;
458
-		oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
459
-		snapobjectButton.addActionListener(this);
460
-                snapobjectButton.setToolTipText("Snap Object");
461
-			oe.aConstraints.gridx += 1;
462
457
 
463
-                //aConstraints.gridx = 0;
464
-                //aConstraints.gridy += 1;
465
-		oe.aConstraints.weighty = 0;
466
-		oe.aConstraints.gridwidth = 1;
467
-		
458
+                if (Globals.ADVANCED)
459
+                {
460
+                        oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
461
+                        snapobjectButton.addActionListener(this);
462
+                        snapobjectButton.setToolTipText("Snap Object");
463
+                }
464
+
468
465
 		oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
469
466
                 flashSelectionButton.setToolTipText("Show selection");
470
467
 		flashSelectionButton.addActionListener(this);
..
..
@@ -2238,7 +2235,7 @@
2238
2235
                         RandomNode random = new RandomNode();
2239
2236
 			group(random);
2240
2237
                         if (random.size() > 0)
2241
-                            random.name = random.get(0).name + "Rnd";
2238
+                            random.name = random.get(0).name + "Switch";
2242
2239
 		} else
2243
2240
 		if (source == physicsItem)
2244
2241
                 {
 ObjEditor.java
..
..
@@ -951,10 +951,6 @@
951
951
 
952
952
     void SetupUI2(ObjEditor oe)
953
953
     {
954
-//            oe.aConstraints.weightx = 0;
955
-//            oe.aConstraints.weighty = 0;
956
-//            oe.aConstraints.gridx = 0;
957
-//            oe.aConstraints.gridy = 0;
958
954
         //SetupName(oe);
959
955
         
960
956
             namePanel = new cGridBag();
..
..
@@ -971,7 +967,8 @@
971
967
             setupPanel = new cGridBag().setVertical(false);
972
968
             
973
969
         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
974
-        link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
970
+        if (Globals.ADVANCED)
971
+                link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
975
972
         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
976
973
 //            Return();
977
974
         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
 RandomNode.java
..
..
@@ -66,7 +66,7 @@
66
66
 //        if (!link2master && rnd != -1)
67
67
 //            new Exception().printStackTrace();
68
68
         
69
-        if (link2master && rnd != -1) // freeze current value
69
+        if (!random && rnd != -1) // freeze current value
70
70
             return super.reserve(rnd);
71
71
         
72
72
         if (firstchoice == 0)
..
..
@@ -142,7 +142,7 @@
142
142
         super.get(rnd).count++;
143
143
     //assert (child.count >= 0);
144
144
         
145
-        if (!link2master) // volatile value
145
+        if (random) // volatile value
146
146
             rnd = -1;
147
147
     }
148
148
     
 ScriptNode.java
..
..
@@ -1182,14 +1182,14 @@
1182
1182
                 if (CameraPane.SPEAKERMOCAP)
1183
1183
                 {
1184
1184
                     // switch to talk mocap
1185
-                    String talkmocap = //aliases.get(
1186
-                            speakername + "talk"//)
1185
+                    String talkmocap = aliases.get(
1186
+                            speakername + "talk")
1187
1187
                             ;
1188
1188
                 //    while (aliases.get(talkmocap) != null)
1189
1189
                 //        talkmocap = aliases.get(talkmocap);
1190
1190
 
1191
-                    String speakermocap = //aliases.get(
1192
-                            speakername + "mocap"//)
1191
+                    String speakermocap = aliases.get(
1192
+                            speakername + "mocap")
1193
1193
                             ;
1194
1194
                     
1195
1195
                     String beginmocap = speakername + "talkbegin";