Fix physics UI

Normand Briere

2019-08-06 b3ae4e889872ca0b9ca76f1d17b2f0b961226729

 GroupEditor.java
..
..
@@ -28,8 +28,8 @@
28
28
     {
29
29
         cButton skyboxButton;
30
30
         final String path = "cubemaps/" + f + "-skyboxes/" + s;
31
-        //row.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
32
-        row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
31
+        row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
32
+        //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
33
33
         skyboxButton.setToolTipText(s);
34
34
         skyboxButton.addActionListener(new ActionListener()
35
35
         {
..
..
@@ -57,11 +57,12 @@
57
57
         cGridBag row6 = new cGridBag();
58
58
         
59
59
         AddSkyboxButton("default", "rgb", row0);
60
-        AddSkyboxButton("default", "cornell", row0);
61
-        AddSkyboxButton("default", "uffizi", row0);
62
-        AddSkyboxButton("default", "CloudyHills", row0);
63
-        
64
-        AddSkyboxButton("default", "skycube", row1);
60
+        //AddSkyboxButton("default", "cornell", row0);
61
+        AddSkyboxButton("penguins", "dust", row0);
62
+        AddSkyboxButton("penguins", "tropic", row0);
63
+        AddSkyboxButton("penguins", "yonder", row0);
64
+
65
+        AddSkyboxButton("default", "uffizi", row1);
65
66
         AddSkyboxButton("bridge", "Bridge", row1);
66
67
         AddSkyboxButton("bridge", "Bridge2", row1);
67
68
         AddSkyboxButton("urban", "GamlaStan2", row1);
..
..
@@ -73,23 +74,23 @@
73
74
         
74
75
         AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
75
76
         AddSkyboxButton("urban", "UnionSquare", row3);
77
+        AddSkyboxButton("urban", "Medborgarplatsen", row3);
76
78
         AddSkyboxButton("park", "BerzeliiPark", row3);
77
-        AddSkyboxButton("park", "Buddha", row3);
78
79
         
80
+        AddSkyboxButton("park", "Buddha", row4);
79
81
         AddSkyboxButton("park", "CNTower2", row4);
80
82
         AddSkyboxButton("park", "NiagaraFalls1", row4);
81
83
         AddSkyboxButton("park", "NiagaraFalls3", row4);
82
-        AddSkyboxButton("park", "Park", row4);
83
84
         
85
+        AddSkyboxButton("park", "Park", row5);
84
86
         AddSkyboxButton("park", "Pond", row5);
85
87
         AddSkyboxButton("park", "Skansen", row5);
86
88
         AddSkyboxButton("park", "Skansen2", row5);
87
-        AddSkyboxButton("park", "Skansen3", row5);
88
89
         
90
+        AddSkyboxButton("park", "Skansen3", row6);
89
91
         AddSkyboxButton("park", "Skansen4", row6);
90
92
         AddSkyboxButton("park", "Skansen5", row6);
91
-        AddSkyboxButton("park", "Stairs", row6);
92
-        AddSkyboxButton("park", "Tantolunden4", row6);
93
+        AddSkyboxButton("persson", "VancouverConventionCentre", row6);
93
94
         
94
95
         tab0.add(row0);
95
96
         tab0.add(row1);
..
..
@@ -140,24 +141,29 @@
140
141
         AddSkyboxButton("forest", "Langholmen2", row3);
141
142
         AddSkyboxButton("forest", "Plants", row3);
142
143
         AddSkyboxButton("mountain", "Maskonaive", row3);
144
+        
143
145
         AddSkyboxButton("mountain", "Maskonaive2", row4);
144
-        
145
146
         AddSkyboxButton("mountain", "Maskonaive3", row4);
146
-        AddSkyboxButton("mountain", "Ryfjallet", row4);
147
-        AddSkyboxButton("mountain", "Teide", row4);        
147
+        AddSkyboxButton("mountain", "Teide", row4);
148
+        AddSkyboxButton("park", "Tantolunden4", row4);
148
149
         
150
+        AddSkyboxButton("park", "Stairs", row5);
151
+        AddSkyboxButton("default", "skycube", row6);
149
152
         AddSkyboxButton("rocky", "Langholmen", row5);
150
-        AddSkyboxButton("rocky", "Riddarfjarden", row5);
151
153
         AddSkyboxButton("rocky", "Skinnarviksberget", row5);
154
+        
152
155
         AddSkyboxButton("rocky", "Tantolunden6", row5);
156
+        AddSkyboxButton("default", "CloudyHills", row6);
157
+        AddSkyboxButton("daz", "Autumn", row6);
158
+        AddSkyboxButton("daz", "MountainTrail", row6);
153
159
         /*
154
-Kastellholmen
155
-Langholmen
156
-Riddarfjarden
157
-Skinnarviksberget
158
-Tanto
159
-Tantolunden2
160
-Tantolunden6
160
+Autumn
161
+Greenlands
162
+MountainTrail
163
+Oasis
164
+TheRock
165
+TopOfTheWorld
166
+Winter
161
167
          */
162
168
         
163
169
         tab0.add(row0);
..
..
@@ -197,39 +203,33 @@
197
203
         
198
204
         AddSkyboxButton("urban", "CNTower", row1);
199
205
         AddSkyboxButton("bridge", "ArstaBridge", row1);
200
-        AddSkyboxButton("indoors", "DallasW", row1);
201
-        AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
206
+        AddSkyboxButton("rocky", "Riddarfjarden", row1);
207
+        AddSkyboxButton("penguins", "sleepyhollow", row1);
202
208
         
209
+        AddSkyboxButton("penguins", "kenon_star", row2);
210
+        AddSkyboxButton("persson", "corona", row2);
211
+        AddSkyboxButton("persson", "spaceskybox", row2);
203
212
         AddSkyboxButton("indoors", "Vasa", row2);
204
-        AddSkyboxButton("winter", "Backyard", row2);
205
-        AddSkyboxButton("winter", "Creek", row2);
206
-        AddSkyboxButton("winter", "FootballField3", row2);
207
213
         
214
+        AddSkyboxButton("winter", "Backyard", row3);
215
+        AddSkyboxButton("winter", "Creek", row3);
216
+        AddSkyboxButton("winter", "FootballField3", row3);
208
217
         AddSkyboxButton("winter", "Forest", row3);
209
-        AddSkyboxButton("winter", "HornstullsStrand2", row3);
210
-        AddSkyboxButton("winter", "House", row3);
211
-        AddSkyboxButton("winter", "IceLake", row3);
212
218
         
219
+        AddSkyboxButton("winter", "HornstullsStrand2", row4);
220
+        AddSkyboxButton("winter", "House", row4);
221
+        AddSkyboxButton("winter", "IceLake", row4);
213
222
         AddSkyboxButton("winter", "IceRiver", row4);
214
-        AddSkyboxButton("winter", "Park3", row4);
215
-        AddSkyboxButton("winter", "PondWinter", row4);
216
223
         
224
+        AddSkyboxButton("winter", "Park3", row5);
225
+        AddSkyboxButton("winter", "PondWinter", row5);
217
226
         AddSkyboxButton("winter", "Tantolunden5", row5);
218
227
         AddSkyboxButton("winter", "Vindelalven", row5);
219
-        /*
220
-Backyard
221
-Creek
222
-FootballField3
223
-Forest
224
-HornstullsStrand2
225
-House
226
-IceLake
227
-IceRiver
228
-Park3
229
-PondWinter
230
-Tantolunden5
231
-Vindelalven         * 
232
-         */
228
+        
229
+        AddSkyboxButton("daz", "TheRock", row6);
230
+        AddSkyboxButton("daz", "TopOfTheWorld", row6);
231
+        AddSkyboxButton("daz", "Winter", row6);
232
+        AddSkyboxButton("mountain", "Ryfjallet", row6);
233
233
         
234
234
         tab0.add(row0);
235
235
         tab0.add(row1);
..
..
@@ -245,12 +245,77 @@
245
245
             //tab0.add(new cGridBag());
246
246
         }
247
247
     }
248
-    
248
+
249
+    public void AddSkyboxTab3(JTabbedPane skyboxpanel)
250
+    {
251
+        cGridBag tab0 = new cGridBag().setVertical(true);
252
+        
253
+        tab0.setName("Others");
254
+        skyboxpanel.add(tab0);
255
+
256
+        cGridBag row0 = new cGridBag();
257
+        cGridBag row1 = new cGridBag();
258
+        cGridBag row2 = new cGridBag();
259
+        cGridBag row3 = new cGridBag();
260
+        cGridBag row4 = new cGridBag();
261
+        cGridBag row5 = new cGridBag();
262
+        cGridBag row6 = new cGridBag();
263
+        
264
+        AddSkyboxButton("mayhem", "afterrain", row0);
265
+        AddSkyboxButton("mayhem", "aqua4", row0);
266
+        AddSkyboxButton("mayhem", "aqua9", row0);
267
+        AddSkyboxButton("mayhem", "flame", row0);
268
+        
269
+        AddSkyboxButton("mayhem", "h2s", row1);
270
+        AddSkyboxButton("mayhem", "prehistoric", row1);
271
+        AddSkyboxButton("mayhem", "scorched", row1);
272
+        AddSkyboxButton("penguins", "desertdawn", row1);
273
+        
274
+        AddSkyboxButton("persson", "Citadella", row2);
275
+        AddSkyboxButton("persson", "Citadella2", row2);
276
+        AddSkyboxButton("persson", "clouds1", row2);
277
+        AddSkyboxButton("penguins", "wrath", row2);
278
+        
279
+        AddSkyboxButton("persson", "FishermansBastion", row3);
280
+        AddSkyboxButton("persson", "HeroesSquare", row3);
281
+        AddSkyboxButton("indoors", "DallasW", row3);
282
+        AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
283
+        
284
+        AddSkyboxButton("persson", "LancellottiChapel", row4);
285
+        AddSkyboxButton("persson", "PereaBeach1", row4);
286
+        AddSkyboxButton("persson", "PereaBeach2", row4);
287
+        AddSkyboxButton("persson", "redeclipse", row4);
288
+        
289
+        AddSkyboxButton("daz", "Greenlands", row5);
290
+        AddSkyboxButton("daz", "Oasis", row5);
291
+        AddSkyboxButton("elyvisions", "arch3", row5);
292
+        AddSkyboxButton("elyvisions", "calm_sea", row5);
293
+        
294
+        AddSkyboxButton("elyvisions", "rainbow", row6);
295
+        AddSkyboxButton("elyvisions", "distant_sunset", row6);
296
+        AddSkyboxButton("elyvisions", "heaven", row6);
297
+        AddSkyboxButton("elyvisions", "hot", row6);
298
+        
299
+        tab0.add(row0);
300
+        tab0.add(row1);
301
+        tab0.add(row2);
302
+        tab0.add(row3);
303
+        tab0.add(row4);
304
+        tab0.add(row5);
305
+        tab0.add(row6);
306
+        
307
+        for (int i=5; --i>=0;)
308
+        {
309
+            //oe.toolboxPanel.Return();
310
+            //tab0.add(new cGridBag());
311
+        }
312
+    }
313
+        
249
314
     public void ChangeSkybox(String name)
250
315
     {
251
-        cameraView.envyoff = false;
252
-        cameraView.skyboxname = name;
253
-        cameraView.skyboxext = "jpg";
316
+        //cameraView.envyoff = false;
317
+        group.skyboxname = name;
318
+        group.skyboxext = "jpg";
254
319
         cameraView.repaint();
255
320
     }
256
321
     
..
..
@@ -291,9 +356,9 @@
291
356
 		this.copy = this.group = group;
292
357
 		//selectees = this.group.selectees;
293
358
 		
294
-        if (copy.versions == null)
359
+        if (copy.versionlist == null)
295
360
         {
296
-            copy.versions = new byte[100][];
361
+            copy.versionlist = new Object3D[100];
297
362
             copy.versionindex = -1;
298
363
         }
299
364
         
..
..
@@ -318,9 +383,9 @@
318
383
                 
319
384
                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
320
385
                 
321
-        if (copy.versions == null)
386
+        if (copy.versionlist == null)
322
387
         {
323
-            copy.versions = new byte[100][];
388
+            copy.versionlist = new Object3D[100];
324
389
             copy.versionindex = -1;
325
390
             
326
391
             Save(true);
..
..
@@ -866,32 +931,36 @@
866
931
                 restoreCameraButton.setToolTipText("Restore viewpoint");
867
932
 		restoreCameraButton.addActionListener(this);
868
933
                 
869
-		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
870
-                saveButton.setToolTipText("New version");
871
-		saveButton.addActionListener(this);
934
+		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
935
+                saveVersionButton.setToolTipText("Duplicate current version");
936
+		saveVersionButton.addActionListener(this);
872
937
                                                 
873
-		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
874
-                undoButton.setToolTipText("Previous version");
875
-		undoButton.addActionListener(this);
876
-                undoButton.setEnabled(false);
938
+		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939
+                deleteVersionButton.setToolTipText("Delete current version");
940
+		deleteVersionButton.addActionListener(this);
941
+                                                
942
+		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
943
+                previousVersionButton.setToolTipText("Previous version");
944
+		previousVersionButton.addActionListener(this);
945
+                previousVersionButton.setEnabled(false);
877
946
                 
878
947
                 cGridBag updown = new cGridBag().setVertical(true);
879
948
 		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
880
-                restoreButton.setToolTipText("Restore current");
949
+                restoreButton.setToolTipText("Undo (restore current version)");
881
950
 		restoreButton.addActionListener(this);
882
-                restoreButton.setEnabled(false);
951
+                //restoreButton.setEnabled(false);
883
952
                 
884
953
 		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
885
-                replaceButton.setToolTipText("Replace current");
954
+                replaceButton.setToolTipText("Save (replace current version)");
886
955
 		replaceButton.addActionListener(this);
887
-                replaceButton.setEnabled(false);
956
+                //replaceButton.setEnabled(false);
888
957
                 
889
958
                 copyOptionsPanel.add(updown);
890
959
                 
891
-		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
892
-                redoButton.setToolTipText("Next version");
893
-		redoButton.addActionListener(this);
894
-                redoButton.setEnabled(false);
960
+		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
961
+                nextVersionButton.setToolTipText("Next version");
962
+		nextVersionButton.addActionListener(this);
963
+                nextVersionButton.setEnabled(false);
895
964
                 
896
965
                 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
897
966
                 liveCB.setToolTipText("Enable animation");
..
..
@@ -1037,6 +1106,7 @@
1037
1106
                 AddSkyboxTab0(skyboxpanel);
1038
1107
                 AddSkyboxTab1(skyboxpanel);
1039
1108
                 AddSkyboxTab2(skyboxpanel);
1109
+                AddSkyboxTab3(skyboxpanel);
1040
1110
                 
1041
1111
                 // EDIT panel
1042
1112
 		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -1044,14 +1114,14 @@
1044
1114
 		editButton.addActionListener(this);
1045
1115
 
1046
1116
 		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1047
-                uneditButton.setToolTipText("Remove selection controls");
1117
+                uneditButton.setToolTipText("Unpin and remove selection controls");
1048
1118
 		uneditButton.addActionListener(this);
1049
1119
 
1050
1120
 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1051
1121
                 allParamsButton.setToolTipText("Show all controle");
1052
1122
 		allParamsButton.addActionListener(this);
1053
1123
 
1054
-		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1124
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1055
1125
                 clearPanelButton.setToolTipText("Clear edit panel");
1056
1126
 		clearPanelButton.addActionListener(this);
1057
1127
 
..
..
@@ -1117,7 +1187,7 @@
1117
1187
 		dgr.addDragGestureListener(this);
1118
1188
 		}catch(Exception e) {}
1119
1189
 		*/
1120
-        radio.layout = sixButton; // sevenButton;
1190
+        radio.layout = threeButton; // sixButton;
1121
1191
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1122
1192
 	}
