Delete version.

Normand Briere

2019-08-05 de0d8d87447fea5faea469ccf8072a7aead35b6d

 GroupEditor.java
..
..
@@ -23,6 +23,302 @@
23
23
         DragGestureListener, DragSourceListener, DropTargetListener,
24
24
         ItemListener // ListSelectionListener
25
25
 {
26
+
27
+    public void AddSkyboxButton(String f, String s, cGridBag row)
28
+    {
29
+        cButton skyboxButton;
30
+        final String path = "cubemaps/" + f + "-skyboxes/" + s;
31
+        row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
32
+        //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
33
+        skyboxButton.setToolTipText(s);
34
+        skyboxButton.addActionListener(new ActionListener()
35
+        {
36
+                @Override
37
+                public void actionPerformed(ActionEvent e)
38
+                {
39
+                    ChangeSkybox(path);
40
+                }
41
+        });
42
+    }
43
+
44
+    public void AddSkyboxTab0(JTabbedPane skyboxpanel)
45
+    {
46
+        cGridBag tab0 = new cGridBag().setVertical(true);
47
+        
48
+        tab0.setName("Urban");
49
+        skyboxpanel.add(tab0);
50
+
51
+        cGridBag row0 = new cGridBag();
52
+        cGridBag row1 = new cGridBag();
53
+        cGridBag row2 = new cGridBag();
54
+        cGridBag row3 = new cGridBag();
55
+        cGridBag row4 = new cGridBag();
56
+        cGridBag row5 = new cGridBag();
57
+        cGridBag row6 = new cGridBag();
58
+        
59
+        AddSkyboxButton("default", "rgb", row0);
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);
66
+        AddSkyboxButton("bridge", "Bridge", row1);
67
+        AddSkyboxButton("bridge", "Bridge2", row1);
68
+        AddSkyboxButton("urban", "GamlaStan2", row1);
69
+        
70
+        AddSkyboxButton("urban", "Parliament", row2);
71
+        AddSkyboxButton("urban", "Roundabout", row2);
72
+        AddSkyboxButton("urban", "SaintLazarusChurch", row2);
73
+        AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
74
+        
75
+        AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
76
+        AddSkyboxButton("urban", "UnionSquare", row3);
77
+        AddSkyboxButton("urban", "Medborgarplatsen", row3);
78
+        AddSkyboxButton("park", "BerzeliiPark", row3);
79
+        
80
+        AddSkyboxButton("park", "Buddha", row4);
81
+        AddSkyboxButton("park", "CNTower2", row4);
82
+        AddSkyboxButton("park", "NiagaraFalls1", row4);
83
+        AddSkyboxButton("park", "NiagaraFalls3", row4);
84
+        
85
+        AddSkyboxButton("park", "Park", row5);
86
+        AddSkyboxButton("park", "Pond", row5);
87
+        AddSkyboxButton("park", "Skansen", row5);
88
+        AddSkyboxButton("park", "Skansen2", row5);
89
+        
90
+        AddSkyboxButton("park", "Skansen3", row6);
91
+        AddSkyboxButton("park", "Skansen4", row6);
92
+        AddSkyboxButton("park", "Skansen5", row6);
93
+        AddSkyboxButton("persson", "VancouverConventionCentre", row6);
94
+        
95
+        tab0.add(row0);
96
+        tab0.add(row1);
97
+        tab0.add(row2);
98
+        tab0.add(row3);
99
+        tab0.add(row4);
100
+        tab0.add(row5);
101
+        tab0.add(row6);
102
+        
103
+        for (int i=5; --i>=0;)
104
+        {
105
+            //oe.toolboxPanel.Return();
106
+            //tab0.add(new cGridBag());
107
+        }
108
+    }
109
+
110
+    public void AddSkyboxTab1(JTabbedPane skyboxpanel)
111
+    {
112
+        cGridBag tab0 = new cGridBag().setVertical(true);
113
+        
114
+        tab0.setName("Nature");
115
+        skyboxpanel.add(tab0);
116
+
117
+        cGridBag row0 = new cGridBag();
118
+        cGridBag row1 = new cGridBag();
119
+        cGridBag row2 = new cGridBag();
120
+        cGridBag row3 = new cGridBag();
121
+        cGridBag row4 = new cGridBag();
122
+        cGridBag row5 = new cGridBag();
123
+        cGridBag row6 = new cGridBag();
124
+        
125
+        AddSkyboxButton("beach", "HeartInTheSand", row0);
126
+        AddSkyboxButton("beach", "LarnacaBeach", row0);
127
+        AddSkyboxButton("beach", "PalmTrees", row0);
128
+        AddSkyboxButton("beach", "Tenerife", row0);
129
+        
130
+        AddSkyboxButton("beach", "Tenerife2", row1);
131
+        AddSkyboxButton("beach", "Tenerife3", row1);
132
+        AddSkyboxButton("field", "FishPond", row1);
133
+        AddSkyboxButton("field", "Footballfield", row1);
134
+
135
+        AddSkyboxButton("field", "Meadow", row2);
136
+        AddSkyboxButton("field", "Sorsele", row2);
137
+        AddSkyboxButton("field", "Sorsele2", row2);
138
+        AddSkyboxButton("field", "Sorsele3", row2);
139
+        
140
+        AddSkyboxButton("forest", "Brudslojan", row3);
141
+        AddSkyboxButton("forest", "Langholmen2", row3);
142
+        AddSkyboxButton("forest", "Plants", row3);
143
+        AddSkyboxButton("mountain", "Maskonaive", row3);
144
+        
145
+        AddSkyboxButton("mountain", "Maskonaive2", row4);
146
+        AddSkyboxButton("mountain", "Maskonaive3", row4);
147
+        AddSkyboxButton("mountain", "Teide", row4);
148
+        AddSkyboxButton("park", "Tantolunden4", row4);
149
+        
150
+        AddSkyboxButton("park", "Stairs", row5);
151
+        AddSkyboxButton("default", "skycube", row6);
152
+        AddSkyboxButton("rocky", "Langholmen", row5);
153
+        AddSkyboxButton("rocky", "Skinnarviksberget", row5);
154
+        
155
+        AddSkyboxButton("rocky", "Tantolunden6", row5);
156
+        AddSkyboxButton("default", "CloudyHills", row6);
157
+        AddSkyboxButton("daz", "Autumn", row6);
158
+        AddSkyboxButton("daz", "MountainTrail", row6);
159
+        /*
160
+Autumn
161
+Greenlands
162
+MountainTrail
163
+Oasis
164
+TheRock
165
+TopOfTheWorld
166
+Winter
167
+         */
168
+        
169
+        tab0.add(row0);
170
+        tab0.add(row1);
171
+        tab0.add(row2);
172
+        tab0.add(row3);
173
+        tab0.add(row4);
174
+        tab0.add(row5);
175
+        tab0.add(row6);
176
+        
177
+        for (int i=5; --i>=0;)
178
+        {
179
+            //oe.toolboxPanel.Return();
180
+            //tab0.add(new cGridBag());
181
+        }
182
+    }
183
+    
184
+    public void AddSkyboxTab2(JTabbedPane skyboxpanel)
185
+    {
186
+        cGridBag tab0 = new cGridBag().setVertical(true);
187
+        
188
+        tab0.setName("Night");
189
+        skyboxpanel.add(tab0);
190
+
191
+        cGridBag row0 = new cGridBag();
192
+        cGridBag row1 = new cGridBag();
193
+        cGridBag row2 = new cGridBag();
194
+        cGridBag row3 = new cGridBag();
195
+        cGridBag row4 = new cGridBag();
196
+        cGridBag row5 = new cGridBag();
197
+        cGridBag row6 = new cGridBag();
198
+        
199
+        AddSkyboxButton("night", "NightPath", row0);
200
+        AddSkyboxButton("night", "PondNight", row0);
201
+        AddSkyboxButton("night", "Powerlines", row0);
202
+        AddSkyboxButton("night", "SwedishRoyalCastle", row0);
203
+        
204
+        AddSkyboxButton("urban", "CNTower", row1);
205
+        AddSkyboxButton("bridge", "ArstaBridge", row1);
206
+        AddSkyboxButton("rocky", "Riddarfjarden", row1);
207
+        AddSkyboxButton("penguins", "sleepyhollow", row1);
208
+        
209
+        AddSkyboxButton("penguins", "kenon_star", row2);
210
+        AddSkyboxButton("persson", "corona", row2);
211
+        AddSkyboxButton("persson", "spaceskybox", row2);
212
+        AddSkyboxButton("indoors", "Vasa", row2);
213
+        
214
+        AddSkyboxButton("winter", "Backyard", row3);
215
+        AddSkyboxButton("winter", "Creek", row3);
216
+        AddSkyboxButton("winter", "FootballField3", row3);
217
+        AddSkyboxButton("winter", "Forest", row3);
218
+        
219
+        AddSkyboxButton("winter", "HornstullsStrand2", row4);
220
+        AddSkyboxButton("winter", "House", row4);
221
+        AddSkyboxButton("winter", "IceLake", row4);
222
+        AddSkyboxButton("winter", "IceRiver", row4);
223
+        
224
+        AddSkyboxButton("winter", "Park3", row5);
225
+        AddSkyboxButton("winter", "PondWinter", row5);
226
+        AddSkyboxButton("winter", "Tantolunden5", row5);
227
+        AddSkyboxButton("winter", "Vindelalven", row5);
228
+        
229
+        AddSkyboxButton("daz", "TheRock", row6);
230
+        AddSkyboxButton("daz", "TopOfTheWorld", row6);
231
+        AddSkyboxButton("daz", "Winter", row6);
232
+        AddSkyboxButton("mountain", "Ryfjallet", row6);
233
+        
234
+        tab0.add(row0);
235
+        tab0.add(row1);
236
+        tab0.add(row2);
237
+        tab0.add(row3);
238
+        tab0.add(row4);
239
+        tab0.add(row5);
240
+        tab0.add(row6);
241
+        
242
+        for (int i=5; --i>=0;)
243
+        {
244
+            //oe.toolboxPanel.Return();
245
+            //tab0.add(new cGridBag());
246
+        }
247
+    }
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
+        
314
+    public void ChangeSkybox(String name)
315
+    {
316
+        //cameraView.envyoff = false;
317
+        group.skyboxname = name;
318
+        group.skyboxext = "jpg";
319
+        cameraView.repaint();
320
+    }
321
+    
26
322
     //ObjEditor objEditor;
