Textures pane.

Normand Briere

2019-08-08 8294241adc5fe698b70e13ebd6780af46ab83f7e

 GroupEditor.java
..
..
@@ -16,6 +16,7 @@
16
16
 //import buoy.widget.BFileChooser;
17
17
 
18
18
 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
19
+        Grafreed.iResourceCallBack,
19
20
         ObjectUI,
20
21
         Runnable,
21
22
         ActionListener,
..
..
@@ -23,6 +24,335 @@
23
24
         DragGestureListener, DragSourceListener, DropTargetListener,
24
25
         ItemListener // ListSelectionListener
25
26
 {
27
+
28
+    public void AddSkyboxButton(String f, String s, cGridBag row)
29
+    {
30
+        cButton skyboxButton;
31
+        final String path = "cubemaps/" + f + "-skyboxes/" + s;
32
+        row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
33
+        //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34
+        skyboxButton.setToolTipText(s);
35
+        skyboxButton.addActionListener(new ActionListener()
36
+        {
37
+                @Override
38
+                public void actionPerformed(ActionEvent e)
39
+                {
40
+                    ChangeSkybox(path);
41
+                }
42
+        });
43
+    }
44
+
45
+    public void AddTextureButton(String f, final String t, cGridBag row)
46
+    {
47
+        cButton textureButton;
48
+        final String path = "textures/" + f + "/"; // + t;
49
+        row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
50
+        textureButton.setToolTipText(f + "s");
51
+        textureButton.addActionListener(new ActionListener()
52
+        {
53
+                @Override
54
+                public void actionPerformed(ActionEvent e)
55
+                {
56
+                    ChangeTexture(path + t);
57
+                }
58
+        });
59
+    }
60
+    
61
+    public void AddSkyboxTab0(JTabbedPane skyboxpanel)
62
+    {
63
+        cGridBag tab0 = new cGridBag().setVertical(true);
64
+        
65
+        tab0.setName("Urban");
66
+        skyboxpanel.add(tab0);
67
+
68
+        cGridBag row0 = new cGridBag();
69
+        cGridBag row1 = new cGridBag();
70
+        cGridBag row2 = new cGridBag();
71
+        cGridBag row3 = new cGridBag();
72
+        cGridBag row4 = new cGridBag();
73
+        cGridBag row5 = new cGridBag();
74
+        cGridBag row6 = new cGridBag();
75
+        
76
+        AddSkyboxButton("default", "rgb", row0);
77
+        //AddSkyboxButton("default", "cornell", row0);
78
+        AddSkyboxButton("penguins", "dust", row0);
79
+        AddSkyboxButton("penguins", "tropic", row0);
80
+        AddSkyboxButton("penguins", "yonder", row0);
81
+
82
+        AddSkyboxButton("default", "uffizi", row1);
83
+        AddSkyboxButton("bridge", "Bridge", row1);
84
+        AddSkyboxButton("bridge", "Bridge2", row1);
85
+        AddSkyboxButton("urban", "GamlaStan2", row1);
86
+        
87
+        AddSkyboxButton("urban", "Parliament", row2);
88
+        AddSkyboxButton("urban", "Roundabout", row2);
89
+        AddSkyboxButton("urban", "SaintLazarusChurch", row2);
90
+        AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
91
+        
92
+        AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
93
+        AddSkyboxButton("urban", "UnionSquare", row3);
94
+        AddSkyboxButton("urban", "Medborgarplatsen", row3);
95
+        AddSkyboxButton("park", "BerzeliiPark", row3);
96
+        
97
+        AddSkyboxButton("park", "Buddha", row4);
98
+        AddSkyboxButton("park", "CNTower2", row4);
99
+        AddSkyboxButton("park", "NiagaraFalls1", row4);
100
+        AddSkyboxButton("park", "NiagaraFalls3", row4);
101
+        
102
+        AddSkyboxButton("park", "Park", row5);
103
+        AddSkyboxButton("park", "Pond", row5);
104
+        AddSkyboxButton("park", "Skansen", row5);
105
+        AddSkyboxButton("park", "Skansen2", row5);
106
+        
107
+        AddSkyboxButton("park", "Skansen3", row6);
108
+        AddSkyboxButton("park", "Skansen4", row6);
109
+        AddSkyboxButton("park", "Skansen5", row6);
110
+        AddSkyboxButton("persson", "VancouverConventionCentre", row6);
111
+        
112
+        tab0.add(row0);
113
+        tab0.add(row1);
114
+        tab0.add(row2);
115
+        tab0.add(row3);
116
+        tab0.add(row4);
117
+        tab0.add(row5);
118
+        tab0.add(row6);
119
+        
120
+        for (int i=5; --i>=0;)
121
+        {
122
+            //oe.toolboxPanel.Return();
123
+            //tab0.add(new cGridBag());
124
+        }
125
+    }
126
+
127
+    public void AddSkyboxTab1(JTabbedPane skyboxpanel)
128
+    {
129
+        cGridBag tab0 = new cGridBag().setVertical(true);
130
+        
131
+        tab0.setName("Nature");
132
+        skyboxpanel.add(tab0);
133
+
134
+        cGridBag row0 = new cGridBag();
135
+        cGridBag row1 = new cGridBag();
136
+        cGridBag row2 = new cGridBag();
137
+        cGridBag row3 = new cGridBag();
138
+        cGridBag row4 = new cGridBag();
139
+        cGridBag row5 = new cGridBag();
140
+        cGridBag row6 = new cGridBag();
141
+        
142
+        AddSkyboxButton("beach", "HeartInTheSand", row0);
143
+        AddSkyboxButton("beach", "LarnacaBeach", row0);
144
+        AddSkyboxButton("beach", "PalmTrees", row0);
145
+        AddSkyboxButton("beach", "Tenerife", row0);
146
+        
147
+        AddSkyboxButton("beach", "Tenerife2", row1);
148
+        AddSkyboxButton("beach", "Tenerife3", row1);
149
+        AddSkyboxButton("field", "FishPond", row1);
150
+        AddSkyboxButton("field", "Footballfield", row1);
151
+
152
+        AddSkyboxButton("field", "Meadow", row2);
153
+        AddSkyboxButton("field", "Sorsele", row2);
154
+        AddSkyboxButton("field", "Sorsele2", row2);
155
+        AddSkyboxButton("field", "Sorsele3", row2);
156
+        
157
+        AddSkyboxButton("forest", "Brudslojan", row3);
158
+        AddSkyboxButton("forest", "Langholmen2", row3);
159
+        AddSkyboxButton("forest", "Plants", row3);
160
+        AddSkyboxButton("mountain", "Maskonaive", row3);
161
+        
162
+        AddSkyboxButton("mountain", "Maskonaive2", row4);
163
+        AddSkyboxButton("mountain", "Maskonaive3", row4);
164
+        AddSkyboxButton("mountain", "Teide", row4);
165
+        AddSkyboxButton("park", "Tantolunden4", row4);
166
+        
167
+        AddSkyboxButton("park", "Stairs", row5);
168
+        AddSkyboxButton("default", "skycube", row6);
169
+        AddSkyboxButton("rocky", "Langholmen", row5);
170
+        AddSkyboxButton("rocky", "Skinnarviksberget", row5);
171
+        
172
+        AddSkyboxButton("rocky", "Tantolunden6", row5);
173
+        AddSkyboxButton("default", "CloudyHills", row6);
174
+        AddSkyboxButton("daz", "Autumn", row6);
175
+        AddSkyboxButton("daz", "MountainTrail", row6);
176
+        /*
177
+Autumn
178
+Greenlands
179
+MountainTrail
180
+Oasis
181
+TheRock
182
+TopOfTheWorld
183
+Winter
184
+         */
185
+        
186
+        tab0.add(row0);
187
+        tab0.add(row1);
188
+        tab0.add(row2);
189
+        tab0.add(row3);
190
+        tab0.add(row4);
191
+        tab0.add(row5);
192
+        tab0.add(row6);
193
+        
194
+        for (int i=5; --i>=0;)
195
+        {
196
+            //oe.toolboxPanel.Return();
197
+            //tab0.add(new cGridBag());
198
+        }
199
+    }
200
+    
201
+    public void AddSkyboxTab2(JTabbedPane skyboxpanel)
202
+    {
203
+        cGridBag tab0 = new cGridBag().setVertical(true);
204
+        
205
+        tab0.setName("Night");
206
+        skyboxpanel.add(tab0);
207
+
208
+        cGridBag row0 = new cGridBag();
209
+        cGridBag row1 = new cGridBag();
210
+        cGridBag row2 = new cGridBag();
211
+        cGridBag row3 = new cGridBag();
212
+        cGridBag row4 = new cGridBag();
213
+        cGridBag row5 = new cGridBag();
214
+        cGridBag row6 = new cGridBag();
215
+        
216
+        AddSkyboxButton("night", "NightPath", row0);
217
+        AddSkyboxButton("night", "PondNight", row0);
218
+        AddSkyboxButton("night", "Powerlines", row0);
219
+        AddSkyboxButton("night", "SwedishRoyalCastle", row0);
220
+        
221
+        AddSkyboxButton("urban", "CNTower", row1);
222
+        AddSkyboxButton("bridge", "ArstaBridge", row1);
223
+        AddSkyboxButton("rocky", "Riddarfjarden", row1);
224
+        AddSkyboxButton("penguins", "sleepyhollow", row1);
225
+        
226
+        AddSkyboxButton("penguins", "kenon_star", row2);
227
+        AddSkyboxButton("persson", "corona", row2);
228
+        AddSkyboxButton("persson", "spaceskybox", row2);
229
+        AddSkyboxButton("indoors", "Vasa", row2);
230
+        
231
+        AddSkyboxButton("winter", "Backyard", row3);
232
+        AddSkyboxButton("winter", "Creek", row3);
233
+        AddSkyboxButton("winter", "FootballField3", row3);
234
+        AddSkyboxButton("winter", "Forest", row3);
235
+        
236
+        AddSkyboxButton("winter", "HornstullsStrand2", row4);
237
+        AddSkyboxButton("winter", "House", row4);
238
+        AddSkyboxButton("winter", "IceLake", row4);
239
+        AddSkyboxButton("winter", "IceRiver", row4);
240
+        
241
+        AddSkyboxButton("winter", "Park3", row5);
242
+        AddSkyboxButton("winter", "PondWinter", row5);
243
+        AddSkyboxButton("winter", "Tantolunden5", row5);
244
+        AddSkyboxButton("winter", "Vindelalven", row5);
245
+        
246
+        AddSkyboxButton("daz", "TheRock", row6);
247
+        AddSkyboxButton("daz", "TopOfTheWorld", row6);
248
+        AddSkyboxButton("daz", "Winter", row6);
249
+        AddSkyboxButton("mountain", "Ryfjallet", row6);
250
+        
251
+        tab0.add(row0);
252
+        tab0.add(row1);
253
+        tab0.add(row2);
254
+        tab0.add(row3);
255
+        tab0.add(row4);
256
+        tab0.add(row5);
257
+        tab0.add(row6);
258
+        
259
+        for (int i=5; --i>=0;)
260
+        {
261
+            //oe.toolboxPanel.Return();
262
+            //tab0.add(new cGridBag());
263
+        }
264
+    }
265
+
266
+    public void AddSkyboxTab3(JTabbedPane skyboxpanel)
267
+    {
268
+        cGridBag tab0 = new cGridBag().setVertical(true);
269
+        
270
+        tab0.setName("Others");
271
+        skyboxpanel.add(tab0);
272
+
273
+        cGridBag row0 = new cGridBag();
274
+        cGridBag row1 = new cGridBag();
275
+        cGridBag row2 = new cGridBag();
276
+        cGridBag row3 = new cGridBag();
277
+        cGridBag row4 = new cGridBag();
278
+        cGridBag row5 = new cGridBag();
279
+        cGridBag row6 = new cGridBag();
280
+        
281
+        AddSkyboxButton("mayhem", "afterrain", row0);
282
+        AddSkyboxButton("mayhem", "aqua4", row0);
283
+        AddSkyboxButton("mayhem", "aqua9", row0);
284
+        AddSkyboxButton("mayhem", "flame", row0);
285
+        
286
+        AddSkyboxButton("mayhem", "h2s", row1);
287
+        AddSkyboxButton("mayhem", "prehistoric", row1);
288
+        AddSkyboxButton("mayhem", "scorched", row1);
289
+        AddSkyboxButton("penguins", "desertdawn", row1);
290
+        
291
+        AddSkyboxButton("persson", "Citadella", row2);
292
+        AddSkyboxButton("persson", "Citadella2", row2);
293
+        AddSkyboxButton("persson", "clouds1", row2);
294
+        AddSkyboxButton("penguins", "wrath", row2);
295
+        
296
+        AddSkyboxButton("persson", "FishermansBastion", row3);
297
+        AddSkyboxButton("persson", "HeroesSquare", row3);
298
+        AddSkyboxButton("indoors", "DallasW", row3);
299
+        AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
300
+        
301
+        AddSkyboxButton("persson", "LancellottiChapel", row4);
302
+        AddSkyboxButton("persson", "PereaBeach1", row4);
303
+        AddSkyboxButton("persson", "PereaBeach2", row4);
304
+        AddSkyboxButton("persson", "redeclipse", row4);
305
+        
306
+        AddSkyboxButton("daz", "Greenlands", row5);
307
+        AddSkyboxButton("daz", "Oasis", row5);
308
+        AddSkyboxButton("elyvisions", "arch3", row5);
309
+        AddSkyboxButton("elyvisions", "calm_sea", row5);
310
+        
311
+        AddSkyboxButton("elyvisions", "rainbow", row6);
312
+        AddSkyboxButton("elyvisions", "distant_sunset", row6);
313
+        AddSkyboxButton("elyvisions", "heaven", row6);
314
+        AddSkyboxButton("elyvisions", "hot", row6);
315
+        
316
+        tab0.add(row0);
317
+        tab0.add(row1);
318
+        tab0.add(row2);
319
+        tab0.add(row3);
320
+        tab0.add(row4);
321
+        tab0.add(row5);
322
+        tab0.add(row6);
323
+        
324
+        for (int i=5; --i>=0;)
325
+        {
326
+            //oe.toolboxPanel.Return();
327
+            //tab0.add(new cGridBag());
328
+        }
329
+    }
330
+        
331
+    public void ChangeSkybox(String skybox)
332
+    {
333
+        //cameraView.envyoff = false;
334
+        group.skyboxname = skybox;
335
+        group.skyboxext = "jpg";
336
+        cameraView.repaint();
337
+    }
338
+
339
+    public void CreateSkyboxPanel(cGridBag skyboxPanel)
340
+    {
341
+        JTabbedPane skyboxpane = new JTabbedPane();
342
+        
343
+        AddSkyboxTab0(skyboxpane);
344
+        AddSkyboxTab1(skyboxpane);
345
+        AddSkyboxTab2(skyboxpane);
346
+        AddSkyboxTab3(skyboxpane);
347
+        
348
+        skyboxPanel.add(skyboxpane);
349
+    }
350
+    
351
+    public void ChangeTexture(String texture)
352
+    {
353
+        cameraView.repaint();
354
+    }
355
+
26
356
     //ObjEditor objEditor;
27
357
 	public void closeUI2()
28
358
 	{
..
..
@@ -60,6 +390,12 @@
60
390
 		this.copy = this.group = group;
61
391
 		//selectees = this.group.selectees;
62
392
 		
393
+        if (copy.versionlist == null)
394
+        {
395
+            copy.versionlist = new Object3D[100];
396
+            copy.versionindex = -1;
397
+        }
398
+        
63
399
 		if(ui)
64
400
                     SetupUI(objEditor);
65
401
 	}
..
..
@@ -80,14 +416,22 @@
80
416
 		SetupViews(objEditor);
81
417
                 
82
418
                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
419
+                
420
+        if (copy.versionlist == null)
421
+        {
422
+            copy.versionlist = new Object3D[100];
423
+            copy.versionindex = -1;
424
+            
425
+            Save(true);
426
+        }
83
427
 	}
