blame | history | patch | commit | commitdiff
Normand Briere
2019-08-07 59de607850161a26863f92961d53caae7a2dabc8 
 GroupEditor.java
....@@ -16,6 +16,7 @@
1616 //import buoy.widget.BFileChooser;
1717 
1818 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
19
+    Grafreed.iResourceCallBack,
1920         ObjectUI,
2021         Runnable,
2122         ActionListener,
....@@ -60,7 +61,7 @@
6061         //AddSkyboxButton("default", "cornell", row0);
6162         AddSkyboxButton("penguins", "dust", row0);
6263         AddSkyboxButton("penguins", "tropic", row0);
63
-        AddSkyboxButton("default", "skycube", row0);
64
+        AddSkyboxButton("penguins", "yonder", row0);
6465 
6566         AddSkyboxButton("default", "uffizi", row1);
6667         AddSkyboxButton("bridge", "Bridge", row1);
....@@ -90,7 +91,7 @@
9091         AddSkyboxButton("park", "Skansen3", row6);
9192         AddSkyboxButton("park", "Skansen4", row6);
9293         AddSkyboxButton("park", "Skansen5", row6);
93
-        AddSkyboxButton("park", "Stairs", row6);
94
+        AddSkyboxButton("persson", "VancouverConventionCentre", row6);
9495         
9596         tab0.add(row0);
9697         tab0.add(row1);
....@@ -144,21 +145,18 @@
144145         
145146         AddSkyboxButton("mountain", "Maskonaive2", row4);
146147         AddSkyboxButton("mountain", "Maskonaive3", row4);
147
-        AddSkyboxButton("mountain", "Ryfjallet", row4);
148148         AddSkyboxButton("mountain", "Teide", row4);
149149         AddSkyboxButton("park", "Tantolunden4", row4);
150150         
151
-        AddSkyboxButton("penguins", "wrath", row5);
152
-        AddSkyboxButton("penguins", "yonder", row5);
151
+        AddSkyboxButton("park", "Stairs", row5);
152
+        AddSkyboxButton("default", "skycube", row6);
153153         AddSkyboxButton("rocky", "Langholmen", row5);
154154         AddSkyboxButton("rocky", "Skinnarviksberget", row5);
155
-        AddSkyboxButton("rocky", "Tantolunden6", row5);
156155         
156
+        AddSkyboxButton("rocky", "Tantolunden6", row5);
157157         AddSkyboxButton("default", "CloudyHills", row6);
158158         AddSkyboxButton("daz", "Autumn", row6);
159
-        AddSkyboxButton("daz", "Greenlands", row6);
160159         AddSkyboxButton("daz", "MountainTrail", row6);
161
-        AddSkyboxButton("daz", "Oasis", row6);
162160         /*
163161 Autumn
164162 Greenlands
....@@ -210,8 +208,8 @@
210208         AddSkyboxButton("penguins", "sleepyhollow", row1);
211209         
212210         AddSkyboxButton("penguins", "kenon_star", row2);
213
-        AddSkyboxButton("indoors", "DallasW", row2);
214
-        AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
211
+        AddSkyboxButton("persson", "corona", row2);
212
+        AddSkyboxButton("persson", "spaceskybox", row2);
215213         AddSkyboxButton("indoors", "Vasa", row2);
216214         
217215         AddSkyboxButton("winter", "Backyard", row3);
....@@ -232,7 +230,7 @@
232230         AddSkyboxButton("daz", "TheRock", row6);
233231         AddSkyboxButton("daz", "TopOfTheWorld", row6);
234232         AddSkyboxButton("daz", "Winter", row6);
235
-        AddSkyboxButton("penguins", "desertdawn", row6);
233
+        AddSkyboxButton("mountain", "Ryfjallet", row6);
236234         
237235         tab0.add(row0);
238236         tab0.add(row1);
....@@ -248,13 +246,90 @@
248246             //tab0.add(new cGridBag());
249247         }
250248     }
251
-    
252
-    public void ChangeSkybox(String name)
249
+
250
+    public void AddSkyboxTab3(JTabbedPane skyboxpanel)
253251     {
254
-        cameraView.envyoff = false;
255
-        cameraView.skyboxname = name;
256
-        cameraView.skyboxext = "jpg";
252
+        cGridBag tab0 = new cGridBag().setVertical(true);
253
+        
254
+        tab0.setName("Others");
255
+        skyboxpanel.add(tab0);
256
+
257
+        cGridBag row0 = new cGridBag();
258
+        cGridBag row1 = new cGridBag();
259
+        cGridBag row2 = new cGridBag();
260
+        cGridBag row3 = new cGridBag();
261
+        cGridBag row4 = new cGridBag();
262
+        cGridBag row5 = new cGridBag();
263
+        cGridBag row6 = new cGridBag();
264
+        
265
+        AddSkyboxButton("mayhem", "afterrain", row0);
266
+        AddSkyboxButton("mayhem", "aqua4", row0);
267
+        AddSkyboxButton("mayhem", "aqua9", row0);
268
+        AddSkyboxButton("mayhem", "flame", row0);
269
+        
270
+        AddSkyboxButton("mayhem", "h2s", row1);
271
+        AddSkyboxButton("mayhem", "prehistoric", row1);
272
+        AddSkyboxButton("mayhem", "scorched", row1);
273
+        AddSkyboxButton("penguins", "desertdawn", row1);
274
+        
275
+        AddSkyboxButton("persson", "Citadella", row2);
276
+        AddSkyboxButton("persson", "Citadella2", row2);
277
+        AddSkyboxButton("persson", "clouds1", row2);
278
+        AddSkyboxButton("penguins", "wrath", row2);
279
+        
280
+        AddSkyboxButton("persson", "FishermansBastion", row3);
281
+        AddSkyboxButton("persson", "HeroesSquare", row3);
282
+        AddSkyboxButton("indoors", "DallasW", row3);
283
+        AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
284
+        
285
+        AddSkyboxButton("persson", "LancellottiChapel", row4);
286
+        AddSkyboxButton("persson", "PereaBeach1", row4);
287
+        AddSkyboxButton("persson", "PereaBeach2", row4);
288
+        AddSkyboxButton("persson", "redeclipse", row4);
289
+        
290
+        AddSkyboxButton("daz", "Greenlands", row5);
291
+        AddSkyboxButton("daz", "Oasis", row5);
292
+        AddSkyboxButton("elyvisions", "arch3", row5);
293
+        AddSkyboxButton("elyvisions", "calm_sea", row5);
294
+        
295
+        AddSkyboxButton("elyvisions", "rainbow", row6);
296
+        AddSkyboxButton("elyvisions", "distant_sunset", row6);
297
+        AddSkyboxButton("elyvisions", "heaven", row6);
298
+        AddSkyboxButton("elyvisions", "hot", row6);
299
+        
300
+        tab0.add(row0);
301
+        tab0.add(row1);
302
+        tab0.add(row2);
303
+        tab0.add(row3);
304
+        tab0.add(row4);
305
+        tab0.add(row5);
306
+        tab0.add(row6);
307
+        
308
+        for (int i=5; --i>=0;)
309
+        {
310
+            //oe.toolboxPanel.Return();
311
+            //tab0.add(new cGridBag());
312
+        }
313
+    }
314
+        
315
+    public void CallBack(String[] path)
316
+    {
317
+        for (int i = 0; i < path.length; i++)
318
+        {
319
+            System.out.print(path[i] + "/");
320
+        }
321
+        
322
+        System.out.println();
323
+    }
324
+    
325
+    public void ChangeSkybox(String skybox)
326
+    {
327
+        //cameraView.envyoff = false;
328
+        group.skyboxname = skybox;
329
+        group.skyboxext = "jpg";
257330         cameraView.repaint();
331
+
332
+        Grafreed.ParseResources("textures", this);
258333     }
259334     
260335     //ObjEditor objEditor;
....@@ -294,9 +369,9 @@
294369 		this.copy = this.group = group;
295370 		//selectees = this.group.selectees;
296371 		
297
-        if (copy.versions == null)
372
+        if (copy.versionlist == null)
298373         {
299
-            copy.versions = new byte[100][];
374
+            copy.versionlist = new Object3D[100];
300375             copy.versionindex = -1;
301376         }
302377         
....@@ -321,9 +396,9 @@
321396                 
322397                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
323398                 
324
-        if (copy.versions == null)
399
+        if (copy.versionlist == null)
325400         {
326
-            copy.versions = new byte[100][];
401
+            copy.versionlist = new Object3D[100];
327402             copy.versionindex = -1;
328403             
329404             Save(true);
....@@ -869,32 +944,36 @@
869944                 restoreCameraButton.setToolTipText("Restore viewpoint");
870945 		restoreCameraButton.addActionListener(this);
871946                 
872
-		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
873
-                saveButton.setToolTipText("New version");
874
-		saveButton.addActionListener(this);
947
+		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
948
+                saveVersionButton.setToolTipText("Duplicate current version");
949
+		saveVersionButton.addActionListener(this);
875950                                                 
876
-		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
877
-                undoButton.setToolTipText("Previous version");
878
-		undoButton.addActionListener(this);
879
-                undoButton.setEnabled(false);
951
+		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
952
+                deleteVersionButton.setToolTipText("Delete current version");
953
+		deleteVersionButton.addActionListener(this);
954
+                                                
955
+		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
956
+                previousVersionButton.setToolTipText("Previous version");
957
+		previousVersionButton.addActionListener(this);
958
+                previousVersionButton.setEnabled(false);
880959                 
881960                 cGridBag updown = new cGridBag().setVertical(true);
882961 		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
883
-                restoreButton.setToolTipText("Restore current");
962
+                restoreButton.setToolTipText("Undo (restore current version)");
884963 		restoreButton.addActionListener(this);
885
-                restoreButton.setEnabled(false);
964
+                //restoreButton.setEnabled(false);
886965                 
887966 		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
888
-                replaceButton.setToolTipText("Replace current");
967
+                replaceButton.setToolTipText("Save (replace current version)");
889968 		replaceButton.addActionListener(this);
890
-                replaceButton.setEnabled(false);
969
+                //replaceButton.setEnabled(false);
891970                 
892971                 copyOptionsPanel.add(updown);
893972                 
894
-		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
895
-                redoButton.setToolTipText("Next version");
896
-		redoButton.addActionListener(this);
897
-                redoButton.setEnabled(false);
973
+		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
974
+                nextVersionButton.setToolTipText("Next version");
975
+		nextVersionButton.addActionListener(this);
976
+                nextVersionButton.setEnabled(false);
898977                 
899978                 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
900979                 liveCB.setToolTipText("Enable animation");
....@@ -1032,7 +1111,7 @@
10321111                 cGridBag skyboxpane = new cGridBag();
10331112                 skyboxpane.preferredHeight = 100;
10341113                 
1035
-                oe.toolboxPanel.add(skyboxpane);
1114
+                oe.skyboxPanel.add(skyboxpane);
10361115                 
10371116                 JTabbedPane skyboxpanel = new JTabbedPane();
10381117                 skyboxpane.add(skyboxpanel);
....@@ -1040,6 +1119,7 @@
10401119                 AddSkyboxTab0(skyboxpanel);
10411120                 AddSkyboxTab1(skyboxpanel);
10421121                 AddSkyboxTab2(skyboxpanel);
1122
+                AddSkyboxTab3(skyboxpanel);
10431123                 
10441124                 // EDIT panel
10451125 		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
....@@ -1047,20 +1127,20 @@
10471127 		editButton.addActionListener(this);
10481128 
10491129 		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1050
-                uneditButton.setToolTipText("Remove selection controls");
1130
+                uneditButton.setToolTipText("Unpin and remove selection controls");
10511131 		uneditButton.addActionListener(this);
10521132 
10531133 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
10541134                 allParamsButton.setToolTipText("Show all controle");
10551135 		allParamsButton.addActionListener(this);
10561136 
1057
-		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1137
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
10581138                 clearPanelButton.setToolTipText("Clear edit panel");
10591139 		clearPanelButton.addActionListener(this);
10601140 
1061
-		editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1062
-                unselectButton.setToolTipText("Unselect");
1063
-		unselectButton.addActionListener(this);
1141
+		//editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1142
+                //unselectButton.setToolTipText("Unselect");
1143
+		//unselectButton.addActionListener(this);
10641144 
10651145 		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
10661146                 flashSelectionButton.setToolTipText("Highlight selection");
....@@ -1120,7 +1200,7 @@
11201200 		dgr.addDragGestureListener(this);
11211201 		}catch(Exception e) {}
11221202 		*/
1123
-        radio.layout = sixButton; // sevenButton;
1203
+        radio.layout = threeButton; // sixButton;
11241204         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
11251205 	}
11261206         
....@@ -1171,9 +1251,12 @@
11711251                 smoothCB.setToolTipText("Snapping delay");
11721252                                 smoothCB.addItemListener(this);
11731253 
1174
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1175
-                slowCB.setToolTipText("Smooth interpolation");
1176
-                                slowCB.addItemListener(this);
1254
+//                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1255
+//                slowCB.setToolTipText("Smooth interpolation");
1256
+//                                slowCB.addItemListener(this);
1257
+                panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1258
+                minshaderCB.setToolTipText("Minimal fast shader");
1259
+                                minshaderCB.addItemListener(this);
11771260                                 
11781261 //        	constraints.gridy += 1;
11791262 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
....@@ -1262,7 +1345,7 @@
12621345             }
12631346             
12641347             radioButton.SetObject(obj);
1265
-            radioButton.layout = sixButton; // sevenButton;
1348
+            radioButton.layout = threeButton; // sixButton;
12661349             radioButton.SetCamera(cameraView.renderCamera, false);
12671350             radioButton.addActionListener(this);
12681351             radioPanel.add(radioButton);
....@@ -1287,6 +1370,8 @@
12871370         cCheckBox localCB;
12881371         cCheckBox crowdCB;
12891372         cCheckBox smoothCB;
1373
+        cCheckBox minshaderCB;
1374
+        
12901375         cToggleButton fastCB;
12911376         cCheckBox slowCB;
12921377         cCheckBox boxCB;
....@@ -1357,6 +1442,12 @@
13571442             {
13581443                 cameraView.ToggleInertia();
13591444         cameraView.repaint();
1445
+            }
1446
+            else if(e.getSource() == minshaderCB)
1447
+            {
1448
+                Globals.MINSHADER ^= true;
1449
+                cameraView.programInitialized = false;
1450
+                cameraView.repaint();
13601451             }
13611452             else if(e.getSource() == localCB)
13621453             {
....@@ -2497,7 +2588,7 @@
24972588 		if (source == invariantsItem)
24982589 		{
24992590                     System.out.println("Invariants:");
2500
-                    Grafreed.grafreeD.universe.invariants();
2591
+                    Grafreed.grafreed.universe.invariants();
25012592 		} else
25022593 		if (source == memoryItem)
25032594 		{
....@@ -2528,33 +2619,40 @@
25282619 		{
25292620 			ToggleFullScreen();
25302621 		} else
2531
-		if (source == undoButton)
2622
+		if (source == previousVersionButton)
25322623 		{
25332624                         // Go to previous version
25342625 			//if (!Undo())
25352626                             //java.awt.Toolkit.getDefaultToolkit().beep();
2536
-			Undo();
2627
+			PreviousVersion();
25372628 		} else
25382629 		if (source == restoreButton)
25392630 		{
25402631                         // Restore current version
25412632 			Restore();
2633
+        //restoreButton.setEnabled(false);
25422634 		} else
25432635 		if (source == replaceButton)
25442636 		{
25452637                         // Overwrite current version
25462638 			Replace();
2639
+        //replaceButton.setEnabled(false);
25472640 		} else
2548
-		if (source == redoButton)
2641
+		if (source == nextVersionButton)
25492642 		{
25502643                         // Go to next version
2551
-			Redo();
2644
+			NextVersion();
25522645 		} else
2553
-		if (source == saveButton)
2646
+		if (source == saveVersionButton)
25542647 		{
25552648                         // Save a new version
25562649 			if (!Save(true))
25572650                             java.awt.Toolkit.getDefaultToolkit().beep();
2651
+		} else
2652
+		if (source == deleteVersionButton)
2653
+		{
2654
+                        // Delete a new version
2655
+                        DeleteVersion();
25582656 		} else
25592657 		if (source == oneStepButton)
25602658 		{
....@@ -2609,11 +2707,11 @@
26092707 		} else
26102708 		if (source == undoItem)
26112709 		{
2612
-			Undo();
2710
+			PreviousVersion();
26132711 		} else
26142712 		if (source == redoItem)
26152713 		{
2616
-			Redo();
2714
+			NextVersion();
26172715 		} else
26182716 		if (source == duplicateItem)
26192717 		{
....@@ -3746,10 +3844,10 @@
37463844 			{
37473845 				Object3D child = (Object3D)e.nextElement();
37483846                                 if(child.editWindow != null)
3749
-                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
37503847                                 child.pinned = false;
37513848 				child.CloseUI();
37523849                                 listUI.remove(child);
3850
+//                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
37533851                                 
37543852                                 //child.editWindow = null; // ???????????
37553853 			}
....@@ -3768,6 +3866,7 @@
37683866                         obj.CloseUI();
37693867                     }
37703868                     listUI.clear();
3869
+                    SetPinStates(group.selection.size() > 0);
37713870                     refreshContents(true);
37723871 		} else
37733872 		if (source == allParamsButton)
....@@ -3854,6 +3953,7 @@
38543953                     radio.layout.doClick();
38553954                     
38563955                     ClearUnpinned();
3956
+                    
38573957                     //Grafreed.Assert(group != null);
38583958                     //Grafreed.Assert(group.selection != null);
38593959                     SetPinStates(group.selection == null || group.selection.size() > 0);
....@@ -3870,11 +3970,13 @@
38703970                 } else if (event.getSource() == editCameraItem)
38713971                 {
38723972                     cameraView.ProtectCamera();
3973
+                    cameraView.requestFocusInWindow();
38733974                     cameraView.repaint();
38743975                     return;
38753976                 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
38763977                 {
38773978                     cameraView.RevertCamera();
3979
+                    cameraView.requestFocusInWindow();
38783980                     cameraView.repaint();
38793981                     return;
38803982         //        } else if (event.getSource() == textureButton)
....@@ -5007,9 +5109,7 @@
50075109 		
50085110 		freezemodel = false;
50095111 	}
5010
-	
5011
-        boolean flashIt = true;
5012
-        
5112
+	        
50135113 	public void valueChanged(TreeSelectionEvent e)
50145114 	//public boolean handleEvent(Event event)
50155115 	{
....@@ -5082,13 +5182,15 @@
50825182         {
50835183             editButton.setEnabled(enabled);
50845184             uneditButton.setEnabled(enabled);
5085
-            unselectButton.setEnabled(enabled);
5185
+            //unselectButton.setEnabled(enabled);
50865186             flashSelectionButton.setEnabled(enabled);
5187
+            
5188
+            clearPanelButton.setEnabled(!listUI.isEmpty());
50875189         }
50885190 
50895191         void refreshContents(boolean cp)
50905192         {
5091
-            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5193
+            //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
50925194             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
50935195             {
50945196                 objEditor.ClearInfo(); // .GetMaterial());
....@@ -5924,7 +6026,6 @@
59246026 	
59256027 	cButton restoreCameraButton;
59266028         
5927
-	cButton saveButton;
59286029 	cButton oneStepButton;
59296030         
59306031         cButton groupButton;