Compact toolbar.

Normand Briere

2019-08-12 b1d79b74514041a059b454a9f6fc3970773c0cb8

 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,351 @@
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, String c, final String t, int count, cGridBag row)
46
+    {
47
+        cButton textureButton;
48
+        final String path = "textures/" + f + "/" + c + "/"; // + t;
49
+        row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
50
+        textureButton.setToolTipText(c + count);
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
+        for (int i=0; i<group.selection.size(); i++)
354
+        {
355
+            Object3D obj = group.selection.get(i);
356
+            obj.SetPigmentTexture("@" + texture);
357
+        }
358
+       
359
+        refreshContents();
360
+    }
361
+
362
+    public void Show3DView()
363
+    {
364
+        // bug
365
+        //gridPanel.setDividerLocation(1.0);
366
+        //bigPanel.setDividerLocation(0.0);
367
+        bigThree.ClearUI();
368
+        bigThree.add(centralPanel);
369
+        bigThree.FlushUI();
370
+    }
371
+
26
372
     //ObjEditor objEditor;
27
373
 	public void closeUI2()
28
374
 	{
..
..
@@ -60,6 +406,12 @@
60
406
 		this.copy = this.group = group;
61
407
 		//selectees = this.group.selectees;
62
408
 		
409
+        if (copy.versionlist == null)
410
+        {
411
+            copy.versionlist = new Object3D[100];
412
+            copy.versionindex = -1;
413
+        }
414
+        
63
415
 		if(ui)
64
416
                     SetupUI(objEditor);
65
417
 	}
..
..
@@ -80,10 +432,22 @@
80
432
 		SetupViews(objEditor);
81
433
                 
82
434
                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
435
+                
436
+        if (copy.versionlist == null)
437
+        {
438
+            copy.versionlist = new Object3D[100];
439
+            copy.versionindex = -1;
440
+            
441
+            Save(true);
442
+        }
83
443
 	}
84
444
 
85
445
     void CloneSelection(boolean supports)
86
446
     {
447
+        if (Globals.REPLACEONMAKE)
448
+            Save();
449
+        boolean keep = Globals.REPLACEONMAKE;
450
+        Globals.REPLACEONMAKE = false;
87
451
         //   Object3D keep = GrafreeD.clipboard;
88
452
            //Object3D obj;
89
453
            for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -94,6 +458,7 @@
94
458
                
95
459
                makeSomething(clone, i==group.selection.size()-1);
96
460
            }
461
+        Globals.REPLACEONMAKE = keep;
97
462
     }
98
463
 
99
464
     void CloneClipboard(boolean supports)
..
..
@@ -189,8 +554,8 @@
189
554
 //		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190
555
 //		pasteExpandItem.addActionListener(this);
191
556
 		menu.add("-");
192
-		clearItem = menu.add(new MenuItem("Clear"));
193
-		clearItem.addActionListener(this);
557
+		deleteItem = menu.add(new MenuItem("Delete"));
558
+		deleteItem.addActionListener(this);
194
559
                 
195
560
         if (Globals.ADVANCED)