84
428
 
85
429
     void CloneSelection(boolean supports)
86
430
     {
87
-        if (Globals.SAVEONMAKE)
431
+        if (Globals.REPLACEONMAKE)
88
432
             Save();
89
-        boolean keep = Globals.SAVEONMAKE;
90
-        Globals.SAVEONMAKE = false;
433
+        boolean keep = Globals.REPLACEONMAKE;
434
+        Globals.REPLACEONMAKE = false;
91
435
         //   Object3D keep = GrafreeD.clipboard;
92
436
            //Object3D obj;
93
437
            for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -98,7 +442,7 @@
98
442
                
99
443
                makeSomething(clone, i==group.selection.size()-1);
100
444
            }
101
-        Globals.SAVEONMAKE = keep;
445
+        Globals.REPLACEONMAKE = keep;
102
446
     }
103
447
 
104
448
     void CloneClipboard(boolean supports)
..
..
@@ -194,8 +538,8 @@
194
538
 //		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
195
539
 //		pasteExpandItem.addActionListener(this);
196
540
 		menu.add("-");
197
-		clearItem = menu.add(new MenuItem("Clear"));
198
-		clearItem.addActionListener(this);
541
+		deleteItem = menu.add(new MenuItem("Delete"));
542
+		deleteItem.addActionListener(this);
199
543
                 
