Material icons

Normand Briere

2019-08-04 0c85af6e46f48b7425d59fc776b193c06a4a1f52

 GroupEditor.java
..
..
@@ -60,7 +60,7 @@
60
60
         //AddSkyboxButton("default", "cornell", row0);
61
61
         AddSkyboxButton("penguins", "dust", row0);
62
62
         AddSkyboxButton("penguins", "tropic", row0);
63
-        AddSkyboxButton("default", "skycube", row0);
63
+        AddSkyboxButton("penguins", "yonder", row0);
64
64
 
65
65
         AddSkyboxButton("default", "uffizi", row1);
66
66
         AddSkyboxButton("bridge", "Bridge", row1);
..
..
@@ -90,7 +90,7 @@
90
90
         AddSkyboxButton("park", "Skansen3", row6);
91
91
         AddSkyboxButton("park", "Skansen4", row6);
92
92
         AddSkyboxButton("park", "Skansen5", row6);
93
-        AddSkyboxButton("park", "Stairs", row6);
93
+        AddSkyboxButton("persson", "VancouverConventionCentre", row6);
94
94
         
95
95
         tab0.add(row0);
96
96
         tab0.add(row1);
..
..
@@ -144,21 +144,18 @@
144
144
         
145
145
         AddSkyboxButton("mountain", "Maskonaive2", row4);
146
146
         AddSkyboxButton("mountain", "Maskonaive3", row4);
147
-        AddSkyboxButton("mountain", "Ryfjallet", row4);
148
147
         AddSkyboxButton("mountain", "Teide", row4);
149
148
         AddSkyboxButton("park", "Tantolunden4", row4);
150
149
         
151
-        AddSkyboxButton("penguins", "wrath", row5);
152
-        AddSkyboxButton("penguins", "yonder", row5);
150
+        AddSkyboxButton("park", "Stairs", row5);
151
+        AddSkyboxButton("default", "skycube", row6);
153
152
         AddSkyboxButton("rocky", "Langholmen", row5);
154
153
         AddSkyboxButton("rocky", "Skinnarviksberget", row5);
155
-        AddSkyboxButton("rocky", "Tantolunden6", row5);
156
154
         
155
+        AddSkyboxButton("rocky", "Tantolunden6", row5);
157
156
         AddSkyboxButton("default", "CloudyHills", row6);
158
157
         AddSkyboxButton("daz", "Autumn", row6);
159
-        AddSkyboxButton("daz", "Greenlands", row6);
160
158
         AddSkyboxButton("daz", "MountainTrail", row6);