27
323
 	public void closeUI2()
28
324
 	{
..
..
@@ -60,6 +356,12 @@
60
356
 		this.copy = this.group = group;
61
357
 		//selectees = this.group.selectees;
62
358
 		
359
+        if (copy.versionlist == null)
360
+        {
361
+            copy.versionlist = new Object3D[100];
362
+            copy.versionindex = -1;
363
+        }
364
+        
63
365
 		if(ui)
64
366
                     SetupUI(objEditor);
65
367
 	}
..
..
@@ -80,14 +382,22 @@
80
382
 		SetupViews(objEditor);
81
383
                 
82
384
                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
385
+                
386
+        if (copy.versionlist == null)
387
+        {
388
+            copy.versionlist = new Object3D[100];
389
+            copy.versionindex = -1;
390
+            
391
+            Save(true);
392
+        }
83
393
 	}
84
394
 
85
395
     void CloneSelection(boolean supports)
86
396
     {
87
-        if (Globals.SAVEONMAKE)
397
+        if (Globals.REPLACEONMAKE)
88
398
             Save();
89
-        boolean keep = Globals.SAVEONMAKE;
90
-        Globals.SAVEONMAKE = false;
399
+        boolean keep = Globals.REPLACEONMAKE;
400
+        Globals.REPLACEONMAKE = false;
91
401
         //   Object3D keep = GrafreeD.clipboard;
92
402
            //Object3D obj;
93
403
            for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -98,7 +408,7 @@
98
408
                
99
409
                makeSomething(clone, i==group.selection.size()-1);
100
410
            }