200
544
         if (Globals.ADVANCED)
201
545
         {
..
..
@@ -421,7 +765,7 @@
421
765
 		genNormalsMESHItem.addActionListener(this);
422
766
         if (Globals.ADVANCED)
423
767
         {
424
-		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
768
+		genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
425
769
 		genNormalsMINEItem.addActionListener(this);
426
770
         }
427
771
 		stripifyItem = menu.add(new MenuItem("Stripify"));
..
..
@@ -514,10 +858,15 @@
514
858
 		attachBumpItem.addActionListener(this);
515
859
 		pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
516
860
 		pigmentBumpItem.addActionListener(this);
861
+                //embedTexturesItem
517
862
 		detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
518
863
 		detachPigmentItem.addActionListener(this);
519
864
 		detachBumpItem = menu.add(new MenuItem("Detach Bump"));
520
865
 		detachBumpItem.addActionListener(this);
866
+		embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
867
+		embedTexturesItem.addActionListener(this);
868
+		deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
869
+		deEmbedTexturesItem.addActionListener(this);
521
870
 		menu.add("-");
522
871
 		sortbysizeItem = menu.add(new MenuItem("Sort by size"));
523
872
 		sortbysizeItem.addActionListener(this);
..
..
@@ -544,6 +893,68 @@
544
893
 		buildToolsMenu(menu);
545
894
 	}
546
895
 	