1123
1193
         
..
..
@@ -1168,9 +1238,12 @@
1168
1238
                 smoothCB.setToolTipText("Snapping delay");
1169
1239
                                 smoothCB.addItemListener(this);
1170
1240
 
1171
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1172
-                slowCB.setToolTipText("Smooth interpolation");
1173
-                                slowCB.addItemListener(this);
1241
+//                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1242
+//                slowCB.setToolTipText("Smooth interpolation");
1243
+//                                slowCB.addItemListener(this);
1244
+                panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1245
+                minshaderCB.setToolTipText("Minimal fast shader");
1246
+                                minshaderCB.addItemListener(this);
1174
1247
                                 
1175
1248
 //        	constraints.gridy += 1;
1176
1249
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..
..
@@ -1259,7 +1332,7 @@
1259
1332
             }
1260
1333
             
1261
1334
             radioButton.SetObject(obj);
1262
-            radioButton.layout = sixButton; // sevenButton;
1335
+            radioButton.layout = threeButton; // sixButton;
1263
1336
             radioButton.SetCamera(cameraView.renderCamera, false);
1264
1337
             radioButton.addActionListener(this);
1265
1338
             radioPanel.add(radioButton);
..
..
@@ -1284,6 +1357,8 @@
1284
1357
         cCheckBox localCB;