101
-        Globals.SAVEONMAKE = keep;
411
+        Globals.REPLACEONMAKE = keep;
102
412
     }
103
413
 
104
414
     void CloneClipboard(boolean supports)
..
..
@@ -194,8 +504,8 @@
194
504
 //		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
195
505
 //		pasteExpandItem.addActionListener(this);
196
506
 		menu.add("-");
197
-		clearItem = menu.add(new MenuItem("Clear"));
198
-		clearItem.addActionListener(this);
507
+		deleteItem = menu.add(new MenuItem("Delete"));
508
+		deleteItem.addActionListener(this);
199
509
                 
200
510
         if (Globals.ADVANCED)
201
511
         {
..
..
@@ -421,7 +731,7 @@
421
731
 		genNormalsMESHItem.addActionListener(this);
422
732
         if (Globals.ADVANCED)
423
733
         {
424
-		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
734
+		genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
425
735
 		genNormalsMINEItem.addActionListener(this);
426
736
         }
427
737
 		stripifyItem = menu.add(new MenuItem("Stripify"));
..
..
@@ -514,10 +824,15 @@
514
824
 		attachBumpItem.addActionListener(this);
515
825
 		pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
516
826
 		pigmentBumpItem.addActionListener(this);
827
+                //embedTexturesItem
517
828
 		detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
518
829
 		detachPigmentItem.addActionListener(this);
519
830
 		detachBumpItem = menu.add(new MenuItem("Detach Bump"));
520
831
 		detachBumpItem.addActionListener(this);
832
+		embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
833
+		embedTexturesItem.addActionListener(this);
834
+		deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
835
+		deEmbedTexturesItem.addActionListener(this);
521
836
 		menu.add("-");
522
837
 		sortbysizeItem = menu.add(new MenuItem("Sort by size"));
523
838
 		sortbysizeItem.addActionListener(this);
..
..
@@ -544,6 +859,7 @@
544
859
 		buildToolsMenu(menu);
545
860
 	}
546
861
 	
862
+        
547
863
 	void SetupUI2(ObjEditor oe)
548
864
 	{
549
865
             // June 2019
..
..
@@ -588,7 +904,7 @@
588
904
          */
589
905
                 cGridBag copyOptionsPanel = new cGridBag();
590
906
                                         
591
-                copyOptionsPanel.preferredHeight = 1;
907
+                copyOptionsPanel.preferredHeight = 2;
592
908
                 
593
909
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
594
910
                 
..
..
@@ -615,29 +931,46 @@
615
931
                 restoreCameraButton.setToolTipText("Restore viewpoint");
616
932
 		restoreCameraButton.addActionListener(this);
617
933
                 
618
-		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619
-                undoButton.setToolTipText("Undo changes");
620
-		undoButton.addActionListener(this);
621
-                undoButton.setEnabled(false);
934
+		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
935
+                saveVersionButton.setToolTipText("Duplicate current version");
936
+		saveVersionButton.addActionListener(this);
937
+                                                
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);
622
946
                 
623
-		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624
-                redoButton.setToolTipText("Redo changes");
625
-		redoButton.addActionListener(this);
626
-                redoButton.setEnabled(false);
947
+                cGridBag updown = new cGridBag().setVertical(true);
948
+		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
949
+                restoreButton.setToolTipText("Undo (restore current version)");
950
+		restoreButton.addActionListener(this);
951
+                restoreButton.setEnabled(false);
627
952
                 
628
-		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629
-                saveButton.setToolTipText("Save changes");
630
-		saveButton.addActionListener(this);
953
+		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
954
+                replaceButton.setToolTipText("Save (replace current version)");
955
+		replaceButton.addActionListener(this);
956
+                replaceButton.setEnabled(false);
631
957
                 
632
-                copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
958
+                copyOptionsPanel.add(updown);
959
+                
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);
964
+                
965
+                oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
633
966
                 liveCB.setToolTipText("Enable animation");
634
967
                                 liveCB.addItemListener(this);
635
968
 
636
-		copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
969
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637
970
                 oneStepButton.setToolTipText("Animate one step forward");
638
971
 		oneStepButton.addActionListener(this);
639
972
                 
640
-                copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
973
+                oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
641
974
                 fastCB.setToolTipText("Fast mode");
642
975
                                 fastCB.addItemListener(this);
643
976
                                 
..
..
@@ -655,31 +988,32 @@
655
988
                         oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
656
989
                         snapobjectButton.addActionListener(this);
657
990
                         snapobjectButton.setToolTipText("Snap Object");
991
+                        
992
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
993
+		fourButton.addActionListener(this);
994
+                fourButton.setToolTipText("Show control panel only");
658
995
                 }
659
996
 
660
997
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
661
998
                 
662
-		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663
-                twoButton.setToolTipText("Show center view only");
999
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1000
+                twoButton.setToolTipText("Show 3D view only");
664
1001
 		twoButton.addActionListener(this);