896
+        JTabbedPane resourcecontainer;
897
+        cGridBag currenttab;
898
+        boolean added; // patch for jar
899
+                
900
+        int tabcount = 0;
901
+        int colcount = 0;
902
+        int rowcount = 0;
903
+        
904
+        int columns = 5;
905
+        int rows = 7;
906
+        
907
+    public void ResourceCallBack(String[] path)
908
+    {
909
+        for (int i = 0; i < path.length; i++)
910
+            System.out.print(path[i] + "/");
911
+        System.out.println();
912
+        if (rowcount == 0)
913
+        {
914
+            currenttab = new cGridBag();
915
+            added = false;
916
+            String tabname = String.valueOf((char)('A'+tabcount));
917
+            currenttab.setName(tabname);
918
+            rowcount = 1;
919
+        }
920
+        
921
+        if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
922
+        {
923
+            if (!added)
924
+            {
925
+                added = true;
926
+                resourcecontainer.add(currenttab);
927
+                String tabname = String.valueOf((char)('A'+tabcount));
928
+                resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
929
+            }
930
+            
931
+            AddTextureButton(path[0], path[1], currenttab);
932
+            if (++colcount >= columns)
933
+            {
934
+                colcount = 0;
935
+                currenttab.Return();
936
+                
937
+                if (rowcount++ >= rows)
938
+                {
939
+                    rowcount = 0;
940
+                }
941
+            }
942
+        }
943
+        else
944
+        {
945
+//            if (!path[path.length-1].equals("icons"))
946
+//                resourcecontainer.Return();
947
+        }
948
+    }
949
+    
950
+        void CreateTexturePanel(cGridBag container)
951
+        {
952
+            resourcecontainer = new JTabbedPane();
953
+            container.add(resourcecontainer);
954
+            
955
+            Grafreed.ParseResources("textures", this);
956
+        }
957
+        
547
958
 	void SetupUI2(ObjEditor oe)
548
959
 	{
549
960
             // June 2019
..
..
@@ -588,7 +999,7 @@
588
999
          */
589
1000
                 cGridBag copyOptionsPanel = new cGridBag();
590
1001
                                         
591
-                copyOptionsPanel.preferredHeight = 1;
1002
+                copyOptionsPanel.preferredHeight = 2;
592
1003
                 
593
1004
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
594
1005
                 
..
..
@@ -615,29 +1026,46 @@
615
1026
                 restoreCameraButton.setToolTipText("Restore viewpoint");
616
1027
 		restoreCameraButton.addActionListener(this);
617
1028
                 
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);
1029
+		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1030
+                saveVersionButton.setToolTipText("Duplicate current version");
1031
+		saveVersionButton.addActionListener(this);
1032
+                                                
1033
+		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1034
+                deleteVersionButton.setToolTipText("Delete current version");
1035
+		deleteVersionButton.addActionListener(this);
1036
+                                                
1037
+		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1038
+                previousVersionButton.setToolTipText("Previous version");
1039
+		previousVersionButton.addActionListener(this);
1040
+                previousVersionButton.setEnabled(false);
622
1041
                 
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);
1042
+                cGridBag updown = new cGridBag().setVertical(true);
1043
+		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1044
+                restoreButton.setToolTipText("Undo (restore current version)");
1045
+		restoreButton.addActionListener(this);
1046
+                //restoreButton.setEnabled(false);
627
1047
                 
628
-		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629
-                saveButton.setToolTipText("Save changes");
630
-		saveButton.addActionListener(this);
1048
+		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1049
+                replaceButton.setToolTipText("Save (replace current version)");
1050
+		replaceButton.addActionListener(this);
1051
+                //replaceButton.setEnabled(false);
631
1052
                 
632
-                copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1053
+                copyOptionsPanel.add(updown);
1054
+                
1055
+		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1056
+                nextVersionButton.setToolTipText("Next version");
1057
+		nextVersionButton.addActionListener(this);
1058
+                nextVersionButton.setEnabled(false);
1059
+                
1060
+                oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
633
1061
                 liveCB.setToolTipText("Enable animation");
634
1062
                                 liveCB.addItemListener(this);
635
1063
 
636
-		copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1064
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637
1065
                 oneStepButton.setToolTipText("Animate one step forward");
638
1066
 		oneStepButton.addActionListener(this);
639
1067
                 
640
-                copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1068
+                oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
641
1069
                 fastCB.setToolTipText("Fast mode");
642
1070
                                 fastCB.addItemListener(this);
643
1071
                                 
..
..
@@ -655,31 +1083,32 @@
655
1083
                         oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
656
1084
                         snapobjectButton.addActionListener(this);
657
1085
                         snapobjectButton.setToolTipText("Snap Object");
1086
+                        
1087
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1088
+		fourButton.addActionListener(this);
1089
+                fourButton.setToolTipText("Show control panel only");
658
1090
                 }
659
1091
 
660
1092
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
661
1093
                 
662
-		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663
-                twoButton.setToolTipText("Show center view only");
1094
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1095
+                twoButton.setToolTipText("Show 3D view only");
664
1096
 		twoButton.addActionListener(this);
665
1097
                 this.fullscreenLayout = twoButton;
666
1098
                 
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");
1099
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100
+                threeButton.setToolTipText("Show controls and 3D view");
675
1101
 		threeButton.addActionListener(this);
676
-		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677
-                sevenButton.setToolTipText("3-column layout");
678
-		sevenButton.addActionListener(this);
1102
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1103
+                sixButton.setToolTipText("Show 3D view and controls");
1104
+		sixButton.addActionListener(this);
1105
+//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1106
+//                sevenButton.setToolTipText("3-column layout");
1107
+//		sevenButton.addActionListener(this);
679
1108
                 //
680
1109
 
681
-		oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682
-                rootButton.setToolTipText("Edit selection in new tab");
1110
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1111
+                rootButton.setToolTipText("Open selection in new tab");
683
1112
 		rootButton.addActionListener(this);
684
1113
 
685
1114
                 oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -688,28 +1117,30 @@
688
1117
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
689
1118
 		//clearButton.addActionListener(this);
690
1119
 
1120
+                cGridBag row1 = new cGridBag();
1121
+                
691
1122
                 // INSERT
692
-                oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1123
+                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
693
1124
                 gridButton.setToolTipText("Create grid");
694
1125
                                 gridButton.addActionListener(this);
695
1126
 
696
-                oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1127
+                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
697
1128
                 boxButton.setToolTipText("Create box");
698
1129
                                 boxButton.addActionListener(this);
699
1130
 
700
-                oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1131
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
701
1132
                 sphereButton.setToolTipText("Create sphere");
702
1133
                                 sphereButton.addActionListener(this);
703
1134
 
704
-                oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1135
+                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
705
1136
                 coneButton.setToolTipText("Create cone");
706
1137
                                 coneButton.addActionListener(this);
707
1138
 
708
-                oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1139
+                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
709
1140
                 torusButton.setToolTipText("Create torus");