161
-        AddSkyboxButton("daz", "Oasis", row6);
162
159
         /*
163
160
 Autumn
164
161
 Greenlands
..
..
@@ -210,8 +207,8 @@
210
207
         AddSkyboxButton("penguins", "sleepyhollow", row1);
211
208
         
212
209
         AddSkyboxButton("penguins", "kenon_star", row2);
213
-        AddSkyboxButton("indoors", "DallasW", row2);
214
-        AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
210
+        AddSkyboxButton("persson", "corona", row2);
211
+        AddSkyboxButton("persson", "spaceskybox", row2);
215
212
         AddSkyboxButton("indoors", "Vasa", row2);
216
213
         
217
214
         AddSkyboxButton("winter", "Backyard", row3);
..
..
@@ -232,7 +229,7 @@
232
229
         AddSkyboxButton("daz", "TheRock", row6);
233
230
         AddSkyboxButton("daz", "TopOfTheWorld", row6);
234
231
         AddSkyboxButton("daz", "Winter", row6);
235
-        AddSkyboxButton("penguins", "desertdawn", row6);
232
+        AddSkyboxButton("mountain", "Ryfjallet", row6);
236
233
         
237
234
         tab0.add(row0);
238
235
         tab0.add(row1);
..
..
@@ -248,12 +245,77 @@
248
245
             //tab0.add(new cGridBag());
249
246
         }
250
247
     }
251
-    
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
+        
252
314
     public void ChangeSkybox(String name)
253
315
     {
254
-        cameraView.envyoff = false;
255
-        cameraView.skyboxname = name;
256
-        cameraView.skyboxext = "jpg";
316
+        //cameraView.envyoff = false;
317
+        group.skyboxname = name;
318
+        group.skyboxext = "jpg";
257
319
         cameraView.repaint();
258
320
     }
259
321
     
..
..
@@ -294,9 +356,9 @@
294
356
 		this.copy = this.group = group;
295
357
 		//selectees = this.group.selectees;
296
358
 		
297
-        if (copy.versions == null)
359
+        if (copy.versionlist == null)
298
360
         {
299
-            copy.versions = new byte[100][];
361
+            copy.versionlist = new Object3D[100];
300
362
             copy.versionindex = -1;
301
363
         }
302
364
         
..
..
@@ -321,9 +383,9 @@
321
383
                 
322
384
                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
323
385
                 
324
-        if (copy.versions == null)
386
+        if (copy.versionlist == null)
325
387
         {
326
-            copy.versions = new byte[100][];
388
+            copy.versionlist = new Object3D[100];
327
389
             copy.versionindex = -1;
328
390
             
329
391
             Save(true);
..
..
@@ -870,7 +932,7 @@
870
932
 		restoreCameraButton.addActionListener(this);
871
933
                 
872
934
 		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
873
-                saveButton.setToolTipText("New version");
935
+                saveButton.setToolTipText("Duplicate current version");
874
936
 		saveButton.addActionListener(this);
875
937
                                                 
876
938
 		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -880,12 +942,12 @@
880
942
                 
881
943
                 cGridBag updown = new cGridBag().setVertical(true);
882
944
 		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
883
-                restoreButton.setToolTipText("Restore current");
945
+                restoreButton.setToolTipText("Undo (restore current version)");
884
946
 		restoreButton.addActionListener(this);
885
947
                 restoreButton.setEnabled(false);
886
948
                 
887
949
 		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
888
-                replaceButton.setToolTipText("Replace current");
950
+                replaceButton.setToolTipText("Save (replace current version)");
889
951
 		replaceButton.addActionListener(this);
890
952
                 replaceButton.setEnabled(false);
891
953
                 
..
..
@@ -1040,6 +1102,7 @@
1040
1102
                 AddSkyboxTab0(skyboxpanel);
1041
1103
                 AddSkyboxTab1(skyboxpanel);
1042
1104
                 AddSkyboxTab2(skyboxpanel);
1105
+                AddSkyboxTab3(skyboxpanel);
1043
1106
                 
1044
1107
                 // EDIT panel
1045
1108
 		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -1047,14 +1110,14 @@
1047
1110
 		editButton.addActionListener(this);
1048
1111
 
1049
1112
 		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1050
-                uneditButton.setToolTipText("Remove selection controls");
1113
+                uneditButton.setToolTipText("Unpin and remove selection controls");
1051
1114
 		uneditButton.addActionListener(this);
1052
1115
 
1053
1116
 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1054
1117
                 allParamsButton.setToolTipText("Show all controle");
1055
1118
 		allParamsButton.addActionListener(this);
1056
1119
 
1057
-		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1120
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1058
1121
                 clearPanelButton.setToolTipText("Clear edit panel");
1059
1122
 		clearPanelButton.addActionListener(this);
1060
1123
 
..
..
@@ -1120,7 +1183,7 @@
1120
1183
 		dgr.addDragGestureListener(this);
1121
1184
 		}catch(Exception e) {}
1122
1185
 		*/
1123
-        radio.layout = sixButton; // sevenButton;
1186
+        radio.layout = threeButton; // sixButton;
1124
1187
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1125
1188
 	}
1126
1189
         
..
..
@@ -1171,9 +1234,12 @@
1171
1234
                 smoothCB.setToolTipText("Snapping delay");
1172
1235
                                 smoothCB.addItemListener(this);
1173
1236
 
1174
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1175
-                slowCB.setToolTipText("Smooth interpolation");
1176
-                                slowCB.addItemListener(this);
1237
+//                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1238
+//                slowCB.setToolTipText("Smooth interpolation");
1239
+//                                slowCB.addItemListener(this);
1240
+                panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1241
+                minshaderCB.setToolTipText("Minimal fast shader");
1242
+                                minshaderCB.addItemListener(this);
1177
1243
                                 
1178
1244
 //        	constraints.gridy += 1;
1179
1245
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..
..
@@ -1262,7 +1328,7 @@
1262
1328
             }
1263
1329
             
1264
1330
             radioButton.SetObject(obj);