665
1002
                 this.fullscreenLayout = twoButton;
666
1003
                 
667
-		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668
-		fourButton.addActionListener(this);
669
-                fourButton.setToolTipText("Show left panel only");
670
-		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671
-                sixButton.setToolTipText("2-column layout left");
672
-		sixButton.addActionListener(this);
673
-		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
674
-                threeButton.setToolTipText("2-column layout right");
1004
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1005
+                threeButton.setToolTipText("Show controls and 3D view");
675
1006
 		threeButton.addActionListener(this);
676
-		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677
-                sevenButton.setToolTipText("3-column layout");
678
-		sevenButton.addActionListener(this);
1007
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1008
+                sixButton.setToolTipText("Show 3D view and controls");
1009
+		sixButton.addActionListener(this);
1010
+//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1011
+//                sevenButton.setToolTipText("3-column layout");
1012
+//		sevenButton.addActionListener(this);
679
1013
                 //
680
1014
 
681
-		oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682
-                rootButton.setToolTipText("Edit selection in new tab");
1015
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1016
+                rootButton.setToolTipText("Open selection in new tab");
683
1017
 		rootButton.addActionListener(this);
684
1018
 
685
1019
                 oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -688,28 +1022,30 @@
688
1022
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
689
1023
 		//clearButton.addActionListener(this);
690
1024
 
1025
+                cGridBag row1 = new cGridBag();
1026
+                
691
1027
                 // INSERT
692
-                oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1028
+                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
693
1029
                 gridButton.setToolTipText("Create grid");
694
1030
                                 gridButton.addActionListener(this);
695
1031
 
696
-                oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1032
+                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
697
1033
                 boxButton.setToolTipText("Create box");
698
1034
                                 boxButton.addActionListener(this);
699
1035
 
700
-                oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1036
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
701
1037
                 sphereButton.setToolTipText("Create sphere");
702
1038
                                 sphereButton.addActionListener(this);
703
1039
 
704
-                oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1040
+                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
705
1041
                 coneButton.setToolTipText("Create cone");
706
1042
                                 coneButton.addActionListener(this);
707
1043
 
708
-                oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1044
+                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
709
1045
                 torusButton.setToolTipText("Create torus");
710
1046
                                 torusButton.addActionListener(this);
711
1047
 
712
-                oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1048
+                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713
1049
                 superButton.setToolTipText("Create superellipsoid");
714
1050
                                 superButton.addActionListener(this);
715
1051
 
..
..
@@ -720,51 +1056,57 @@
720
1056
                                     kleinButton.addActionListener(this);
721
1057
                 }
722
1058
                 
723
-                oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1059
+                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
724
1060
                 particlesButton.setToolTipText("Create particle system");
725
1061
                                particlesButton.addActionListener(this);
726
1062
 
727
-                oe.toolboxPanel.Return();
1063
+                oe.toolboxPanel.add(row1);
728
1064
                 
729
-                oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1065
+                cGridBag row2 = new cGridBag();
1066
+                
1067
+                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730
1068
                 groupButton.setToolTipText("Create group");
731
1069
                                groupButton.addActionListener(this);
732
1070
 
733
-                oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1071
+                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
734
1072
                 compositeButton.setToolTipText("Create composite");
735
1073
                                compositeButton.addActionListener(this);
736
1074
 
737
-                oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1075
+                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738
1076
                 switchButton.setToolTipText("Create item switcher");
739
1077
                                switchButton.addActionListener(this);
740
1078
 
741
-                oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1079
+                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742
1080
                 loopButton.setToolTipText("Create loop");
743
1081
                                loopButton.addActionListener(this);
744
1082
 
745
-                oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1083
+                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
746
1084
                 textureButton.setToolTipText("Create texture");
747
1085
                                textureButton.addActionListener(this);
748
1086
 
749
-                oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1087
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
750
1088
                 overlayButton.setToolTipText("Create overlay");
751
1089
                                overlayButton.addActionListener(this);
752
1090
 
753
-                oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1091
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
754
1092
                 lightButton.setToolTipText("Create light");
755
1093
                                lightButton.addActionListener(this);
756
1094
 
757
-                for (int i=6; --i>=0;)
758
-                {
759
-                oe.toolboxPanel.Return();
760
-                oe.toolboxPanel.add(new cGridBag());
761
-                oe.toolboxPanel.add(new cGridBag());
762
-                oe.toolboxPanel.add(new cGridBag());
763
-                oe.toolboxPanel.add(new cGridBag());
764
-                oe.toolboxPanel.add(new cGridBag());
765
-                oe.toolboxPanel.add(new cGridBag());
766
-                oe.toolboxPanel.add(new cGridBag());
767
-                }
1095
+                oe.toolboxPanel.add(row2);
1096
+                
1097
+                // ENVYMAPS
1098
+                cGridBag skyboxpane = new cGridBag();
1099
+                skyboxpane.preferredHeight = 100;
1100
+                
1101
+                oe.toolboxPanel.add(skyboxpane);
1102
+                
1103
+                JTabbedPane skyboxpanel = new JTabbedPane();
1104
+                skyboxpane.add(skyboxpanel);
1105
+                
1106
+                AddSkyboxTab0(skyboxpanel);
1107
+                AddSkyboxTab1(skyboxpanel);
1108
+                AddSkyboxTab2(skyboxpanel);
1109
+                AddSkyboxTab3(skyboxpanel);
768
1110
                 
769
1111
                 // EDIT panel
770
1112
 		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -772,14 +1114,14 @@
772
1114
 		editButton.addActionListener(this);
773
1115
 
774
1116
 		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
775
-                uneditButton.setToolTipText("Remove selection controls");
1117
+                uneditButton.setToolTipText("Unpin and remove selection controls");
776
1118
 		uneditButton.addActionListener(this);