710
1141
                                 torusButton.addActionListener(this);
711
1142
 
712
-                oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1143
+                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713
1144
                 superButton.setToolTipText("Create superellipsoid");
714
1145
                                 superButton.addActionListener(this);
715
1146
 
..
..
@@ -720,51 +1151,53 @@
720
1151
                                     kleinButton.addActionListener(this);
721
1152
                 }
722
1153
                 
723
-                oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1154
+                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
724
1155
                 particlesButton.setToolTipText("Create particle system");
725
1156
                                particlesButton.addActionListener(this);
726
1157
 
727
-                oe.toolboxPanel.Return();
1158
+                oe.toolboxPanel.add(row1);
728
1159
                 
729
-                oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1160
+                cGridBag row2 = new cGridBag();
1161
+                
1162
+                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
730
1163
                 groupButton.setToolTipText("Create group");
731
1164
                                groupButton.addActionListener(this);
732
1165
 
733
-                oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1166
+                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
734
1167
                 compositeButton.setToolTipText("Create composite");
735
1168
                                compositeButton.addActionListener(this);
736
1169
 
737
-                oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1170
+                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
738
1171
                 switchButton.setToolTipText("Create item switcher");
739
1172
                                switchButton.addActionListener(this);
740
1173
 
741
-                oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1174
+                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
742
1175
                 loopButton.setToolTipText("Create loop");
743
1176
                                loopButton.addActionListener(this);
744
1177
 
745
-                oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1178
+                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
746
1179
                 textureButton.setToolTipText("Create texture");
747
1180
                                textureButton.addActionListener(this);
748
1181
 
749
-                oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1182
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
750
1183
                 overlayButton.setToolTipText("Create overlay");
751
1184
                                overlayButton.addActionListener(this);
752
1185
 
753
-                oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1186
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
754
1187
                 lightButton.setToolTipText("Create light");
755
1188
                                lightButton.addActionListener(this);
756
1189
 
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
-                }
1190
+                oe.toolboxPanel.add(row2);
1191
+                
1192
+                cGridBag textures = new cGridBag();
1193
+                
1194
+                CreateTexturePanel(textures);
1195
+                
1196
+                oe.toolboxPanel.add(textures);
1197
+                
1198
+                textures.preferredHeight = 100;
1199
+                
1200
+                CreateSkyboxPanel(oe.skyboxPanel);
768
1201
                 
769
1202
                 // EDIT panel
770
1203
 		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -772,20 +1205,20 @@
772
1205
 		editButton.addActionListener(this);
773
1206
 
774
1207
 		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
775
-                uneditButton.setToolTipText("Remove selection controls");
1208
+                uneditButton.setToolTipText("Unpin and remove selection controls");
776
1209
 		uneditButton.addActionListener(this);
777
1210
 
778
1211
 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
779
-                allParamsButton.setToolTipText("Show all controle");
1212
+                allParamsButton.setToolTipText("Show all controls");
780
1213
 		allParamsButton.addActionListener(this);
781
1214
 
782
-		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
783
-                clearPanelButton.setToolTipText("Clear edit panel");
1215
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1216
+                clearPanelButton.setToolTipText("Clear all controls");
784
1217
 		clearPanelButton.addActionListener(this);
785
1218
 
786
-		editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
787
-                unselectButton.setToolTipText("Unselect");
788
-		unselectButton.addActionListener(this);
1219
+		//editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+                //unselectButton.setToolTipText("Unselect");
1221
+		//unselectButton.addActionListener(this);
789
1222
 
790
1223
 		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
791
1224
                 flashSelectionButton.setToolTipText("Highlight selection");
..
..
@@ -820,9 +1253,12 @@
820
1253
 
821
1254
                 oe.treePanel.add(copyOptionsPanel);
822
1255
                 oe.treePanel.Return();
1256
+        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1257
+            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1258
+            sliderPane.preferredHeight = 1;
823
1259
                 
824
-//        mainPanel.setDividerLocation(0.5); //1.0);
825
-//        mainPanel.setResizeWeight(0.5);
1260
+//        mainPanel.setDividerLocation(0.1); //1.0);
1261
+        mainPanel.setResizeWeight(0.4);
826
1262
         
827
1263
 		//jList.addListSelectionListener(this);
828
1264
 		oe.jTree.addTreeSelectionListener(this);
..
..
@@ -830,7 +1266,7 @@
830
1266
 		//jTree.setEditable(true);
831
1267
 		oe.jTree.setDragEnabled(true);
832
1268
 		//jTree.setPreferredSize(new Dimension(10,10));
833
-		jSP.setPreferredSize(new Dimension(100,200));
1269
+		//jSP.setPreferredSize(new Dimension(100,200));
834
1270
 		
835
1271
                 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
836
1272
                 
..
..
@@ -842,7 +1278,7 @@
842
1278
 		dgr.addDragGestureListener(this);
843
1279
 		}catch(Exception e) {}
844
1280
 		*/
845
-        radio.layout = sevenButton;
1281
+        radio.layout = threeButton; // sixButton;
846
1282
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
847
1283
 	}
848
1284
         
..
..
@@ -893,9 +1329,12 @@
893
1329
                 smoothCB.setToolTipText("Snapping delay");
894
1330
                                 smoothCB.addItemListener(this);
895
1331
 
896
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
897
-                slowCB.setToolTipText("Smooth interpolation");
898
-                                slowCB.addItemListener(this);
1332
+//                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1333
+//                slowCB.setToolTipText("Smooth interpolation");
1334
+//                                slowCB.addItemListener(this);
1335
+                panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1336
+                minshaderCB.setToolTipText("Minimal fast shader");
1337
+                                minshaderCB.addItemListener(this);
899
1338
                                 
900
1339
 //        	constraints.gridy += 1;
901
1340
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..
..
@@ -945,9 +1384,9 @@
945
1384
                 toggleSwitchCB.setToolTipText("Choose a single item");
946
1385
                                 toggleSwitchCB.addItemListener(this);
947
1386
                                 
948
-                panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
949
-                autosaveCB.setToolTipText("On structure change");
950
-                                autosaveCB.addItemListener(this);
1387
+                panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1388
+                autokeepCB.setToolTipText("On structure change");
1389
+                                autokeepCB.addItemListener(this);
951
1390
 
952
1391
                 panel.Return();
953
1392
             if (Globals.ADVANCED)
..
..
@@ -984,7 +1423,7 @@
984
1423
             }
985
1424
             
986
1425
             radioButton.SetObject(obj);