196
561
         {
..
..
@@ -380,13 +745,14 @@
380
745
 		shadowYItem.addActionListener(this);
381
746
                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382
747
 		shadowZItem.addActionListener(this);
748
+		attributeItem = menu.add(new MenuItem("Attribute"));
749
+		attributeItem.addActionListener(this);
750
+                
383
751
         if (Globals.ADVANCED)
384
752
         {
385
753
 		menu.add("-");
386
754
 		linkerItem = menu.add(new MenuItem("Linker"));
387
755
 		linkerItem.addActionListener(this);
388
-		attributeItem = menu.add(new MenuItem("Attribute"));
389
-		attributeItem.addActionListener(this);
390
756
 		templateItem = menu.add(new MenuItem("Template"));
391
757
 		templateItem.addActionListener(this);
392
758
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
..
..
@@ -415,7 +781,7 @@
415
781
 		genNormalsMESHItem.addActionListener(this);
416
782
         if (Globals.ADVANCED)
417
783
         {
418
-		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
784
+		genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419
785
 		genNormalsMINEItem.addActionListener(this);
420
786
         }
421
787
 		stripifyItem = menu.add(new MenuItem("Stripify"));
..
..
@@ -508,10 +874,15 @@
508
874
 		attachBumpItem.addActionListener(this);
509
875
 		pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510
876
 		pigmentBumpItem.addActionListener(this);
877
+                //embedTexturesItem
511
878
 		detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512
879
 		detachPigmentItem.addActionListener(this);
513
880
 		detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514
881
 		detachBumpItem.addActionListener(this);
882
+		embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
883
+		embedTexturesItem.addActionListener(this);
884
+		deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
885
+		deEmbedTexturesItem.addActionListener(this);
515
886
 		menu.add("-");
516
887
 		sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517
888
 		sortbysizeItem.addActionListener(this);
..
..
@@ -538,6 +909,74 @@
538
909
 		buildToolsMenu(menu);
539
910
 	}
540
911
 	
912
+        JTabbedPane resourcecontainer;
913
+        cGridBag currenttab;
914
+        boolean added; // patch for jar
915
+                
916
+        int tabcount = 0;
917
+        int colcount = 0;
918
+        int rowcount = 0;
919
+        int texturecount = 0;
920
+        
921
+        int columns = 5;
922
+        int rows = 7;
923
+        
924
+    public void ResourceCallBack(String[] path)
925
+    {
926
+//        for (int i = 0; i < path.length; i++)
927
+//            System.out.print(path[i] + "/");
928
+//        System.out.println();
929
+        
930
+        if (//rowcount == 0 ||
931
+                path.length == 1)
932
+        {
933
+            currenttab = new cGridBag();
934
+            added = false;
935
+            String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
936
+            currenttab.setName(tabname);
937
+            rowcount = 1;
938
+            colcount = 0;
939
+            texturecount = 0;
940
+        }
941
+        
942
+        if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
943
+        {
944
+            if (!added)
945
+            {
946
+                added = true;
947
+                resourcecontainer.add(currenttab);
948
+                String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
949
+                resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
950
+            }
951
+            
952
+            AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
953
+            
954
+            if (++colcount >= columns)
955
+            {
956
+                colcount = 0;
957
+                currenttab.Return();
958
+                
959
+                if (rowcount++ >= rows)
960
+                {
961
+                    rowcount = 0;
962
+                }
963
+            }
964
+        }
965
+        else
966
+        {
967
+//            if (!path[path.length-1].equals("icons"))
968
+//                resourcecontainer.Return();
969
+        }
970
+    }
971
+    
972
+        void CreateTexturePanel(cGridBag container)
973
+        {
974
+            resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
975
+            container.add(resourcecontainer);
976
+            
977
+            Grafreed.ParseResources("textures", this);
978
+        }
979
+        
541
980
 	void SetupUI2(ObjEditor oe)
542
981
 	{
543
982
             // June 2019
..
..
@@ -555,11 +994,6 @@
555
994
             //new Exception().printStackTrace();
556
995
                 
557
996
         oe.radioPanel = new JPanel(new GridBagLayout());
558
-	oe.aConstraints.weightx = 1;
559
-	oe.aConstraints.weighty = 0;
560
-		oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
561
-	oe.aConstraints.gridwidth = 100;
562
-	oe.aConstraints.gridheight = 1;
563
997
 //        oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
564
998
         
565
999
         oe.buttonGroup = new ButtonGroup();
..
..
@@ -582,7 +1016,7 @@
582
1016
          */
583
1017
                 cGridBag copyOptionsPanel = new cGridBag();
584
1018
                                         
585
-                copyOptionsPanel.preferredHeight = 1;
1019
+                copyOptionsPanel.preferredHeight = 2;
586
1020
                 
587
1021
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588
1022
                 
..
..
@@ -597,46 +1031,102 @@
597
1031
                     maxButton.addActionListener(this);
598
1032
                 }
599
1033
                 
1034
+                cButton gcButton;
1035
+                
1036
+		oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1037
+                gcButton.setToolTipText("Garbage collect");
1038
+        gcButton.addActionListener(new ActionListener()
1039
+        {
1040
+                public void actionPerformed(ActionEvent e)
1041
+                {
1042
+                    System.gc();
1043
+                }
1044
+        });
1045
+                
1046
+		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1047
+                collapseButton.setToolTipText("Collapse toolbar");
1048
+		collapseButton.addActionListener(this);
1049
+                
1050
+		oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1051
+                maximize3DButton.setToolTipText("Maximize 3D view");
1052
+		maximize3DButton.addActionListener(this);
1053
+                
1054
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1055
+                twoButton.setToolTipText("Show 3D view only");
1056
+		twoButton.addActionListener(this);
1057
+                this.fullscreenLayout = twoButton;
1058
+                
1059
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1060
+                threeButton.setToolTipText("Show controls and 3D view");
1061
+		threeButton.addActionListener(this);
1062
+                if (Globals.ADVANCED)
1063
+                {
1064
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1065
+                sixButton.setToolTipText("Show 3D view and controls");
1066
+		sixButton.addActionListener(this);
1067
+                }
1068
+//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1069
+//                sevenButton.setToolTipText("3-column layout");
1070
+//		sevenButton.addActionListener(this);
1071
+                //
1072
+                
600
1073
 		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
601
1074
                 fullButton.setToolTipText("Full-screen window");
602
1075
 		fullButton.addActionListener(this);
603
1076
                 
1077
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1078
+                screenfitButton.setToolTipText("Screen fit");
1079
+		screenfitButton.addActionListener(this);
1080
+
604
1081
 		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605
1082
                 restoreCameraButton.setToolTipText("Restore viewpoint");
606
1083
 		restoreCameraButton.addActionListener(this);
607
1084
                 
608
-		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609
-                undoButton.setToolTipText("Undo changes");
610
-		undoButton.addActionListener(this);
611
-                undoButton.setEnabled(false);
1085
+		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1086
+                saveVersionButton.setToolTipText("Duplicate current version");
1087
+		saveVersionButton.addActionListener(this);
1088
+                                                
1089
+		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1090
+                deleteVersionButton.setToolTipText("Delete current version");
1091
+		deleteVersionButton.addActionListener(this);
1092
+                                                
1093
+		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1094
+                previousVersionButton.setToolTipText("Previous version");
1095
+		previousVersionButton.addActionListener(this);
1096
+                previousVersionButton.setEnabled(false);
612
1097
                 
613
-		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614
-                redoButton.setToolTipText("Redo changes");
615
-		redoButton.addActionListener(this);
616
-                redoButton.setEnabled(false);
1098
+                cGridBag updown = new cGridBag().setVertical(true);
1099
+		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100
+                restoreButton.setToolTipText("Undo (restore current version)");
1101
+		restoreButton.addActionListener(this);
1102
+                //restoreButton.setEnabled(false);
617
1103
                 
618
-		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619
-                saveButton.setToolTipText("Save changes");
620
-		saveButton.addActionListener(this);
1104
+		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1105
+                replaceButton.setToolTipText("Save (replace current version)");
1106
+		replaceButton.addActionListener(this);
1107
+                //replaceButton.setEnabled(false);
621
1108
                 
622
-                copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
623
-                liveCB.setToolTipText("Enable animation");
624
-                                liveCB.addItemListener(this);
625
-
626
-		copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1109
+                copyOptionsPanel.add(updown);
1110
+                
1111
+		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1112
+                nextVersionButton.setToolTipText("Next version");
1113
+		nextVersionButton.addActionListener(this);
1114
+                nextVersionButton.setEnabled(false);
1115
+                
1116
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
627
1117
                 oneStepButton.setToolTipText("Animate one step forward");
628
1118
 		oneStepButton.addActionListener(this);
629
1119
                 
630
-                copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1120
+                oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1121
+                liveCB.setToolTipText("Enable animation");
1122
+                                liveCB.addItemListener(this);
1123
+
1124
+                oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
631
1125
                 fastCB.setToolTipText("Fast mode");
632
1126
                                 fastCB.addItemListener(this);
633
1127
                                 
634
1128
                 //oe.toolboxPanel.Return();
635
1129
                 
636
-		copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637
-                screenfitButton.setToolTipText("Screen fit");
638
-		screenfitButton.addActionListener(this);
639
-
640
1130
 //                copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
641
1131
 //                trackCB.setToolTipText("Enable tracking");
642
1132
 //                                trackCB.addItemListener(this);
..
..
@@ -649,31 +1139,17 @@
649
1139
                         oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650
1140
                         snapobjectButton.addActionListener(this);
651
1141
                         snapobjectButton.setToolTipText("Snap Object");
1142
+                        
1143
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1144
+		fourButton.addActionListener(this);
1145
+                fourButton.setToolTipText("Show control panel only");
652
1146
                 }