1265
-            radioButton.layout = sixButton; // sevenButton;
1331
+            radioButton.layout = threeButton; // sixButton;
1266
1332
             radioButton.SetCamera(cameraView.renderCamera, false);
1267
1333
             radioButton.addActionListener(this);
1268
1334
             radioPanel.add(radioButton);
..
..
@@ -1287,6 +1353,8 @@
1287
1353
         cCheckBox localCB;
1288
1354
         cCheckBox crowdCB;
1289
1355
         cCheckBox smoothCB;
1356
+        cCheckBox minshaderCB;
1357
+        
1290
1358
         cToggleButton fastCB;
1291
1359
         cCheckBox slowCB;
1292
1360
         cCheckBox boxCB;
..
..
@@ -1357,6 +1425,12 @@
1357
1425
             {
1358
1426
                 cameraView.ToggleInertia();
1359
1427
         cameraView.repaint();
1428
+            }
1429
+            else if(e.getSource() == minshaderCB)
1430
+            {
1431
+                Globals.MINSHADER ^= true;
1432
+                cameraView.programInitialized = false;
1433
+                cameraView.repaint();
1360
1434
             }
1361
1435
             else if(e.getSource() == localCB)
1362
1436
             {
..
..
@@ -2539,11 +2613,13 @@
2539
2613
 		{
2540
2614
                         // Restore current version
2541
2615
 			Restore();
2616
+        restoreButton.setEnabled(false);
2542
2617
 		} else
2543
2618
 		if (source == replaceButton)
2544
2619
 		{
2545
2620
                         // Overwrite current version
2546
2621
 			Replace();
2622
+        replaceButton.setEnabled(false);
2547
2623
 		} else
2548
2624
 		if (source == redoButton)
2549
2625
 		{
..
..
@@ -3746,10 +3822,10 @@
3746
3822
 			{
3747
3823
 				Object3D child = (Object3D)e.nextElement();
3748
3824
                                 if(child.editWindow != null)
3749
-                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3750
3825
                                 child.pinned = false;
3751
3826
 				child.CloseUI();
3752
3827
                                 listUI.remove(child);
3828
+//                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3753
3829
                                 
3754
3830
                                 //child.editWindow = null; // ???????????
3755
3831
 			}
..
..
@@ -3768,6 +3844,7 @@
3768
3844
                         obj.CloseUI();
3769
3845
                     }
3770
3846
                     listUI.clear();
3847
+                    SetPinStates(group.selection.size() > 0);
3771
3848
                     refreshContents(true);
3772
3849
 		} else
3773
3850
 		if (source == allParamsButton)
..
..
@@ -3854,6 +3931,7 @@
3854
3931
                     radio.layout.doClick();
3855
3932
                     
3856
3933
                     ClearUnpinned();
3934
+                    
3857
3935
                     //Grafreed.Assert(group != null);
3858
3936
                     //Grafreed.Assert(group.selection != null);
3859
3937
                     SetPinStates(group.selection == null || group.selection.size() > 0);
..
..
@@ -3870,11 +3948,13 @@
3870
3948
                 } else if (event.getSource() == editCameraItem)
3871
3949
                 {
3872
3950
                     cameraView.ProtectCamera();
3951
+                    cameraView.requestFocusInWindow();
3873
3952
                     cameraView.repaint();
3874
3953
                     return;
3875
3954
                 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
3876
3955
                 {
3877
3956
                     cameraView.RevertCamera();
3957
+                    cameraView.requestFocusInWindow();
3878
3958
                     cameraView.repaint();
3879
3959
                     return;
3880
3960
         //        } else if (event.getSource() == textureButton)
..
..
@@ -5007,9 +5087,7 @@
5007
5087
 		
5008
5088
 		freezemodel = false;
5009
5089
 	}
5010
-	
5011
-        boolean flashIt = true;
5012
-        
5090
+	        
5013
5091
 	public void valueChanged(TreeSelectionEvent e)
5014
5092
 	//public boolean handleEvent(Event event)
5015
5093
 	{
..
..
@@ -5084,6 +5162,8 @@
5084
5162
             uneditButton.setEnabled(enabled);
5085
5163
             unselectButton.setEnabled(enabled);
5086
5164
             flashSelectionButton.setEnabled(enabled);
5165
+            
5166
+            clearPanelButton.setEnabled(!listUI.isEmpty());
5087
5167
         }
5088
5168
 
5089
5169
         void refreshContents(boolean cp)