987
-            radioButton.layout = sevenButton;
1426
+            radioButton.layout = threeButton; // sixButton;
988
1427
             radioButton.SetCamera(cameraView.renderCamera, false);
989
1428
             radioButton.addActionListener(this);
990
1429
             radioPanel.add(radioButton);
..
..
@@ -1009,6 +1448,8 @@
1009
1448
         cCheckBox localCB;
1010
1449
         cCheckBox crowdCB;
1011
1450
         cCheckBox smoothCB;
1451
+        cCheckBox minshaderCB;
1452
+        
1012
1453
         cToggleButton fastCB;
1013
1454
         cCheckBox slowCB;
1014
1455
         cCheckBox boxCB;
..
..
@@ -1024,7 +1465,7 @@
1024
1465
         
1025
1466
         cCheckBox oeilCB;
1026
1467
         cCheckBox shadowCB;
1027
-        cCheckBox autosaveCB;
1468
+        cCheckBox autokeepCB;
1028
1469
         cCheckBox lookAtCB;
1029
1470
         
1030
1471
 //        static int COLOR = 1;
..
..
@@ -1079,6 +1520,12 @@
1079
1520
             {
1080
1521
                 cameraView.ToggleInertia();
1081
1522
         cameraView.repaint();
1523
+            }
1524
+            else if(e.getSource() == minshaderCB)
1525
+            {
1526
+                Globals.MINSHADER ^= true;
1527
+                cameraView.programInitialized = false;
1528
+                cameraView.repaint();
1082
1529
             }
1083
1530
             else if(e.getSource() == localCB)
1084
1531
             {
..
..
@@ -1136,9 +1583,9 @@
1136
1583
             {
1137
1584
                 Globals.FREEZEONMOVE ^= true;
1138
1585
             }
1139
-            else if(e.getSource() == autosaveCB)
1586
+            else if(e.getSource() == autokeepCB)
1140
1587
             {
1141
-                Globals.SAVEONMAKE ^= true;
1588
+                Globals.REPLACEONMAKE ^= true;
1142
1589
             }
1143
1590
             else if(e.getSource() == lookAtCB)
1144
1591
             {
..
..
@@ -1664,6 +2111,16 @@
1664
2111
             }
1665
2112
         }
1666
2113
     }
2114
+
2115
+    private void EditElement(Object3D elem, boolean newWindow)
2116
+    {
2117
+        //    if (!(elem instanceof Composite))
2118
+        //        newWindow = false;
2119
+            listUI.add(elem);
2120
+            elem.openEditWindow(this, newWindow); //, false);
2121
+            System.out.println("edit : " + elem);
2122
+            elem.editWindow.refreshContents(true); // ? new
2123
+    }
1667
2124
         