653
1147
 
654
1148
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
655
1149
                 
656
-		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657
-                twoButton.setToolTipText("Show center view only");
658
-		twoButton.addActionListener(this);
659
-                this.fullscreenLayout = twoButton;
660
-                
661
-		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662
-		fourButton.addActionListener(this);
663
-                fourButton.setToolTipText("Show left panel only");
664
-		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
665
-                sixButton.setToolTipText("2-column layout left");
666
-		sixButton.addActionListener(this);
667
-		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
668
-                threeButton.setToolTipText("2-column layout right");
669
-		threeButton.addActionListener(this);
670
-		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671
-                sevenButton.setToolTipText("3-column layout");
672
-		sevenButton.addActionListener(this);
673
-                //
674
1150
 
675
-		oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
676
-                rootButton.setToolTipText("Edit selection in new tab");
1151
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1152
+                rootButton.setToolTipText("Open selection in new tab");
677
1153
 		rootButton.addActionListener(this);
678
1154
 
679
1155
                 oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -682,28 +1158,30 @@
682
1158
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
683
1159
 		//clearButton.addActionListener(this);
684
1160
 
1161
+                cGridBag row1 = new cGridBag();
1162
+                
685
1163
                 // INSERT
686
-                oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1164
+                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
687
1165
                 gridButton.setToolTipText("Create grid");
688
1166
                                 gridButton.addActionListener(this);
689
1167
 
690
-                oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1168
+                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691
1169
                 boxButton.setToolTipText("Create box");
692
1170
                                 boxButton.addActionListener(this);
693
1171
 
694
-                oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1172
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
695
1173
                 sphereButton.setToolTipText("Create sphere");
696
1174
                                 sphereButton.addActionListener(this);
697
1175
 
698
-                oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1176
+                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
699
1177
                 coneButton.setToolTipText("Create cone");
700
1178
                                 coneButton.addActionListener(this);
701
1179
 
702
-                oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1180
+                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703
1181
                 torusButton.setToolTipText("Create torus");
704
1182
                                 torusButton.addActionListener(this);
705
1183
 
706
-                oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1184
+                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
707
1185
                 superButton.setToolTipText("Create superellipsoid");
708
1186
                                 superButton.addActionListener(this);
709
1187
 
..
..
@@ -714,51 +1192,53 @@
714
1192
                                     kleinButton.addActionListener(this);
715
1193
                 }
716
1194
                 
717
-                oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1195
+                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
718
1196
                 particlesButton.setToolTipText("Create particle system");
719
1197
                                particlesButton.addActionListener(this);
720
1198
 
721
-                oe.toolboxPanel.Return();
1199
+                oe.toolboxPanel.add(row1);
722
1200
                 
723
-                oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1201
+                cGridBag row2 = new cGridBag();
1202
+                
1203
+                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
724
1204
                 groupButton.setToolTipText("Create group");
725
1205
                                groupButton.addActionListener(this);
726
1206
 
727
-                oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1207
+                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
728
1208
                 compositeButton.setToolTipText("Create composite");
729
1209
                                compositeButton.addActionListener(this);
730
1210
 
731
-                oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1211
+                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
732
1212
                 switchButton.setToolTipText("Create item switcher");
733
1213
                                switchButton.addActionListener(this);
734
1214
 
735
-                oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1215
+                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
736
1216
                 loopButton.setToolTipText("Create loop");
737
1217
                                loopButton.addActionListener(this);
738
1218
 
739
-                oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1219
+                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
740
1220
                 textureButton.setToolTipText("Create texture");
741
1221
                                textureButton.addActionListener(this);
742
1222
 
743
-                oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1223
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
744
1224
                 overlayButton.setToolTipText("Create overlay");
745
1225
                                overlayButton.addActionListener(this);
746
1226
 
747
-                oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1227
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748
1228
                 lightButton.setToolTipText("Create light");
749
1229
                                lightButton.addActionListener(this);
750
1230
 
751
-                for (int i=6; --i>=0;)
752
-                {
753
-                oe.toolboxPanel.Return();
754
-                oe.toolboxPanel.add(new cGridBag());
755
-                oe.toolboxPanel.add(new cGridBag());
756
-                oe.toolboxPanel.add(new cGridBag());
757
-                oe.toolboxPanel.add(new cGridBag());
758
-                oe.toolboxPanel.add(new cGridBag());
759
-                oe.toolboxPanel.add(new cGridBag());
760
-                oe.toolboxPanel.add(new cGridBag());
761
-                }
1231
+                oe.toolboxPanel.add(row2);
1232
+                
1233
+                cGridBag textures = new cGridBag();
1234
+                
1235
+                CreateTexturePanel(textures);
1236
+                
1237
+                oe.toolboxPanel.add(textures);
1238
+                
1239
+                textures.preferredHeight = 100;
1240
+                
1241
+                CreateSkyboxPanel(oe.skyboxPanel);
762
1242
                 
763
1243
                 // EDIT panel
764
1244
 		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -766,20 +1246,20 @@
766
1246
 		editButton.addActionListener(this);
767
1247
 
768
1248
 		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
769
-                uneditButton.setToolTipText("Remove selection controls");
1249
+                uneditButton.setToolTipText("Unpin and remove selection controls");
770
1250
 		uneditButton.addActionListener(this);