777
1119
 
778
1120
 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
779
1121
                 allParamsButton.setToolTipText("Show all controle");
780
1122
 		allParamsButton.addActionListener(this);
781
1123
 
782
-		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1124
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
783
1125
                 clearPanelButton.setToolTipText("Clear edit panel");
784
1126
 		clearPanelButton.addActionListener(this);
785
1127
 
..
..
@@ -820,9 +1162,12 @@
820
1162
 
821
1163
                 oe.treePanel.add(copyOptionsPanel);
822
1164
                 oe.treePanel.Return();
1165
+        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1166
+            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1167
+            sliderPane.preferredHeight = 1;
823
1168
                 
824
-//        mainPanel.setDividerLocation(0.5); //1.0);
825
-//        mainPanel.setResizeWeight(0.5);
1169
+//        mainPanel.setDividerLocation(0.1); //1.0);
1170
+        mainPanel.setResizeWeight(0.4);
826
1171
         
827
1172
 		//jList.addListSelectionListener(this);
828
1173
 		oe.jTree.addTreeSelectionListener(this);
..
..
@@ -830,7 +1175,7 @@
830
1175
 		//jTree.setEditable(true);
831
1176
 		oe.jTree.setDragEnabled(true);
832
1177
 		//jTree.setPreferredSize(new Dimension(10,10));
833
-		jSP.setPreferredSize(new Dimension(100,200));
1178
+		//jSP.setPreferredSize(new Dimension(100,200));
834
1179
 		
835
1180
                 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
836
1181
                 
..
..
@@ -842,7 +1187,7 @@
842
1187
 		dgr.addDragGestureListener(this);
843
1188
 		}catch(Exception e) {}
844
1189
 		*/
845
-        radio.layout = sevenButton;
1190
+        radio.layout = threeButton; // sixButton;
846
1191
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
847
1192
 	}
848
1193
         
..
..
@@ -893,9 +1238,12 @@
893
1238
                 smoothCB.setToolTipText("Snapping delay");
894
1239
                                 smoothCB.addItemListener(this);
895
1240
 
896
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
897
-                slowCB.setToolTipText("Smooth interpolation");
898
-                                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);
899
1247
                                 
900
1248
 //        	constraints.gridy += 1;
901
1249
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..
..
@@ -945,9 +1293,9 @@
945
1293
                 toggleSwitchCB.setToolTipText("Choose a single item");
946
1294
                                 toggleSwitchCB.addItemListener(this);
947
1295
                                 
948
-                panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
949
-                autosaveCB.setToolTipText("On structure change");
950
-                                autosaveCB.addItemListener(this);
1296
+                panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1297
+                autokeepCB.setToolTipText("On structure change");
1298
+                                autokeepCB.addItemListener(this);
951
1299
 
952
1300
                 panel.Return();
953
1301
             if (Globals.ADVANCED)
..
..
@@ -984,7 +1332,7 @@
984
1332
             }
985
1333
             
986
1334
             radioButton.SetObject(obj);
987
-            radioButton.layout = sevenButton;
1335
+            radioButton.layout = threeButton; // sixButton;
988
1336
             radioButton.SetCamera(cameraView.renderCamera, false);
989
1337
             radioButton.addActionListener(this);
990
1338
             radioPanel.add(radioButton);
..
..
@@ -1009,6 +1357,8 @@
1009
1357
         cCheckBox localCB;
1010
1358
         cCheckBox crowdCB;
1011
1359
         cCheckBox smoothCB;
1360
+        cCheckBox minshaderCB;
1361
+        
1012
1362
         cToggleButton fastCB;
1013
1363
         cCheckBox slowCB;
1014
1364
         cCheckBox boxCB;
..
..
@@ -1024,7 +1374,7 @@
1024
1374
         
1025
1375
         cCheckBox oeilCB;
1026
1376
         cCheckBox shadowCB;
1027
-        cCheckBox autosaveCB;
1377
+        cCheckBox autokeepCB;
1028
1378
         cCheckBox lookAtCB;
1029
1379
         
1030
1380
 //        static int COLOR = 1;
..
..
@@ -1079,6 +1429,12 @@
1079
1429
             {
1080
1430
                 cameraView.ToggleInertia();
1081
1431
         cameraView.repaint();
1432
+            }
1433
+            else if(e.getSource() == minshaderCB)
1434
+            {
1435
+                Globals.MINSHADER ^= true;
1436
+                cameraView.programInitialized = false;
1437
+                cameraView.repaint();
1082
1438
             }
1083
1439
             else if(e.getSource() == localCB)
1084
1440
             {
..
..
@@ -1136,9 +1492,9 @@
1136
1492
             {
1137
1493
                 Globals.FREEZEONMOVE ^= true;
1138
1494
             }
1139
-            else if(e.getSource() == autosaveCB)
1495
+            else if(e.getSource() == autokeepCB)
1140
1496
             {
1141
-                Globals.SAVEONMAKE ^= true;
1497
+                Globals.REPLACEONMAKE ^= true;
1142
1498
             }
1143
1499
             else if(e.getSource() == lookAtCB)
1144
1500
             {
..
..
@@ -1664,6 +2020,16 @@
1664
2020
             }
1665
2021
         }
1666
2022
     }
2023
+
2024
+    private void EditElement(Object3D elem, boolean newWindow)
2025
+    {
2026
+        //    if (!(elem instanceof Composite))
2027
+        //        newWindow = false;
2028
+            listUI.add(elem);
2029
+            elem.openEditWindow(this, newWindow); //, false);
2030
+            System.out.println("edit : " + elem);
2031
+            elem.editWindow.refreshContents(true); // ? new
2032
+    }
1667
2033
         