1668
2125
     /**
1669
2126
      * applyExample
..
..
@@ -2092,6 +2549,23 @@
2092
2549
 		{
2093
2550
 			makeSomething(new Light());
2094
2551
 		} else
2552
+//		if (source == skybox1Button ||
2553
+//                    source == skybox2Button ||
2554
+//                    source == skybox3Button ||
2555
+//                    source == skybox4Button ||
2556
+//                    source == skybox5Button ||
2557
+//                    source == skybox6Button ||
2558
+//                    source == skybox7Button ||
2559
+//                    source == skybox11Button ||
2560
+//                    source == skybox12Button ||
2561
+//                    source == skybox13Button ||
2562
+//                    source == skybox14Button ||
2563
+//                    source == skybox15Button ||
2564
+//                    source == skybox16Button ||
2565
+//                    source == skybox17Button)
2566
+//		{
2567
+//                    ChangeSkybox(source);
2568
+//		} else
2095
2569
 		if (source == csgItem)
2096
2570
 		{
2097
2571
 			group(new CSG());
..
..
@@ -2177,7 +2651,7 @@
2177
2651
 		if (source == computeAOItem)
2178
2652
 		{
2179
2653
                     Globals.drawMode = CameraPane.OCCLUSION;
2180
-                    Globals.theRenderer.repaint();
2654
+                    cameraView.repaint();
2181
2655
 		} else
2182
2656
 		if (source == recompileItem)
2183
2657
 		{
..
..
@@ -2192,7 +2666,7 @@
2192
2666
 		if (source == invariantsItem)
2193
2667
 		{
2194
2668
                     System.out.println("Invariants:");
2195
-                    Grafreed.grafreeD.universe.invariants();
2669
+                    Grafreed.grafreed.universe.invariants();
2196
2670
 		} else
2197
2671
 		if (source == memoryItem)
2198
2672
 		{
..
..
@@ -2223,19 +2697,40 @@
2223
2697
 		{
2224
2698
 			ToggleFullScreen();
2225
2699
 		} else
2226
-		if (source == undoButton)
2700
+		if (source == previousVersionButton)
2227
2701
 		{
2228
-			if (!Undo())
2229
-                            java.awt.Toolkit.getDefaultToolkit().beep();
2702
+                        // Go to previous version
2703
+			//if (!Undo())
2704
+                            //java.awt.Toolkit.getDefaultToolkit().beep();
2705
+			PreviousVersion();
2230
2706
 		} else
2231
-		if (source == redoButton)
2707
+		if (source == restoreButton)
2232
2708
 		{
2233
-			Redo();
2709
+                        // Restore current version
2710
+			Restore();
2711
+        //restoreButton.setEnabled(false);
2234
2712
 		} else
2235
-		if (source == saveButton)
2713
+		if (source == replaceButton)
2236
2714
 		{
2715
+                        // Overwrite current version
2716
+			Replace();
2717
+        //replaceButton.setEnabled(false);
2718
+		} else
2719
+		if (source == nextVersionButton)
2720
+		{
2721
+                        // Go to next version
2722
+			NextVersion();
2723
+		} else
2724
+		if (source == saveVersionButton)
2725
+		{
2726
+                        // Save a new version
2237
2727
 			if (!Save(true))
2238
2728
                             java.awt.Toolkit.getDefaultToolkit().beep();
2729
+		} else
2730
+		if (source == deleteVersionButton)
2731
+		{
2732
+                        // Delete a new version
2733
+                        DeleteVersion();
2239
2734
 		} else
2240
2735
 		if (source == oneStepButton)
2241
2736
 		{
..
..
@@ -2290,11 +2785,11 @@
2290
2785
 		} else
2291
2786
 		if (source == undoItem)
2292
2787
 		{
2293
-			Undo();
2788
+			PreviousVersion();
2294
2789
 		} else
2295
2790
 		if (source == redoItem)
2296
2791
 		{
2297
-			Redo();
2792
+			NextVersion();
2298
2793
 		} else
2299
2794
 		if (source == duplicateItem)
2300
2795
 		{
..
..
@@ -2615,7 +3110,7 @@
2615
3110
 		{
2616
3111
 			StepAll();
2617
3112
 		} else
2618
-		if (source == clearItem) // || event.getSource() == clearButton)
3113
+		if (source == deleteItem) // || event.getSource() == clearButton)
2619
3114
 		{
2620
3115
 			//int indices[] = jList.getSelectedIndices();
2621
3116
 			//for (int i = indices.length - 1; i >= 0; i--)
..
..
@@ -3097,7 +3592,7 @@
3097
3592
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3098
3593
 			{
3099
3594
 				obj = (Object3D)e.nextElement();
3100
-                                obj.SetBumpTexture(null);
3595
+                                obj.ResetBumpTexture();
3101
3596
 			}
3102
3597
 			
3103
3598
 			refreshContents();
..
..
@@ -3111,6 +3606,31 @@
3111
3606
                                 obj.SetBumpTexture(obj.GetPigmentTexture());
3112
3607
 			}
3113
3608
 			
3609
+			refreshContents();
3610
+		} else
3611
+		if (source == embedTexturesItem)
3612
+		{
3613
+			Object3D obj;
3614
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3615
+			{
3616
+				obj = (Object3D)e.nextElement();
3617
+                                obj.EmbedTextures(true);
3618
+			}
3619
+			
3620
+			refreshContents();
3621
+		} else
3622
+		if (source == deEmbedTexturesItem)
3623
+		{
3624
+			Object3D obj;
3625
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3626
+			{
3627
+				obj = (Object3D)e.nextElement();
3628
+                                obj.EmbedTextures(false);
3629
+			}
3630
+			
3631
+                CameraPane.texturepigment.clear();
3632
+                CameraPane.texturebump.clear();
3633
+                
3114
3634
 			refreshContents();
3115
3635
 		} else
3116
3636
 		if (source == flashSelectionButton)
..
..
@@ -3214,8 +3734,8 @@
3214
3734
 //                    centralPanel.setVisible(true);
3215
3735
 //                    XYZPanel.setVisible(true);
3216
3736
                     bigThree.ClearUI();
3737
+                    bigThree.add(scenePanel);
3217
3738
                     bigThree.add(centralPanel);
3218
-                    bigThree.add(XYZPanel);
3219
3739
                     bigThree.FlushUI();
3220
3740
                     
3221
3741
                     cameraView.requestFocusInWindow();
..
..
@@ -3295,8 +3815,8 @@
3295
3815
 //                    centralPanel.setVisible(true);
3296
3816
 //                    XYZPanel.setVisible(false);
3297
3817
                     bigThree.ClearUI();
3298
-                    bigThree.add(scenePanel);
3299
3818
                     bigThree.add(centralPanel);
3819
+                    bigThree.add(scenePanel);
3300
3820
                     bigThree.FlushUI();
3301
3821
                     
3302
3822
                     cameraView.requestFocusInWindow();
..
..
@@ -3402,10 +3922,10 @@
3402
3922
 			{
3403
3923
 				Object3D child = (Object3D)e.nextElement();
3404
3924
                                 if(child.editWindow != null)
3405
-                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3406
3925
                                 child.pinned = false;
3407
3926
 				child.CloseUI();
3408
3927
                                 listUI.remove(child);
3928
+//                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3409
3929
                                 
3410
3930
                                 //child.editWindow = null; // ???????????
3411
3931
 			}
..
..
@@ -3424,6 +3944,7 @@
3424
3944
                         obj.CloseUI();
3425
3945
                     }
3426
3946
                     listUI.clear();
3947
+                    SetPinStates(group.selection.size() > 0);
3427
3948
                     refreshContents(true);
3428
3949
 		} else
3429
3950
 		if (source == allParamsButton)
..
..
@@ -3479,6 +4000,9 @@
3479
4000
                     }
3480
4001
                     
3481
4002
                     copy = group;
4003
+                    
4004
+                    SetUndoStates();
4005
+
3482
4006
                     //Globals.theRenderer.object = group;
3483
4007
                     if(!useclient)
3484
4008
                     {
..
..
@@ -3507,8 +4031,11 @@
3507
4031
                     radio.layout.doClick();
3508
4032
                     
3509
4033
                     ClearUnpinned();
3510
-                    SetPinStates(group.selection.size() > 0);
3511
-                    if (group.selection.size() == 1)
4034
+                    
4035
+                    //Grafreed.Assert(group != null);
4036
+                    //Grafreed.Assert(group.selection != null);
4037
+                    SetPinStates(group.selection == null || group.selection.size() > 0);
4038
+                    if (group.selection == null || group.selection.size() == 1)
3512
4039
                         EditSelection(false);
3513
4040
                     keepparent = group.parent;
3514
4041
                     // PARENT = NULL or not???
..
..
@@ -3521,11 +4048,13 @@
3521
4048
                 } else if (event.getSource() == editCameraItem)
3522
4049
                 {
3523
4050
                     cameraView.ProtectCamera();
4051
+                    cameraView.requestFocusInWindow();
3524
4052
                     cameraView.repaint();
3525
4053
                     return;
3526
4054
                 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
3527
4055
                 {
3528
4056
                     cameraView.RevertCamera();
4057
+                    cameraView.requestFocusInWindow();
3529
4058
                     cameraView.repaint();
3530
4059
                     return;
3531
4060
         //        } else if (event.getSource() == textureButton)
..
..
@@ -4102,7 +4631,7 @@
4102
4631
                             
4103
4632
                             try
4104
4633
                             {
4105
-                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4634
+                                texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4106
4635
                             }
4107
4636
                             catch (Exception e)
4108
4637
                             {
..
..
@@ -4579,6 +5108,12 @@
4579
5108
 	
4580
5109
 	void EditSelection(boolean newWindow)
4581
5110
 	{
5111
+                if (group.selection == null)
5112
+                {
5113
+                     EditElement(group, newWindow); // ? new
5114
+                     return;
5115
+                }
5116
+                
4582
5117
         //    aConstraints.gridy = 0;
4583
5118
 		for (int i=0; i<group.selection.size(); i++)
4584
5119
 		{
..
..
@@ -4589,12 +5124,7 @@
4589
5124
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4590
5125
                         if(elem != group || !newWindow)
4591
5126
                         {
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
5127
+                            EditElement(elem, newWindow); // ? new
4598
5128
                         }
4599
5129
 		}
4600
5130
 	}
..
..
@@ -4657,9 +5187,7 @@
4657
5187
 		
4658
5188
 		freezemodel = false;
4659
5189
 	}
4660
-	
4661
-        boolean flashIt = true;
4662
-        
5190
+	        
4663
5191
 	public void valueChanged(TreeSelectionEvent e)
4664
5192
 	//public boolean handleEvent(Event event)
4665
5193
 	{
..
..
@@ -4732,13 +5260,15 @@
4732
5260
         {
4733
5261
             editButton.setEnabled(enabled);
4734
5262
             uneditButton.setEnabled(enabled);
4735
-            unselectButton.setEnabled(enabled);
5263
+            //unselectButton.setEnabled(enabled);
4736
5264
             flashSelectionButton.setEnabled(enabled);
5265
+            
5266
+            clearPanelButton.setEnabled(!listUI.isEmpty());
4737
5267
         }
4738
5268
 
4739
5269
         void refreshContents(boolean cp)
4740
5270
         {
4741
-            if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
5271
+            //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4742
5272
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4743
5273
             {
4744
5274
                 objEditor.ClearInfo(); // .GetMaterial());
..
..
@@ -4942,10 +5472,10 @@
4942
5472
 	
4943
5473
 	void paste(boolean expand)
4944
5474
 	{
4945
-        if (Globals.SAVEONMAKE)
5475
+        if (Globals.REPLACEONMAKE)
4946
5476
             Save();
4947
-        boolean keep = Globals.SAVEONMAKE;
4948
-        Globals.SAVEONMAKE = false;
5477
+        boolean keep = Globals.REPLACEONMAKE;
5478
+        Globals.REPLACEONMAKE = false;
4949
5479
 	//	if (GrafreeD.clipboard == null)
4950
5480
 	//		return;
4951
5481
 		boolean first = true;
..
..
@@ -5005,7 +5535,7 @@
5005
5535
                         Grafreed.clipboard.get(0).parent = keepparent;
5006
5536
 		}
5007
5537
 		
5008
-        Globals.SAVEONMAKE = keep;
5538
+        Globals.REPLACEONMAKE = keep;
5009
5539
 		ResetModel();
5010
5540
 		refreshContents();
5011
5541
 	}
..
..
@@ -5141,10 +5671,10 @@
5141
5671
         
5142
5672
 	void group(Object3D csg, boolean grab)
5143
5673
 	{
5144
-        if (Globals.SAVEONMAKE)
5674
+        if (Globals.REPLACEONMAKE)
5145
5675
             Save();
5146
-        boolean keep = Globals.SAVEONMAKE;
5147
-        Globals.SAVEONMAKE = false;
5676
+        boolean keep = Globals.REPLACEONMAKE;
5677
+        Globals.REPLACEONMAKE = false;
5148
5678
 		if (//false) // why??
5149
5679
                     !group.selection.isEmpty())
5150
5680
                 {
..
..
@@ -5258,15 +5788,15 @@
5258
5788
                 //node.add(csg);
5259
5789
 		//makeSomething(node);
5260
5790
 		makeSomething(csg);
5261
-        Globals.SAVEONMAKE = keep;
5791
+        Globals.REPLACEONMAKE = keep;
5262
5792
 	}
5263
5793
 	
5264
5794
         void Ungroup(Object3D g)
5265
5795
         {
5266
-        if (Globals.SAVEONMAKE)
5796
+        if (Globals.REPLACEONMAKE)
5267
5797
             Save();
5268
-        boolean keep = Globals.SAVEONMAKE;
5269
-        Globals.SAVEONMAKE = false;
5798
+        boolean keep = Globals.REPLACEONMAKE;
5799
+        Globals.REPLACEONMAKE = false;
5270
5800
             if (g instanceof HiddenObject)
5271
5801
             {
5272
5802
                 HiddenObject h = (HiddenObject) g;
..
..
@@ -5283,7 +5813,7 @@
5283
5813
                     objEditor.makeSomething(g.get(i), false);
5284
5814
                 }
5285
5815
             }
5286
-        Globals.SAVEONMAKE = keep;
5816
+        Globals.REPLACEONMAKE = keep;
5287
5817
         }
5288
5818
         
5289
5819
 	void ungroup()
..
..
@@ -5574,7 +6104,6 @@
5574
6104
 	
5575
6105
 	cButton restoreCameraButton;
5576
6106
         
5577
-	cButton saveButton;
5578
6107
 	cButton oneStepButton;
5579
6108
         
5580
6109
         cButton groupButton;
..
..
@@ -5583,6 +6112,22 @@
5583
6112
         cButton switchButton;
5584
6113
         cButton loopButton;
5585
6114
         cButton textureButton;
6115
+        
6116
+        cButton skybox1Button;
6117
+        cButton skybox2Button;
6118
+        cButton skybox3Button;
6119
+        cButton skybox4Button;
6120
+        cButton skybox5Button;
6121
+        cButton skybox6Button;
6122
+        cButton skybox7Button;
6123
+        
6124
+        cButton skybox11Button;
6125
+        cButton skybox12Button;
6126
+        cButton skybox13Button;
6127
+        cButton skybox14Button;
6128
+        cButton skybox15Button;
6129
+        cButton skybox16Button;
6130
+        cButton skybox17Button;
5586
6131
         
5587
6132
         cButton gridButton;
5588
6133
         cButton boxButton;
..
..
@@ -5647,7 +6192,7 @@
5647
6192
 	private MenuItem pasteLinkItem;
5648
6193
 	private MenuItem pasteCloneItem;
5649
6194
 	private MenuItem pasteExpandItem;
5650
-	private MenuItem clearItem;
6195
+	private MenuItem deleteItem;
5651
6196
 	private MenuItem clearAllItem;
5652
6197
 	private MenuItem genUVItem;
5653
6198
 	private MenuItem genNormalsMESHItem;
..
..
@@ -5731,6 +6276,8 @@
5731
6276
 	private MenuItem attachBumpItem;
5732
6277
 	private MenuItem detachBumpItem;
5733
6278
 	private MenuItem pigmentBumpItem;
6279
+	private MenuItem embedTexturesItem;
6280
+	private MenuItem deEmbedTexturesItem;
5734
6281
 
5735
6282
 	private MenuItem particleItem;
5736
6283
 	private MenuItem ragdollItem;