771
1251
 
772
1252
 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
773
-                allParamsButton.setToolTipText("Show all controle");
1253
+                allParamsButton.setToolTipText("Show all controls");
774
1254
 		allParamsButton.addActionListener(this);
775
1255
 
776
-		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
777
-                clearPanelButton.setToolTipText("Clear edit panel");
1256
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1257
+                clearPanelButton.setToolTipText("Clear all controls");
778
1258
 		clearPanelButton.addActionListener(this);
779
1259
 
780
-		editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
781
-                unselectButton.setToolTipText("Unselect");
782
-		unselectButton.addActionListener(this);
1260
+		//editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1261
+                //unselectButton.setToolTipText("Unselect");
1262
+		//unselectButton.addActionListener(this);
783
1263
 
784
1264
 		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
785
1265
                 flashSelectionButton.setToolTipText("Highlight selection");
..
..
@@ -814,9 +1294,12 @@
814
1294
 
815
1295
                 oe.treePanel.add(copyOptionsPanel);
816
1296
                 oe.treePanel.Return();
1297
+        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1298
+            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1299
+            sliderPane.preferredHeight = 1;
817
1300
                 
818
-//        mainPanel.setDividerLocation(0.5); //1.0);
819
-//        mainPanel.setResizeWeight(0.5);
1301
+//        mainPanel.setDividerLocation(0.1); //1.0);
1302
+        mainPanel.setResizeWeight(0.4);
820
1303
         
821
1304
 		//jList.addListSelectionListener(this);
822
1305
 		oe.jTree.addTreeSelectionListener(this);
..
..
@@ -824,7 +1307,7 @@
824
1307
 		//jTree.setEditable(true);
825
1308
 		oe.jTree.setDragEnabled(true);
826
1309
 		//jTree.setPreferredSize(new Dimension(10,10));
827
-		jSP.setPreferredSize(new Dimension(100,200));
1310
+		//jSP.setPreferredSize(new Dimension(100,200));
828
1311
 		
829
1312
                 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
830
1313
                 
..
..
@@ -836,7 +1319,7 @@
836
1319
 		dgr.addDragGestureListener(this);
837
1320
 		}catch(Exception e) {}
838
1321
 		*/
839
-        radio.layout = sevenButton;
1322
+        radio.layout = threeButton; // sixButton;
840
1323
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
841
1324
 	}
842
1325
         
..
..
@@ -887,9 +1370,12 @@
887
1370
                 smoothCB.setToolTipText("Snapping delay");
888
1371
                                 smoothCB.addItemListener(this);
889
1372
 
890
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
891
-                slowCB.setToolTipText("Smooth interpolation");
892
-                                slowCB.addItemListener(this);
1373
+//                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1374
+//                slowCB.setToolTipText("Smooth interpolation");
1375
+//                                slowCB.addItemListener(this);
1376
+                panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
1377
+                minshaderCB.setToolTipText("Minimal fast shader");
1378
+                                minshaderCB.addItemListener(this);
893
1379
                                 
894
1380
 //        	constraints.gridy += 1;
895
1381
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..
..
@@ -939,9 +1425,9 @@
939
1425
                 toggleSwitchCB.setToolTipText("Choose a single item");
940
1426
                                 toggleSwitchCB.addItemListener(this);
941
1427
                                 
942
-                panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
943
-                autosaveCB.setToolTipText("On structure change");
944
-                                autosaveCB.addItemListener(this);
1428
+                panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1429
+                autokeepCB.setToolTipText("On structure change");
1430
+                                autokeepCB.addItemListener(this);
945
1431
 
946
1432
                 panel.Return();
947
1433
             if (Globals.ADVANCED)