1285
1358
         cCheckBox crowdCB;
1286
1359
         cCheckBox smoothCB;
1360
+        cCheckBox minshaderCB;
1361
+        
1287
1362
         cToggleButton fastCB;
1288
1363
         cCheckBox slowCB;
1289
1364
         cCheckBox boxCB;
..
..
@@ -1354,6 +1429,12 @@
1354
1429
             {
1355
1430
                 cameraView.ToggleInertia();
1356
1431
         cameraView.repaint();
1432
+            }
1433
+            else if(e.getSource() == minshaderCB)
1434
+            {
1435
+                Globals.MINSHADER ^= true;
1436
+                cameraView.programInitialized = false;
1437
+                cameraView.repaint();
1357
1438
             }
1358
1439
             else if(e.getSource() == localCB)
1359
1440
             {
..
..
@@ -2494,7 +2575,7 @@
2494
2575
 		if (source == invariantsItem)
2495
2576
 		{
2496
2577
                     System.out.println("Invariants:");
2497
-                    Grafreed.grafreeD.universe.invariants();
2578
+                    Grafreed.grafreed.universe.invariants();
2498
2579
 		} else
2499
2580
 		if (source == memoryItem)
2500
2581
 		{
..
..
@@ -2525,33 +2606,40 @@
2525
2606
 		{
2526
2607
 			ToggleFullScreen();
2527
2608
 		} else
2528
-		if (source == undoButton)
2609
+		if (source == previousVersionButton)
2529
2610
 		{
2530
2611
                         // Go to previous version
2531
2612
 			//if (!Undo())
2532
2613
                             //java.awt.Toolkit.getDefaultToolkit().beep();
2533
-			Undo();
2614
+			PreviousVersion();
2534
2615
 		} else
2535
2616
 		if (source == restoreButton)
2536
2617
 		{
2537
2618
                         // Restore current version
2538
2619
 			Restore();
2620
+        //restoreButton.setEnabled(false);
2539
2621
 		} else
2540
2622
 		if (source == replaceButton)
2541
2623
 		{
2542
2624
                         // Overwrite current version
2543
2625
 			Replace();
2626
+        //replaceButton.setEnabled(false);
2544
2627
 		} else
2545
-		if (source == redoButton)
2628
+		if (source == nextVersionButton)
2546
2629
 		{
2547
2630
                         // Go to next version
2548
-			Redo();
2631
+			NextVersion();
2549
2632
 		} else
2550
-		if (source == saveButton)
2633
+		if (source == saveVersionButton)
2551
2634
 		{
2552
2635
                         // Save a new version
2553
2636
 			if (!Save(true))
2554
2637
                             java.awt.Toolkit.getDefaultToolkit().beep();
2638
+		} else
2639
+		if (source == deleteVersionButton)
2640
+		{
2641
+                        // Delete a new version
2642
+                        DeleteVersion();
2555
2643
 		} else
2556
2644
 		if (source == oneStepButton)
2557
2645
 		{
..
..
@@ -2606,11 +2694,11 @@
2606
2694
 		} else
2607
2695
 		if (source == undoItem)
2608
2696
 		{
2609
-			Undo();
2697
+			PreviousVersion();
2610
2698
 		} else
2611
2699
 		if (source == redoItem)
2612
2700
 		{
2613
-			Redo();
2701
+			NextVersion();
2614
2702
 		} else
2615
2703
 		if (source == duplicateItem)
2616
2704
 		{
..
..
@@ -3743,10 +3831,10 @@
3743
3831
 			{
3744
3832
 				Object3D child = (Object3D)e.nextElement();
3745
3833
                                 if(child.editWindow != null)
3746
-                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3747
3834
                                 child.pinned = false;
3748
3835
 				child.CloseUI();
3749
3836
                                 listUI.remove(child);
3837
+//                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3750
3838
                                 
3751
3839
                                 //child.editWindow = null; // ???????????
3752
3840
 			}
..
..
@@ -3765,6 +3853,7 @@
3765
3853
                         obj.CloseUI();
3766
3854
                     }
3767
3855
                     listUI.clear();
3856
+                    SetPinStates(group.selection.size() > 0);
3768
3857
                     refreshContents(true);
3769
3858
 		} else
3770
3859
 		if (source == allParamsButton)
..
..
@@ -3851,6 +3940,7 @@
3851
3940
                     radio.layout.doClick();
3852
3941
                     
3853
3942
                     ClearUnpinned();
3943
+                    
3854
3944
                     //Grafreed.Assert(group != null);
3855
3945
                     //Grafreed.Assert(group.selection != null);
3856
3946
                     SetPinStates(group.selection == null || group.selection.size() > 0);
..
..
@@ -3867,11 +3957,13 @@
3867
3957
                 } else if (event.getSource() == editCameraItem)