1668
2034
     /**
1669
2035
      * applyExample
..
..
@@ -2092,6 +2458,23 @@
2092
2458
 		{
2093
2459
 			makeSomething(new Light());
2094
2460
 		} else
2461
+//		if (source == skybox1Button ||
2462
+//                    source == skybox2Button ||
2463
+//                    source == skybox3Button ||
2464
+//                    source == skybox4Button ||
2465
+//                    source == skybox5Button ||
2466
+//                    source == skybox6Button ||
2467
+//                    source == skybox7Button ||
2468
+//                    source == skybox11Button ||
2469
+//                    source == skybox12Button ||
2470
+//                    source == skybox13Button ||
2471
+//                    source == skybox14Button ||
2472
+//                    source == skybox15Button ||
2473
+//                    source == skybox16Button ||
2474
+//                    source == skybox17Button)
2475
+//		{
2476
+//                    ChangeSkybox(source);
2477
+//		} else
2095
2478
 		if (source == csgItem)
2096
2479
 		{
2097
2480
 			group(new CSG());
..
..
@@ -2177,7 +2560,7 @@
2177
2560
 		if (source == computeAOItem)
2178
2561
 		{
2179
2562
                     Globals.drawMode = CameraPane.OCCLUSION;
2180
-                    Globals.theRenderer.repaint();
2563
+                    cameraView.repaint();
2181
2564
 		} else
2182
2565
 		if (source == recompileItem)
2183
2566
 		{
..
..
@@ -2192,7 +2575,7 @@
2192
2575
 		if (source == invariantsItem)
2193
2576
 		{
2194
2577
                     System.out.println("Invariants:");
2195
-                    Grafreed.grafreeD.universe.invariants();
2578
+                    Grafreed.grafreed.universe.invariants();
2196
2579
 		} else
2197
2580
 		if (source == memoryItem)
2198
2581
 		{
..
..
@@ -2223,19 +2606,40 @@
2223
2606
 		{
2224
2607
 			ToggleFullScreen();
2225
2608
 		} else
2226
-		if (source == undoButton)
2609
+		if (source == previousVersionButton)
2227
2610
 		{
2228
-			if (!Undo())
2229
-                            java.awt.Toolkit.getDefaultToolkit().beep();
2611
+                        // Go to previous version
2612
+			//if (!Undo())
2613
+                            //java.awt.Toolkit.getDefaultToolkit().beep();
2614
+			PreviousVersion();
2230
2615
 		} else
2231
-		if (source == redoButton)
2616
+		if (source == restoreButton)
2232
2617
 		{
2233
-			Redo();
2618
+                        // Restore current version
2619
+			Restore();
2620
+        restoreButton.setEnabled(false);
2234
2621
 		} else
2235
-		if (source == saveButton)
2622
+		if (source == replaceButton)
2236
2623
 		{
2624
+                        // Overwrite current version
2625
+			Replace();
2626
+        replaceButton.setEnabled(false);
2627
+		} else
2628
+		if (source == nextVersionButton)
2629
+		{
2630
+                        // Go to next version
2631
+			NextVersion();
2632
+		} else
2633
+		if (source == saveVersionButton)
2634
+		{
2635
+                        // Save a new version
2237
2636
 			if (!Save(true))
2238
2637
                             java.awt.Toolkit.getDefaultToolkit().beep();
2638
+		} else
2639
+		if (source == deleteVersionButton)
2640
+		{
2641
+                        // Delete a new version
2642
+                        DeleteVersion();
2239
2643
 		} else
2240
2644
 		if (source == oneStepButton)
2241
2645
 		{
..
..
@@ -2290,11 +2694,11 @@
2290
2694
 		} else
2291
2695
 		if (source == undoItem)
2292
2696
 		{
2293
-			Undo();
2697
+			PreviousVersion();
2294
2698
 		} else
2295
2699
 		if (source == redoItem)
2296
2700
 		{
2297
-			Redo();
2701
+			NextVersion();
2298
2702
 		} else
2299
2703
 		if (source == duplicateItem)
2300
2704
 		{
..
..
@@ -2615,7 +3019,7 @@
2615
3019
 		{
2616
3020
 			StepAll();
2617
3021
 		} else
2618
-		if (source == clearItem) // || event.getSource() == clearButton)
3022
+		if (source == deleteItem) // || event.getSource() == clearButton)
2619
3023
 		{
2620
3024
 			//int indices[] = jList.getSelectedIndices();
2621
3025
 			//for (int i = indices.length - 1; i >= 0; i--)
..
..
@@ -3097,7 +3501,7 @@
3097
3501
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3098
3502
 			{
3099
3503
 				obj = (Object3D)e.nextElement();
3100
-                                obj.SetBumpTexture(null);
3504
+                                obj.ResetBumpTexture();
3101
3505
 			}
3102
3506
 			
3103
3507
 			refreshContents();
..
..
@@ -3111,6 +3515,31 @@
3111
3515
                                 obj.SetBumpTexture(obj.GetPigmentTexture());
3112
3516
 			}
3113
3517
 			
3518
+			refreshContents();
3519
+		} else
3520
+		if (source == embedTexturesItem)
3521
+		{
3522
+			Object3D obj;
3523
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3524
+			{
3525
+				obj = (Object3D)e.nextElement();
3526
+                                obj.EmbedTextures(true);
3527
+			}
3528
+			
3529
+			refreshContents();
3530
+		} else
3531
+		if (source == deEmbedTexturesItem)
3532
+		{
3533
+			Object3D obj;
3534
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3535
+			{
3536
+				obj = (Object3D)e.nextElement();
3537
+                                obj.EmbedTextures(false);
3538
+			}
3539
+			
3540
+                CameraPane.texturepigment.clear();
3541
+                CameraPane.texturebump.clear();
3542
+                
3114
3543
 			refreshContents();
3115
3544
 		} else
3116
3545
 		if (source == flashSelectionButton)
..
..
@@ -3214,8 +3643,8 @@
3214
3643
 //                    centralPanel.setVisible(true);
3215
3644
 //                    XYZPanel.setVisible(true);
3216
3645
                     bigThree.ClearUI();
3646
+                    bigThree.add(scenePanel);
3217
3647
                     bigThree.add(centralPanel);
3218
-                    bigThree.add(XYZPanel);
3219
3648
                     bigThree.FlushUI();
3220
3649
                     
3221
3650
                     cameraView.requestFocusInWindow();
..
..
@@ -3295,8 +3724,8 @@
3295
3724
 //                    centralPanel.setVisible(true);
3296
3725
 //                    XYZPanel.setVisible(false);
3297
3726
                     bigThree.ClearUI();
3298
-                    bigThree.add(scenePanel);
3299
3727
                     bigThree.add(centralPanel);
3728
+                    bigThree.add(scenePanel);
3300
3729
                     bigThree.FlushUI();
3301
3730
                     
3302
3731
                     cameraView.requestFocusInWindow();
..
..
@@ -3402,10 +3831,10 @@
3402
3831
 			{
3403
3832
 				Object3D child = (Object3D)e.nextElement();
3404
3833
                                 if(child.editWindow != null)
3405
-                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3406
3834
                                 child.pinned = false;
3407
3835
 				child.CloseUI();
3408
3836
                                 listUI.remove(child);
3837
+//                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3409
3838
                                 
3410
3839
                                 //child.editWindow = null; // ???????????
3411
3840
 			}
..
..
@@ -3424,6 +3853,7 @@
3424
3853
                         obj.CloseUI();
3425
3854
                     }
3426
3855
                     listUI.clear();
3856
+                    SetPinStates(group.selection.size() > 0);
3427
3857
                     refreshContents(true);
3428
3858
 		} else
3429
3859
 		if (source == allParamsButton)
..
..
@@ -3479,6 +3909,9 @@
3479
3909
                     }
3480
3910
                     
3481
3911
                     copy = group;
3912
+                    
3913
+                    SetUndoStates();
3914
+
3482
3915
                     //Globals.theRenderer.object = group;
3483
3916
                     if(!useclient)
3484
3917
                     {
..
..
@@ -3507,8 +3940,11 @@
3507
3940
                     radio.layout.doClick();
3508
3941
                     
3509
3942
                     ClearUnpinned();
3510
-                    SetPinStates(group.selection.size() > 0);
3511
-                    if (group.selection.size() == 1)
3943
+                    
3944
+                    //Grafreed.Assert(group != null);
3945
+                    //Grafreed.Assert(group.selection != null);
3946
+                    SetPinStates(group.selection == null || group.selection.size() > 0);
3947
+                    if (group.selection == null || group.selection.size() == 1)
3512
3948
                         EditSelection(false);
3513
3949
                     keepparent = group.parent;
3514
3950
                     // PARENT = NULL or not???
..
..
@@ -3521,11 +3957,13 @@
3521
3957
                 } else if (event.getSource() == editCameraItem)
3522
3958
                 {
3523
3959
                     cameraView.ProtectCamera();
3960
+                    cameraView.requestFocusInWindow();
3524
3961
                     cameraView.repaint();
3525
3962
                     return;
3526
3963
                 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
3527
3964
                 {
3528
3965
                     cameraView.RevertCamera();
3966
+                    cameraView.requestFocusInWindow();
3529
3967
                     cameraView.repaint();
3530
3968
                     return;
3531
3969
         //        } else if (event.getSource() == textureButton)
..
..
@@ -4102,7 +4540,7 @@
4102
4540
                             
4103
4541
                             try
4104
4542
                             {
4105
-                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4543
+                                texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4106
4544
                             }
4107
4545
                             catch (Exception e)
4108
4546
                             {
..
..
@@ -4579,6 +5017,12 @@
4579
5017
 	
4580
5018
 	void EditSelection(boolean newWindow)
4581
5019
 	{
5020
+                if (group.selection == null)
5021
+                {
5022
+                     EditElement(group, newWindow); // ? new
5023
+                     return;
5024
+                }
5025
+                
4582
5026
         //    aConstraints.gridy = 0;
4583
5027
 		for (int i=0; i<group.selection.size(); i++)
4584
5028
 		{
..
..
@@ -4589,12 +5033,7 @@
4589
5033
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4590
5034
                         if(elem != group || !newWindow)
4591
5035
                         {
4592
-                        //    if (!(elem instanceof Composite))
4593
-                        //        newWindow = false;
4594
-                            listUI.add(elem);
4595
-                            elem.openEditWindow(this, newWindow); //, false);
4596
-                            System.out.println("edit : " + elem);
4597
-                            elem.editWindow.refreshContents(true); // ? new
5036
+                            EditElement(elem, newWindow); // ? new
4598
5037
                         }
4599
5038
 		}
4600
5039
 	}
..
..
@@ -4657,9 +5096,7 @@
4657
5096
 		
4658
5097
 		freezemodel = false;
4659
5098
 	}
4660
-	
4661
-        boolean flashIt = true;
4662
-        
5099
+	        
4663
5100
 	public void valueChanged(TreeSelectionEvent e)
4664
5101
 	//public boolean handleEvent(Event event)
4665
5102
 	{
..
..
@@ -4734,11 +5171,13 @@
4734
5171
             uneditButton.setEnabled(enabled);
4735
5172
             unselectButton.setEnabled(enabled);
4736
5173
             flashSelectionButton.setEnabled(enabled);
5174
+            
5175
+            clearPanelButton.setEnabled(!listUI.isEmpty());
4737
5176
         }
4738
5177
 
4739
5178
         void refreshContents(boolean cp)
4740
5179
         {
4741
-            if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
5180
+            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4742
5181
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4743
5182
             {
4744
5183
                 objEditor.ClearInfo(); // .GetMaterial());
..
..
@@ -4942,10 +5381,10 @@
4942
5381
 	
4943
5382
 	void paste(boolean expand)
4944
5383
 	{
4945
-        if (Globals.SAVEONMAKE)
5384
+        if (Globals.REPLACEONMAKE)
4946
5385
             Save();
4947
-        boolean keep = Globals.SAVEONMAKE;
4948
-        Globals.SAVEONMAKE = false;
5386
+        boolean keep = Globals.REPLACEONMAKE;
5387
+        Globals.REPLACEONMAKE = false;
4949
5388
 	//	if (GrafreeD.clipboard == null)
4950
5389
 	//		return;
4951
5390
 		boolean first = true;
..
..
@@ -5005,7 +5444,7 @@
5005
5444
                         Grafreed.clipboard.get(0).parent = keepparent;
5006
5445
 		}
5007
5446
 		
5008
-        Globals.SAVEONMAKE = keep;
5447
+        Globals.REPLACEONMAKE = keep;
5009
5448
 		ResetModel();
5010
5449
 		refreshContents();
5011
5450
 	}
..
..
@@ -5141,10 +5580,10 @@
5141
5580
         
5142
5581
 	void group(Object3D csg, boolean grab)
5143
5582
 	{
5144
-        if (Globals.SAVEONMAKE)
5583
+        if (Globals.REPLACEONMAKE)
5145
5584
             Save();
5146
-        boolean keep = Globals.SAVEONMAKE;
5147
-        Globals.SAVEONMAKE = false;
5585
+        boolean keep = Globals.REPLACEONMAKE;
5586
+        Globals.REPLACEONMAKE = false;
5148
5587
 		if (//false) // why??
5149
5588
                     !group.selection.isEmpty())
5150
5589
                 {
..
..
@@ -5258,15 +5697,15 @@
5258
5697
                 //node.add(csg);
5259
5698
 		//makeSomething(node);
5260
5699
 		makeSomething(csg);
5261
-        Globals.SAVEONMAKE = keep;
5700
+        Globals.REPLACEONMAKE = keep;
5262
5701
 	}
5263
5702
 	
5264
5703
         void Ungroup(Object3D g)
5265
5704
         {
5266
-        if (Globals.SAVEONMAKE)
5705
+        if (Globals.REPLACEONMAKE)
5267
5706
             Save();
5268
-        boolean keep = Globals.SAVEONMAKE;
5269
-        Globals.SAVEONMAKE = false;
5707
+        boolean keep = Globals.REPLACEONMAKE;
5708
+        Globals.REPLACEONMAKE = false;
5270
5709
             if (g instanceof HiddenObject)
5271
5710
             {
5272
5711
                 HiddenObject h = (HiddenObject) g;
..
..
@@ -5283,7 +5722,7 @@
5283
5722
                     objEditor.makeSomething(g.get(i), false);
5284
5723
                 }
5285
5724
             }
5286
-        Globals.SAVEONMAKE = keep;
5725
+        Globals.REPLACEONMAKE = keep;
5287
5726
         }
5288
5727
         
5289
5728
 	void ungroup()
..
..
@@ -5574,7 +6013,6 @@
5574
6013
 	
5575
6014
 	cButton restoreCameraButton;
5576
6015
         
5577
-	cButton saveButton;
5578
6016
 	cButton oneStepButton;
5579
6017
         
5580
6018
         cButton groupButton;
..
..
@@ -5583,6 +6021,22 @@
5583
6021
         cButton switchButton;
5584
6022
         cButton loopButton;
5585
6023
         cButton textureButton;
6024
+        
6025
+        cButton skybox1Button;
6026
+        cButton skybox2Button;
6027
+        cButton skybox3Button;
6028
+        cButton skybox4Button;
6029
+        cButton skybox5Button;
6030
+        cButton skybox6Button;
6031
+        cButton skybox7Button;
6032
+        
6033
+        cButton skybox11Button;
6034
+        cButton skybox12Button;
6035
+        cButton skybox13Button;
6036
+        cButton skybox14Button;
6037
+        cButton skybox15Button;
6038
+        cButton skybox16Button;
6039
+        cButton skybox17Button;
5586
6040
         
5587
6041
         cButton gridButton;
5588
6042
         cButton boxButton;
..
..
@@ -5647,7 +6101,7 @@
5647
6101
 	private MenuItem pasteLinkItem;
5648
6102
 	private MenuItem pasteCloneItem;
5649
6103
 	private MenuItem pasteExpandItem;
5650
-	private MenuItem clearItem;
6104
+	private MenuItem deleteItem;
5651
6105
 	private MenuItem clearAllItem;
5652
6106
 	private MenuItem genUVItem;
5653
6107
 	private MenuItem genNormalsMESHItem;
..
..
@@ -5731,6 +6185,8 @@
5731
6185
 	private MenuItem attachBumpItem;
5732
6186
 	private MenuItem detachBumpItem;
5733
6187
 	private MenuItem pigmentBumpItem;
6188
+	private MenuItem embedTexturesItem;
6189
+	private MenuItem deEmbedTexturesItem;
5734
6190
 
5735
6191
 	private MenuItem particleItem;
5736
6192
 	private MenuItem ragdollItem;