..
..
@@ -970,7 +1456,7 @@
970
1456
         {
971
1457
             cRadio radioButton = new cRadio(obj.name);
972
1458
             
973
-            // Patch to avoid bug with transparency.
1459
+            // June 2019. Patch to avoid bug with transparency.
974
1460
             radioButton.hadMaterial = obj.material != null;
975
1461
             if (!radioButton.hadMaterial)
976
1462
             {
..
..
@@ -978,7 +1464,7 @@
978
1464
             }
979
1465
             
980
1466
             radioButton.SetObject(obj);
981
-            radioButton.layout = sevenButton;
1467
+            radioButton.layout = threeButton; // sixButton;
982
1468
             radioButton.SetCamera(cameraView.renderCamera, false);
983
1469
             radioButton.addActionListener(this);
984
1470
             radioPanel.add(radioButton);
..
..
@@ -1003,6 +1489,8 @@
1003
1489
         cCheckBox localCB;
1004
1490
         cCheckBox crowdCB;
1005
1491
         cCheckBox smoothCB;
1492
+        cCheckBox minshaderCB;
1493
+        
1006
1494
         cToggleButton fastCB;
1007
1495
         cCheckBox slowCB;
1008
1496
         cCheckBox boxCB;
..
..
@@ -1018,7 +1506,7 @@
1018
1506
         
1019
1507
         cCheckBox oeilCB;
1020
1508
         cCheckBox shadowCB;
1021
-        cCheckBox autosaveCB;
1509
+        cCheckBox autokeepCB;
1022
1510
         cCheckBox lookAtCB;
1023
1511
         
1024
1512
 //        static int COLOR = 1;
..
..
@@ -1073,6 +1561,12 @@
1073
1561
             {
1074
1562
                 cameraView.ToggleInertia();
1075
1563
         cameraView.repaint();
1564
+            }
1565
+            else if(e.getSource() == minshaderCB)
1566
+            {
1567
+                Globals.MINSHADER ^= true;
1568
+                cameraView.programInitialized = false;
1569
+                cameraView.repaint();
1076
1570
             }
1077
1571
             else if(e.getSource() == localCB)
1078
1572
             {
..
..
@@ -1130,9 +1624,9 @@
1130
1624
             {
1131
1625
                 Globals.FREEZEONMOVE ^= true;
1132
1626
             }
1133
-            else if(e.getSource() == autosaveCB)
1627
+            else if(e.getSource() == autokeepCB)
1134
1628
             {
1135
-                Globals.SAVEONMAKE ^= true;
1629
+                Globals.REPLACEONMAKE ^= true;
1136
1630
             }
1137
1631
             else if(e.getSource() == lookAtCB)
1138
1632
             {
..
..
@@ -1214,8 +1708,6 @@
1214
1708
                         }
1215
1709
                     }
1216
1710
                     
1217
-                    String string = (String) object;
1218
-                    
1219
1711
                     System.out.println("Transfer = " + object + "; drop : " + target);
1220
1712
 //                    if( object instanceof java.io.File[])
1221
1713
 //                    {
..
..
@@ -1223,6 +1715,8 @@
1223
1715
 //                        objEditor.DropFile((java.io.File[]) object, true);
1224
1716
 //                        return;
1225
1717
 //                    }
1718
+                    
1719
+                    String string = object.toString();
1226
1720
                     
1227
1721
                     // File path for Mac and Windows
1228
1722
                     if (string.charAt(0) == '/' || string.charAt(1) == ':')
..
..
@@ -1350,7 +1844,12 @@
1350
1844
   TreePath path;
1351
1845
 
1352
1846
   public TransferableTreePath(TreePath tp) {
1353
-    path = tp;
1847
+      Object[] objs = new Object[tp.getPathCount()];
1848
+      for (int i=0; i<objs.length; i++)
1849
+      {
1850
+          objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
1851
+      }
1852
+    path = new TreePath(objs);
1354
1853
   }
1355
1854
 
1356
1855
   public synchronized DataFlavor[] getTransferDataFlavors() {
..
..
@@ -1472,6 +1971,9 @@
1472
1971
 		animationItem.addItemListener(this);
1473
1972
                 animationItem.setState(Globals.ANIMATION);
1474
1973
                 
1974
+		menu.add(archiveItem = new MenuItem("Archive3D..."));
1975
+		archiveItem.addActionListener(this);
1976
+                
1475
1977
 		menu.add("-");
1476
1978
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1477
1979
 		parseverticesItem.addActionListener(this);
..
..
@@ -1484,6 +1986,8 @@
1484
1986
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1485
1987
 		reduce34MorphItem.addActionListener(this);
1486
1988
 		menu.add("-");
1989
+		menu.add(memoryItem = new MenuItem("Memory Usage"));
1990
+		memoryItem.addActionListener(this);
1487
1991
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1488
1992
 		computeAOItem.addActionListener(this);
1489
1993
                 
..
..
@@ -1492,8 +1996,6 @@
1492
1996
 		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1493
1997
 		mirrorItem.addActionListener(this);
1494
1998
 		menu.add("-");
1495
-		menu.add(memoryItem = new MenuItem("Memory Usage"));
1496
-		memoryItem.addActionListener(this);
1497
1999
 		menu.add(analyzeItem = new MenuItem("Analyze"));
1498
2000
 		analyzeItem.addActionListener(this);
1499
2001
 		menu.add(dumpItem = new MenuItem("Print"));
..
..
@@ -1654,6 +2156,16 @@
1654
2156
                 listUI.remove(i);
1655
2157
             }
1656
2158
         }
2159
+    }
2160
+
2161
+    private void EditElement(Object3D elem, boolean newWindow)
2162
+    {
2163
+        //    if (!(elem instanceof Composite))
2164
+        //        newWindow = false;
2165
+            listUI.add(elem);
2166
+            elem.openEditWindow(this, newWindow); //, false);
2167
+            System.out.println("edit : " + elem);
2168
+            elem.editWindow.refreshContents(true); // ? new
1657
2169
     }
1658
2170
         