3868
3958
                 {
3869
3959
                     cameraView.ProtectCamera();
3960
+                    cameraView.requestFocusInWindow();
3870
3961
                     cameraView.repaint();
3871
3962
                     return;
3872
3963
                 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
3873
3964
                 {
3874
3965
                     cameraView.RevertCamera();
3966
+                    cameraView.requestFocusInWindow();
3875
3967
                     cameraView.repaint();
3876
3968
                     return;
3877
3969
         //        } else if (event.getSource() == textureButton)
..
..
@@ -5004,9 +5096,7 @@
5004
5096
 		
5005
5097
 		freezemodel = false;
5006
5098
 	}
5007
-	
5008
-        boolean flashIt = true;
5009
-        
5099
+	        
5010
5100
 	public void valueChanged(TreeSelectionEvent e)
5011
5101
 	//public boolean handleEvent(Event event)
5012
5102
 	{
..
..
@@ -5081,6 +5171,8 @@
5081
5171
             uneditButton.setEnabled(enabled);
5082
5172
             unselectButton.setEnabled(enabled);
5083
5173
             flashSelectionButton.setEnabled(enabled);
5174
+            
5175
+            clearPanelButton.setEnabled(!listUI.isEmpty());
5084
5176
         }
5085
5177
 
5086
5178
         void refreshContents(boolean cp)
..
..
@@ -5921,7 +6013,6 @@
5921
6013
 	
5922
6014
 	cButton restoreCameraButton;
5923
6015
         
5924
-	cButton saveButton;
5925
6016
 	cButton oneStepButton;
5926
6017
         
5927
6018
         cButton groupButton;