1659
2171
     /**
..
..
@@ -2083,6 +2595,23 @@
2083
2595
 		{
2084
2596
 			makeSomething(new Light());
2085
2597
 		} else
2598
+//		if (source == skybox1Button ||
2599
+//                    source == skybox2Button ||
2600
+//                    source == skybox3Button ||
2601
+//                    source == skybox4Button ||
2602
+//                    source == skybox5Button ||
2603
+//                    source == skybox6Button ||
2604
+//                    source == skybox7Button ||
2605
+//                    source == skybox11Button ||
2606
+//                    source == skybox12Button ||
2607
+//                    source == skybox13Button ||
2608
+//                    source == skybox14Button ||
2609
+//                    source == skybox15Button ||
2610
+//                    source == skybox16Button ||
2611
+//                    source == skybox17Button)
2612
+//		{
2613
+//                    ChangeSkybox(source);
2614
+//		} else
2086
2615
 		if (source == csgItem)
2087
2616
 		{
2088
2617
 			group(new CSG());
..
..
@@ -2168,7 +2697,7 @@
2168
2697
 		if (source == computeAOItem)
2169
2698
 		{
2170
2699
                     Globals.drawMode = CameraPane.OCCLUSION;
2171
-                    Globals.theRenderer.repaint();
2700
+                    cameraView.repaint();
2172
2701
 		} else
2173
2702
 		if (source == recompileItem)
2174
2703
 		{
..
..
@@ -2183,7 +2712,7 @@
2183
2712
 		if (source == invariantsItem)
2184
2713
 		{
2185
2714
                     System.out.println("Invariants:");
2186
-                    Grafreed.grafreeD.universe.invariants();
2715
+                    Grafreed.grafreed.universe.invariants();
2187
2716
 		} else
2188
2717
 		if (source == memoryItem)
2189
2718
 		{
..
..
@@ -2214,17 +2743,52 @@
2214
2743
 		{
2215
2744
 			ToggleFullScreen();
2216
2745
 		} else
2217
-		if (source == undoButton)
2746
+		if (source == collapseButton)
2218
2747
 		{
2219
-			Undo();
2748
+                        this.expandedLayout = radio.layout;
2749
+			CollapseToolbar();
2220
2750
 		} else
2221
-		if (source == redoButton)
2751
+		if (source == maximize3DButton)
2222
2752
 		{
2223
-			Redo();
2753
+                        this.expandedLayout = radio.layout;
2754
+                        radio.layout = twoButton;
2755
+                        Show3DView();
2756
+			CollapseToolbar();
2224
2757
 		} else
2225
-		if (source == saveButton)
2758
+		if (source == previousVersionButton)
2226
2759
 		{
2227
-			Save();
2760
+                        // Go to previous version
2761
+			//if (!Undo())
2762
+                            //java.awt.Toolkit.getDefaultToolkit().beep();
2763
+			PreviousVersion();
2764
+		} else
2765
+		if (source == restoreButton)
2766
+		{
2767
+                        // Restore current version
2768
+			Restore();
2769
+        //restoreButton.setEnabled(false);
2770
+		} else
2771
+		if (source == replaceButton)
2772
+		{
2773
+                        // Overwrite current version
2774
+			Replace();
2775
+        //replaceButton.setEnabled(false);
2776
+		} else
2777
+		if (source == nextVersionButton)
2778
+		{
2779
+                        // Go to next version
2780
+			NextVersion();
2781
+		} else
2782
+		if (source == saveVersionButton)
2783
+		{
2784
+                        // Save a new version
2785
+			if (!Save(true))
2786
+                            java.awt.Toolkit.getDefaultToolkit().beep();
2787
+		} else
2788
+		if (source == deleteVersionButton)
2789
+		{
2790
+                        // Delete a new version
2791
+                        DeleteVersion();
2228
2792
 		} else
2229
2793
 		if (source == oneStepButton)
2230
2794
 		{
..
..
@@ -2233,17 +2797,14 @@
2233
2797
 		} else
2234
2798
 		if (source == screenfitButton)
2235
2799
 		{
2236
-			//Reload(lastConverter, lastFilename, true);
2237
2800
                     ScreenFit();
2238
2801
 		} else
2239
2802
 		if (source == screenfitpointButton)
2240
2803
 		{
2241
-			//Reload(lastConverter, lastFilename, true);
2242
2804
                     ScreenFitPoint();
2243
2805
 		} else
2244
2806
 		if (source == snapobjectButton)
2245
2807
 		{
2246
-			//Reload(lastConverter, lastFilename, true);
2247
2808
                     SnapObject();
2248
2809
 		} else
2249
2810
 //		if (event.getSource() == recompileButton)
..
..
@@ -2282,11 +2843,11 @@
2282
2843
 		} else
2283
2844
 		if (source == undoItem)
2284
2845
 		{
2285
-			Undo();
2846
+			PreviousVersion();
2286
2847
 		} else
2287
2848
 		if (source == redoItem)
2288
2849
 		{
2289
-			Redo();
2850
+			NextVersion();
2290
2851
 		} else
2291
2852
 		if (source == duplicateItem)
2292
2853
 		{
..
..
@@ -2607,7 +3168,7 @@
2607
3168
 		{
2608
3169
 			StepAll();
2609
3170
 		} else
2610
-		if (source == clearItem) // || event.getSource() == clearButton)
3171
+		if (source == deleteItem) // || event.getSource() == clearButton)
2611
3172
 		{
2612
3173
 			//int indices[] = jList.getSelectedIndices();
2613
3174
 			//for (int i = indices.length - 1; i >= 0; i--)
..
..
@@ -3089,7 +3650,7 @@
3089
3650
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3090
3651
 			{
3091
3652
 				obj = (Object3D)e.nextElement();
3092
-                                obj.SetBumpTexture(null);
3653
+                                obj.ResetBumpTexture();
3093
3654
 			}
3094
3655
 			
3095
3656
 			refreshContents();
..
..
@@ -3103,6 +3664,31 @@
3103
3664
                                 obj.SetBumpTexture(obj.GetPigmentTexture());
3104
3665
 			}
3105
3666
 			
3667
+			refreshContents();
3668
+		} else
3669
+		if (source == embedTexturesItem)
3670
+		{
3671
+			Object3D obj;
3672
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3673
+			{
3674
+				obj = (Object3D)e.nextElement();
3675
+                                obj.EmbedTextures(true);
3676
+			}
3677
+			
3678
+			refreshContents();
3679
+		} else
3680
+		if (source == deEmbedTexturesItem)
3681
+		{
3682
+			Object3D obj;
3683
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3684
+			{
3685
+				obj = (Object3D)e.nextElement();
3686
+                                obj.EmbedTextures(false);
3687
+			}
3688
+			
3689
+                CameraPane.texturepigment.clear();
3690
+                CameraPane.texturebump.clear();
3691
+                
3106
3692
 			refreshContents();
3107
3693
 		} else
3108
3694
 		if (source == flashSelectionButton)
..
..
@@ -3120,38 +3706,7 @@
3120
3706
                     if (CameraPane.FULLSCREEN)
3121
3707
                         fullscreenLayout = radio.layout;
3122
3708
                     
3123
-                    // bug
3124
-                    //gridPanel.setDividerLocation(1.0);
3125
-                    //bigPanel.setDividerLocation(0.0);
3126
-//                    bigThree.remove(scenePanel);
3127
-//                    bigThree.remove(centralPanel);
3128
-//                    bigThree.remove(XYZPanel);
3129
-//                    aWindowConstraints.gridx = 0;
3130
-//                    aWindowConstraints.gridy = 0;
3131
-//                    aWindowConstraints.gridwidth = 1;
3132
-//            //        aConstraints.gridheight = 3;
3133
-//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3134
-//                    aWindowConstraints.weightx = 0;
3135
-//                    aWindowConstraints.weighty = 1;
3136
-//                    //bigThree.add(jtp, aWindowConstraints);
3137
-//                    aWindowConstraints.weightx = 1;
3138
-//                    aWindowConstraints.gridwidth = 3;
3139
-//            //        aConstraints.gridheight = 3;
3140
-//                    aWindowConstraints.gridx = 1;
3141
-//                    aWindowConstraints.fill = GridBagConstraints.BOTH;
3142
-//                    bigThree.add(centralPanel, aWindowConstraints);
3143
-//                    aWindowConstraints.weightx = 0;
3144
-//                    aWindowConstraints.gridx = 4;
3145
-//                    aWindowConstraints.gridwidth = 1;
3146
-//            //        aConstraints.gridheight = 3;
3147
-//                    aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3148
-//                    //bigThree.add(XYZPanel, aWindowConstraints);
3149
-//                    scenePanel.setVisible(false);
3150
-//                    centralPanel.setVisible(true);
3151
-//                    XYZPanel.setVisible(false);
3152
-                    bigThree.ClearUI();
3153
-                    bigThree.add(centralPanel);
3154
-                    bigThree.FlushUI();
3709
+                    Show3DView();
3155
3710
                     
3156
3711
                     cameraView.requestFocusInWindow();
3157
3712
                     
..
..
@@ -3206,8 +3761,8 @@
3206
3761
 //                    centralPanel.setVisible(true);
3207
3762
 //                    XYZPanel.setVisible(true);
3208
3763
                     bigThree.ClearUI();
3764
+                    bigThree.add(scenePanel);
3209
3765
                     bigThree.add(centralPanel);
3210
-                    bigThree.add(XYZPanel);
3211
3766
                     bigThree.FlushUI();
3212
3767
                     
3213
3768
                     cameraView.requestFocusInWindow();
..
..
@@ -3287,8 +3842,8 @@
3287
3842
 //                    centralPanel.setVisible(true);
3288
3843
 //                    XYZPanel.setVisible(false);
3289
3844
                     bigThree.ClearUI();
3290
-                    bigThree.add(scenePanel);
3291
3845
                     bigThree.add(centralPanel);
3846
+                    bigThree.add(scenePanel);
3292
3847
                     bigThree.FlushUI();
3293
3848
                     
3294
3849
                     cameraView.requestFocusInWindow();
..
..
@@ -3394,10 +3949,10 @@
3394
3949
 			{
3395
3950
 				Object3D child = (Object3D)e.nextElement();
3396
3951
                                 if(child.editWindow != null)
3397
-                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3398
3952
                                 child.pinned = false;
3399
3953
 				child.CloseUI();
3400
3954
                                 listUI.remove(child);
3955
+//                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3401
3956
                                 
3402
3957
                                 //child.editWindow = null; // ???????????
3403
3958
 			}
..
..
@@ -3416,6 +3971,7 @@
3416
3971
                         obj.CloseUI();
3417
3972
                     }
3418
3973
                     listUI.clear();
3974
+                    SetPinStates(group.selection.size() > 0);
3419
3975
                     refreshContents(true);
3420
3976
 		} else
3421
3977
 		if (source == allParamsButton)
..
..
@@ -3471,6 +4027,9 @@
3471
4027
                     }
3472
4028
                     
3473
4029
                     copy = group;
4030
+                    
4031
+                    SetUndoStates();
4032
+
3474
4033
                     //Globals.theRenderer.object = group;
3475
4034
                     if(!useclient)
3476
4035
                     {
..
..
@@ -3499,8 +4058,11 @@
3499
4058
                     radio.layout.doClick();
3500
4059
                     
3501
4060
                     ClearUnpinned();
3502
-                    SetPinStates(group.selection.size() > 0);
3503
-                    if (group.selection.size() == 1)
4061
+                    
4062
+                    //Grafreed.Assert(group != null);
4063
+                    //Grafreed.Assert(group.selection != null);
4064
+                    SetPinStates(group.selection == null || group.selection.size() > 0);
4065
+                    if (group.selection == null || group.selection.size() == 1)
3504
4066
                         EditSelection(false);
3505
4067
                     keepparent = group.parent;
3506
4068
                     // PARENT = NULL or not???
..
..
@@ -3513,11 +4075,13 @@
3513
4075
                 } else if (event.getSource() == editCameraItem)
3514
4076
                 {
3515
4077
                     cameraView.ProtectCamera();
4078
+                    cameraView.requestFocusInWindow();
3516
4079
                     cameraView.repaint();
3517
4080
                     return;
3518
4081
                 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
3519
4082
                 {
3520
4083
                     cameraView.RevertCamera();
4084
+                    cameraView.requestFocusInWindow();
3521
4085
                     cameraView.repaint();
3522
4086
                     return;
3523
4087
         //        } else if (event.getSource() == textureButton)
..
..
@@ -4094,7 +4658,7 @@
4094
4658
                             
4095
4659
                             try
4096
4660
                             {
4097
-                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4661
+                                texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4098
4662
                             }
4099
4663
                             catch (Exception e)
4100
4664
                             {
..
..
@@ -4571,6 +5135,12 @@
4571
5135
 	
4572
5136
 	void EditSelection(boolean newWindow)
4573
5137
 	{
5138
+                if (group.selection == null)
5139
+                {
5140
+                     EditElement(group, newWindow); // ? new
5141
+                     return;
5142
+                }
5143
+                
4574
5144
         //    aConstraints.gridy = 0;
4575
5145
 		for (int i=0; i<group.selection.size(); i++)
4576
5146
 		{
..
..
@@ -4581,12 +5151,7 @@
4581
5151
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4582
5152
                         if(elem != group || !newWindow)
4583
5153
                         {
4584
-                        //    if (!(elem instanceof Composite))
4585
-                        //        newWindow = false;
4586
-                            listUI.add(elem);
4587
-                            elem.openEditWindow(this, newWindow); //, false);
4588
-                            System.out.println("edit : " + elem);
4589
-                            elem.editWindow.refreshContents(true); // ? new
5154
+                            EditElement(elem, newWindow); // ? new
4590
5155
                         }
4591
5156
 		}
4592
5157
 	}
..
..
@@ -4649,9 +5214,7 @@
4649
5214
 		
4650
5215
 		freezemodel = false;
4651
5216
 	}
4652
-	
4653
-        boolean flashIt = true;
4654
-        
5217
+	        
4655
5218
 	public void valueChanged(TreeSelectionEvent e)
4656
5219
 	//public boolean handleEvent(Event event)
4657
5220
 	{
..
..
@@ -4724,14 +5287,16 @@
4724
5287
         {
4725
5288
             editButton.setEnabled(enabled);
4726
5289
             uneditButton.setEnabled(enabled);
4727
-            unselectButton.setEnabled(enabled);
5290
+            //unselectButton.setEnabled(enabled);
4728
5291
             flashSelectionButton.setEnabled(enabled);
5292
+            
5293
+            clearPanelButton.setEnabled(!listUI.isEmpty());
4729
5294
         }
4730
5295
 
4731
5296
         void refreshContents(boolean cp)
4732
5297
         {
4733
-            if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4734
-            if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
5298
+            //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5299
+            if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4735
5300
             {
4736
5301
                 objEditor.ClearInfo(); // .GetMaterial());
4737
5302
 
..
..
@@ -4740,7 +5305,7 @@
4740
5305
                     Object3D child = (Object3D) group.selection.get(i);
4741
5306
 
4742
5307
                     objEditor.AddInfo(child, this, true);
4743
-    System.err.println("info : " + child.GetPath());
5308
+//    System.err.println("info : " + child.GetPath());
4744
5309
                 }
4745
5310
 
4746
5311
                 objEditor.SetText(); // jan 2014
..
..
@@ -4830,8 +5395,8 @@
4830
5395
                 
4831
5396
 		if (cut)
4832
5397
 		{
4833
-        if (Globals.SAVEONMAKE)
4834
-                    Save();
5398
+//        if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5399
+//                    Save();
4835
5400
 			//int indices[] = jList.getSelectedIndices();
4836
5401
 			//for (int i = indices.length - 1; i >= 0; i--)
4837
5402
 			//jList.remove(indices[i]);
..
..
@@ -4934,6 +5499,10 @@
4934
5499
 	
4935
5500
 	void paste(boolean expand)
4936
5501
 	{
5502
+        if (Globals.REPLACEONMAKE)
5503
+            Save();
5504
+        boolean keep = Globals.REPLACEONMAKE;
5505
+        Globals.REPLACEONMAKE = false;
4937
5506
 	//	if (GrafreeD.clipboard == null)
4938
5507
 	//		return;
4939
5508
 		boolean first = true;
..
..
@@ -4993,6 +5562,7 @@
4993
5562
                         Grafreed.clipboard.get(0).parent = keepparent;
4994
5563
 		}
4995
5564
 		
5565
+        Globals.REPLACEONMAKE = keep;
4996
5566
 		ResetModel();
4997
5567
 		refreshContents();
4998
5568
 	}
..
..
@@ -5128,6 +5698,10 @@
5128
5698
         
5129
5699
 	void group(Object3D csg, boolean grab)
5130
5700
 	{
5701
+        if (Globals.REPLACEONMAKE)
5702
+            Save();
5703
+        boolean keep = Globals.REPLACEONMAKE;
5704
+        Globals.REPLACEONMAKE = false;
5131
5705
 		if (//false) // why??
5132
5706
                     !group.selection.isEmpty())
5133
5707
                 {
..
..
@@ -5241,10 +5815,15 @@
5241
5815
                 //node.add(csg);
5242
5816
 		//makeSomething(node);
5243
5817
 		makeSomething(csg);
5818
+        Globals.REPLACEONMAKE = keep;
5244
5819
 	}
5245
5820
 	
5246
5821
         void Ungroup(Object3D g)
5247
5822
         {
5823
+        if (Globals.REPLACEONMAKE)
5824
+            Save();
5825
+        boolean keep = Globals.REPLACEONMAKE;
5826
+        Globals.REPLACEONMAKE = false;
5248
5827
             if (g instanceof HiddenObject)
5249
5828
             {
5250
5829
                 HiddenObject h = (HiddenObject) g;
..
..
@@ -5261,6 +5840,7 @@
5261
5840
                     objEditor.makeSomething(g.get(i), false);
5262
5841
                 }
5263
5842
             }
5843
+        Globals.REPLACEONMAKE = keep;
5264
5844
         }
5265
5845
         
5266
5846
 	void ungroup()
..
..
@@ -5551,7 +6131,6 @@
5551
6131
 	
5552
6132
 	cButton restoreCameraButton;
5553
6133
         
5554
-	cButton saveButton;
5555
6134
 	cButton oneStepButton;
5556
6135
         
5557
6136
         cButton groupButton;
..
..
@@ -5560,6 +6139,22 @@
5560
6139
         cButton switchButton;
5561
6140
         cButton loopButton;
5562
6141
         cButton textureButton;
6142
+        
6143
+        cButton skybox1Button;
6144
+        cButton skybox2Button;
6145
+        cButton skybox3Button;
6146
+        cButton skybox4Button;
6147
+        cButton skybox5Button;
6148
+        cButton skybox6Button;
6149
+        cButton skybox7Button;
6150
+        
6151
+        cButton skybox11Button;
6152
+        cButton skybox12Button;
6153
+        cButton skybox13Button;
6154
+        cButton skybox14Button;
6155
+        cButton skybox15Button;
6156
+        cButton skybox16Button;
6157
+        cButton skybox17Button;
5563
6158
         
5564
6159
         cButton gridButton;
5565
6160
         cButton boxButton;
..
..
@@ -5624,7 +6219,7 @@
5624
6219
 	private MenuItem pasteLinkItem;
5625
6220
 	private MenuItem pasteCloneItem;
5626
6221
 	private MenuItem pasteExpandItem;
5627
-	private MenuItem clearItem;
6222
+	private MenuItem deleteItem;
5628
6223
 	private MenuItem clearAllItem;
5629
6224
 	private MenuItem genUVItem;
5630
6225
 	private MenuItem genNormalsMESHItem;
..
..
@@ -5708,6 +6303,8 @@
5708
6303
 	private MenuItem attachBumpItem;
5709
6304
 	private MenuItem detachBumpItem;
5710
6305
 	private MenuItem pigmentBumpItem;
6306
+	private MenuItem embedTexturesItem;
6307
+	private MenuItem deEmbedTexturesItem;
5711
6308
 
5712
6309
 	private MenuItem particleItem;
5713
6310
 	private MenuItem ragdollItem;