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,10 +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
     {
431
+        if (Globals.REPLACEONMAKE)
432
+            Save();
433
+        boolean keep = Globals.REPLACEONMAKE;
434
+        Globals.REPLACEONMAKE = false;
87
435
         //   Object3D keep = GrafreeD.clipboard;
88
436
            //Object3D obj;
89
437
            for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -94,6 +442,7 @@
94
442
                
95
443
                makeSomething(clone, i==group.selection.size()-1);
96
444
            }
445
+        Globals.REPLACEONMAKE = keep;
97
446
     }
98
447
 
99
448
     void CloneClipboard(boolean supports)
..
..
@@ -189,8 +538,8 @@
189
538
 //		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190
539
 //		pasteExpandItem.addActionListener(this);
191
540
 		menu.add("-");
192
-		clearItem = menu.add(new MenuItem("Clear"));
193
-		clearItem.addActionListener(this);
541
+		deleteItem = menu.add(new MenuItem("Delete"));
542
+		deleteItem.addActionListener(this);
194
543
                 
195
544
         if (Globals.ADVANCED)
196
545
         {
..
..
@@ -220,7 +569,7 @@
220
569
 //        toggleSwitchItem.addItemListener(this);
221
570
 //        toggleSwitchItem.setState(CameraPane.SWITCH);
222
571
         
223
-        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
572
+        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
224
573
         toggleHandleItem.addItemListener(this);
225
574
         toggleHandleItem.setState(CameraPane.HANDLES);
226
575
         
..
..
@@ -380,13 +729,14 @@
380
729
 		shadowYItem.addActionListener(this);
381
730
                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382
731
 		shadowZItem.addActionListener(this);
732
+		attributeItem = menu.add(new MenuItem("Attribute"));
733
+		attributeItem.addActionListener(this);
734
+                
383
735
         if (Globals.ADVANCED)
384
736
         {
385
737
 		menu.add("-");
386
738
 		linkerItem = menu.add(new MenuItem("Linker"));
387
739
 		linkerItem.addActionListener(this);
388
-		attributeItem = menu.add(new MenuItem("Attribute"));
389
-		attributeItem.addActionListener(this);
390
740
 		templateItem = menu.add(new MenuItem("Template"));
391
741
 		templateItem.addActionListener(this);
392
742
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
..
..
@@ -415,7 +765,7 @@
415
765
 		genNormalsMESHItem.addActionListener(this);
416
766
         if (Globals.ADVANCED)
417
767
         {
418
-		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
768
+		genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419
769
 		genNormalsMINEItem.addActionListener(this);
420
770
         }
421
771
 		stripifyItem = menu.add(new MenuItem("Stripify"));
..
..
@@ -508,10 +858,15 @@
508
858
 		attachBumpItem.addActionListener(this);
509
859
 		pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510
860
 		pigmentBumpItem.addActionListener(this);
861
+                //embedTexturesItem
511
862
 		detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512
863
 		detachPigmentItem.addActionListener(this);
513
864
 		detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514
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);
515
870
 		menu.add("-");
516
871
 		sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517
872
 		sortbysizeItem.addActionListener(this);
..
..
@@ -538,6 +893,68 @@
538
893
 		buildToolsMenu(menu);
539
894
 	}
540
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
+        
541
958
 	void SetupUI2(ObjEditor oe)
542
959
 	{
543
960
             // June 2019
..
..
@@ -590,48 +1007,70 @@
590
1007
                 //minButton.setToolTipText("Minimize window");
591
1008
 		//minButton.addActionListener(this);
592
1009
                 
593
-		oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594
-                maxButton.setToolTipText("Maximize window");
595
-		maxButton.addActionListener(this);
1010
+                if (Globals.ADVANCED)
1011
+                {
1012
+                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1013
+                    maxButton.setToolTipText("Maximize window");
1014
+                    maxButton.addActionListener(this);
1015
+                }
596
1016
                 
597
1017
 		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
598
1018
                 fullButton.setToolTipText("Full-screen window");
599
1019
 		fullButton.addActionListener(this);
600
1020
                 
1021
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1022
+                screenfitButton.setToolTipText("Screen fit");
1023
+		screenfitButton.addActionListener(this);
1024
+
601
1025
 		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602
1026
                 restoreCameraButton.setToolTipText("Restore viewpoint");
603
1027
 		restoreCameraButton.addActionListener(this);
604
1028
                 
605
-		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606
-                undoButton.setToolTipText("Undo changes");
607
-		undoButton.addActionListener(this);
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);
608
1041
                 
609
-		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
610
-                redoButton.setToolTipText("Redo changes");
611
-		redoButton.addActionListener(this);
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);
612
1047
                 
613
-		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614
-                saveButton.setToolTipText("Save changes");
615
-		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);
616
1052
                 
617
-                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);
618
1061
                 liveCB.setToolTipText("Enable animation");
619
1062
                                 liveCB.addItemListener(this);
620
1063
 
621
-		copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1064
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
622
1065
                 oneStepButton.setToolTipText("Animate one step forward");
623
1066
 		oneStepButton.addActionListener(this);
624
1067
                 
625
-                copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1068
+                oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
626
1069
                 fastCB.setToolTipText("Fast mode");
627
1070
                                 fastCB.addItemListener(this);
628
1071
                                 
629
1072
                 //oe.toolboxPanel.Return();
630
1073
                 
631
-		copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632
-                screenfitButton.setToolTipText("Screen fit");
633
-		screenfitButton.addActionListener(this);
634
-
635
1074
 //                copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
636
1075
 //                trackCB.setToolTipText("Enable tracking");
637
1076
 //                                trackCB.addItemListener(this);
..
..
@@ -644,31 +1083,32 @@
644
1083
                         oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
645
1084
                         snapobjectButton.addActionListener(this);
646
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");
647
1090
                 }
648
1091
 
649
1092
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
650
1093
                 
651
-		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
652
-                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");
653
1096
 		twoButton.addActionListener(this);
654
1097
                 this.fullscreenLayout = twoButton;
655
1098
                 
656
-		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657
-		fourButton.addActionListener(this);
658
-                fourButton.setToolTipText("Show left panel only");
659
-		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
660
-                sixButton.setToolTipText("2-column layout left");
661
-		sixButton.addActionListener(this);
662
-		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
663
-                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");
664
1101
 		threeButton.addActionListener(this);
665
-		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
666
-                sevenButton.setToolTipText("3-column layout");
667
-		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);
668
1108
                 //
669
1109
 
670
-		oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671
-                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");
672
1112
 		rootButton.addActionListener(this);
673
1113
 
674
1114
                 oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -677,28 +1117,30 @@
677
1117
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
678
1118
 		//clearButton.addActionListener(this);
679
1119
 
1120
+                cGridBag row1 = new cGridBag();
1121
+                
680
1122
                 // INSERT
681
-                oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1123
+                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682
1124
                 gridButton.setToolTipText("Create grid");
683
1125
                                 gridButton.addActionListener(this);
684
1126
 
685
-                oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1127
+                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
686
1128
                 boxButton.setToolTipText("Create box");
687
1129
                                 boxButton.addActionListener(this);
688
1130
 
689
-                oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1131
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
690
1132
                 sphereButton.setToolTipText("Create sphere");
691
1133
                                 sphereButton.addActionListener(this);
692
1134
 
693
-                oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1135
+                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694
1136
                 coneButton.setToolTipText("Create cone");
695
1137
                                 coneButton.addActionListener(this);
696
1138
 
697
-                oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1139
+                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698
1140
                 torusButton.setToolTipText("Create torus");
699
1141
                                 torusButton.addActionListener(this);
700
1142
 
701
-                oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1143
+                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
702
1144
                 superButton.setToolTipText("Create superellipsoid");
703
1145
                                 superButton.addActionListener(this);
704
1146
 
..
..
@@ -709,60 +1151,74 @@
709
1151
                                     kleinButton.addActionListener(this);
710
1152
                 }
711
1153
                 
712
-                oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1154
+                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
713
1155
                 particlesButton.setToolTipText("Create particle system");
714
1156
                                particlesButton.addActionListener(this);
715
1157
 
716
-                oe.toolboxPanel.Return();
1158
+                oe.toolboxPanel.add(row1);
717
1159
                 
718
-                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);
719
1163
                 groupButton.setToolTipText("Create group");
720
1164
                                groupButton.addActionListener(this);
721
1165
 
722
-                oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1166
+                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
723
1167
                 compositeButton.setToolTipText("Create composite");
724
1168
                                compositeButton.addActionListener(this);
725
1169
 
726
-                oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
727
-                switchButton.setToolTipText("Create switch");
1170
+                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1171
+                switchButton.setToolTipText("Create item switcher");
728
1172
                                switchButton.addActionListener(this);
729
1173
 
730
-                oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1174
+                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
731
1175
                 loopButton.setToolTipText("Create loop");
732
1176
                                loopButton.addActionListener(this);
733
1177
 
734
-                oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1178
+                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
735
1179
                 textureButton.setToolTipText("Create texture");
736
1180
                                textureButton.addActionListener(this);
737
1181
 
738
-                oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1182
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
739
1183
                 overlayButton.setToolTipText("Create overlay");
740
1184
                                overlayButton.addActionListener(this);
741
1185
 
742
-                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);
743
1187
                 lightButton.setToolTipText("Create light");
744
1188
                                lightButton.addActionListener(this);
745
1189
 
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);
1201
+                
746
1202
                 // EDIT panel
747
-		editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748
-                editButton.setToolTipText("Edit selection");
1203
+		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1204
+                editButton.setToolTipText("Pin selection controls");
749
1205
 		editButton.addActionListener(this);
750
1206
 
751
-		editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
752
-                uneditButton.setToolTipText("Unedit selection");
1207
+		editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1208
+                uneditButton.setToolTipText("Unpin and remove selection controls");
753
1209
 		uneditButton.addActionListener(this);
754
1210
 
755
1211
 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
756
-                allParamsButton.setToolTipText("Edit all params");
1212
+                allParamsButton.setToolTipText("Show all controls");
757
1213
 		allParamsButton.addActionListener(this);
758
1214
 
759
-		editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
760
-                clearPanelButton.setToolTipText("Clear edit panel");
1215
+		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1216
+                clearPanelButton.setToolTipText("Clear all controls");
761
1217
 		clearPanelButton.addActionListener(this);
762
1218
 
763
-		editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
764
-                unselectButton.setToolTipText("Unselect");
765
-		unselectButton.addActionListener(this);
1219
+		//editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+                //unselectButton.setToolTipText("Unselect");
1221
+		//unselectButton.addActionListener(this);
766
1222
 
767
1223
 		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
768
1224
                 flashSelectionButton.setToolTipText("Highlight selection");
..
..
@@ -770,6 +1226,7 @@
770
1226
                 
771
1227
                 editCommandsPanel.preferredHeight = 1;
772
1228
                 
1229
+                SetPinStates(false);
773
1230
 //                oe.treePanel.add(commandsPanel);
774
1231
 //                oe.treePanel.Return();
775
1232
                 
..
..
@@ -796,9 +1253,12 @@
796
1253
 
797
1254
                 oe.treePanel.add(copyOptionsPanel);
798
1255
                 oe.treePanel.Return();
1256
+        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1257
+            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1258
+            sliderPane.preferredHeight = 1;
799
1259
                 
800
-//        mainPanel.setDividerLocation(0.5); //1.0);
801
-//        mainPanel.setResizeWeight(0.5);
1260
+//        mainPanel.setDividerLocation(0.1); //1.0);
1261
+        mainPanel.setResizeWeight(0.4);
802
1262
         
803
1263
 		//jList.addListSelectionListener(this);
804
1264
 		oe.jTree.addTreeSelectionListener(this);
..
..
@@ -806,7 +1266,7 @@
806
1266
 		//jTree.setEditable(true);
807
1267
 		oe.jTree.setDragEnabled(true);
808
1268
 		//jTree.setPreferredSize(new Dimension(10,10));
809
-		jSP.setPreferredSize(new Dimension(100,200));
1269
+		//jSP.setPreferredSize(new Dimension(100,200));
810
1270
 		
811
1271
                 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
812
1272
                 
..
..
@@ -818,7 +1278,7 @@
818
1278
 		dgr.addDragGestureListener(this);
819
1279
 		}catch(Exception e) {}
820
1280
 		*/
821
-        radio.layout = sevenButton;
1281
+        radio.layout = threeButton; // sixButton;
822
1282
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
823
1283
 	}
824
1284
         
..
..
@@ -843,14 +1303,18 @@
843
1303
                                 boxCB.addItemListener(this);
844
1304
                                 
845
1305
                 panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
846
-                zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
1306
+                zoomBoxCB.setToolTipText("Display only for wheel");
847
1307
                                 zoomBoxCB.addItemListener(this);
848
1308
 
849
1309
         if (true) // Globals.ADVANCED)
850
1310
         {
851
-                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
852
-                supportCB.setToolTipText("Enable rigging");
853
-                                supportCB.addItemListener(this);
1311
+//                panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
1312
+//                supportCB.setToolTipText("Enable rigging");
1313
+//                                supportCB.addItemListener(this);
1314
+
1315
+                panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
1316
+                freezeCB.setToolTipText("Fast moving camera");
1317
+                                freezeCB.addItemListener(this);
854
1318
 
855
1319
         //        panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
856
1320
         //                        localCB.addItemListener(this);
..
..
@@ -865,9 +1329,12 @@
865
1329
                 smoothCB.setToolTipText("Snapping delay");
866
1330
                                 smoothCB.addItemListener(this);
867
1331
 
868
-                panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
869
-                slowCB.setToolTipText("Smooth interpolation");
870
-                                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);
871
1338
                                 
872
1339
 //        	constraints.gridy += 1;
873
1340
 //                panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..
..
@@ -905,7 +1372,7 @@
905
1372
                                 oeilCB.addItemListener(this);
906
1373
 
907
1374
                 panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
908
-                shadowCB.setToolTipText("Compute shadows when live");
1375
+                shadowCB.setToolTipText("When live compute shadows");
909
1376
                                 shadowCB.addItemListener(this);
910
1377
 
911
1378
                 panel.Return();
..
..
@@ -914,12 +1381,12 @@
914
1381
                                 toggleTextureCB.addItemListener(this);
915
1382
                                 
916
1383
                 panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
917
-                toggleSwitchCB.setToolTipText("Use switch");
1384
+                toggleSwitchCB.setToolTipText("Choose a single item");
918
1385
                                 toggleSwitchCB.addItemListener(this);
919
1386
                                 
920
-                panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
921
-                autosaveCB.setToolTipText("Auto-save on structure change");
922
-                                autosaveCB.addItemListener(this);
1387
+                panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1388
+                autokeepCB.setToolTipText("On structure change");
1389
+                                autokeepCB.addItemListener(this);
923
1390
 
924
1391
                 panel.Return();
925
1392
             if (Globals.ADVANCED)
..
..
@@ -948,7 +1415,7 @@
948
1415
         {
949
1416
             cRadio radioButton = new cRadio(obj.name);
950
1417
             
951
-            // Patch to avoid bug with transparency.
1418
+            // June 2019. Patch to avoid bug with transparency.
952
1419
             radioButton.hadMaterial = obj.material != null;
953
1420
             if (!radioButton.hadMaterial)
954
1421
             {
..
..
@@ -956,7 +1423,7 @@
956
1423
             }
957
1424
             
958
1425
             radioButton.SetObject(obj);
959
-            radioButton.layout = sevenButton;
1426
+            radioButton.layout = threeButton; // sixButton;
960
1427
             radioButton.SetCamera(cameraView.renderCamera, false);
961
1428
             radioButton.addActionListener(this);
962
1429
             radioPanel.add(radioButton);
..
..
@@ -981,10 +1448,13 @@
981
1448
         cCheckBox localCB;
982
1449
         cCheckBox crowdCB;
983
1450
         cCheckBox smoothCB;
1451
+        cCheckBox minshaderCB;
1452
+        
984
1453
         cToggleButton fastCB;
985
1454
         cCheckBox slowCB;
986
1455
         cCheckBox boxCB;
987
1456
         cCheckBox zoomBoxCB;
1457
+        cCheckBox freezeCB;
988
1458
         //cToggleButton trackCB;
989
1459
         cCheckBox trackCB;
990
1460
         cCheckBox smoothfocusCB;
..
..
@@ -995,7 +1465,7 @@
995
1465
         
996
1466
         cCheckBox oeilCB;
997
1467
         cCheckBox shadowCB;
998
-        cCheckBox autosaveCB;
1468
+        cCheckBox autokeepCB;
999
1469
         cCheckBox lookAtCB;
1000
1470
         
1001
1471
 //        static int COLOR = 1;
..
..
@@ -1051,6 +1521,12 @@
1051
1521
                 cameraView.ToggleInertia();
1052
1522
         cameraView.repaint();
1053
1523
             }
1524
+            else if(e.getSource() == minshaderCB)
1525
+            {
1526
+                Globals.MINSHADER ^= true;
1527
+                cameraView.programInitialized = false;
1528
+                cameraView.repaint();
1529
+            }
1054
1530
             else if(e.getSource() == localCB)
1055
1531
             {
1056
1532
                 cameraView.ToggleLocal();
..
..
@@ -1103,9 +1579,13 @@
1103
1579
             {
1104
1580
                 Globals.COMPUTESHADOWWHENLIVE ^= true;
1105
1581
             }
1106
-            else if(e.getSource() == autosaveCB)
1582
+            else if(e.getSource() == freezeCB)
1107
1583
             {
1108
-                Globals.SAVEONMAKE ^= true;
1584
+                Globals.FREEZEONMOVE ^= true;
1585
+            }
1586
+            else if(e.getSource() == autokeepCB)
1587
+            {
1588
+                Globals.REPLACEONMAKE ^= true;
1109
1589
             }
1110
1590
             else if(e.getSource() == lookAtCB)
1111
1591
             {
..
..
@@ -1187,8 +1667,6 @@
1187
1667
                         }
1188
1668
                     }
1189
1669
                     
1190
-                    String string = (String) object;
1191
-                    
1192
1670
                     System.out.println("Transfer = " + object + "; drop : " + target);
1193
1671
 //                    if( object instanceof java.io.File[])
1194
1672
 //                    {
..
..
@@ -1196,6 +1674,8 @@
1196
1674
 //                        objEditor.DropFile((java.io.File[]) object, true);
1197
1675
 //                        return;
1198
1676
 //                    }
1677
+                    
1678
+                    String string = object.toString();
1199
1679
                     
1200
1680
                     // File path for Mac and Windows
1201
1681
                     if (string.charAt(0) == '/' || string.charAt(1) == ':')
..
..
@@ -1445,6 +1925,9 @@
1445
1925
 		animationItem.addItemListener(this);
1446
1926
                 animationItem.setState(Globals.ANIMATION);
1447
1927
                 
1928
+		menu.add(archiveItem = new MenuItem("Archive3D..."));
1929
+		archiveItem.addActionListener(this);
1930
+                
1448
1931
 		menu.add("-");
1449
1932
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1450
1933
 		parseverticesItem.addActionListener(this);
..
..
@@ -1457,6 +1940,8 @@
1457
1940
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1458
1941
 		reduce34MorphItem.addActionListener(this);
1459
1942
 		menu.add("-");
1943
+		menu.add(memoryItem = new MenuItem("Memory Usage"));
1944
+		memoryItem.addActionListener(this);
1460
1945
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1461
1946
 		computeAOItem.addActionListener(this);
1462
1947
                 
..
..
@@ -1465,8 +1950,6 @@
1465
1950
 		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1466
1951
 		mirrorItem.addActionListener(this);
1467
1952
 		menu.add("-");
1468
-		menu.add(memoryItem = new MenuItem("Memory Usage"));
1469
-		memoryItem.addActionListener(this);
1470
1953
 		menu.add(analyzeItem = new MenuItem("Analyze"));
1471
1954
 		analyzeItem.addActionListener(this);
1472
1955
 		menu.add(dumpItem = new MenuItem("Print"));
..
..
@@ -1614,6 +2097,30 @@
1614
2097
             
1615
2098
             makeSomething(shadow);
1616
2099
         }
2100
+
2101
+    private void ClearUnpinned()
2102
+    {
2103
+        //for (Object3D obj : listUI)
2104
+        for (int i=listUI.size(); --i>=0;)
2105
+        {
2106
+            Object3D obj = listUI.elementAt(i);
2107
+            if (!obj.pinned)
2108
+            {
2109
+                obj.CloseUI();
2110
+                listUI.remove(i);
2111
+            }
2112
+        }
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
+    }
1617
2124
         
1618
2125
     /**
1619
2126
      * applyExample
..
..
@@ -2042,6 +2549,23 @@
2042
2549
 		{
2043
2550
 			makeSomething(new Light());
2044
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
2045
2569
 		if (source == csgItem)
2046
2570
 		{
2047
2571
 			group(new CSG());
..
..
@@ -2093,25 +2617,25 @@
2093
2617
                         Composite csg = new GroupLeaf();
2094
2618
                         csg.count = 5;
2095
2619
 			group(csg);
2096
-                        Composite child = new cGroup();
2620
+                        Composite child = new cGroup("Branch");
2097
2621
                         csg.addChild(child);
2098
2622
                         child.addChild(csg);
2099
2623
 		} else
2100
2624
 		if (source == doubleItem)
2101
2625
 		{
2102
-                        Composite csg = new GroupLeaf();
2626
+                        Composite csg = new GroupLeaf("Fork");
2103
2627
                         csg.count = 5;
2104
2628
 			group(csg);
2105
-                        Composite child = new cGroup();
2629
+                        Composite child = new cGroup("Branch A");
2106
2630
                         csg.addChild(child);
2107
2631
                         child.addChild(csg);
2108
-                        child = new cGroup();
2632
+                        child = new cGroup("Branch B");
2109
2633
                         csg.addChild(child);
2110
2634
                         child.addChild(csg);
2111
2635
 		} else
2112
2636
 		if (source == tripleItem)
2113
2637
 		{
2114
-                        Composite csg = new GroupLeaf();
2638
+                        Composite csg = new GroupLeaf("Trident");
2115
2639
                         csg.count = 4;
2116
2640
 			group(csg);
2117
2641
                         Composite child = new cGroup();
..
..
@@ -2127,7 +2651,7 @@
2127
2651
 		if (source == computeAOItem)
2128
2652
 		{
2129
2653
                     Globals.drawMode = CameraPane.OCCLUSION;
2130
-                    Globals.theRenderer.repaint();
2654
+                    cameraView.repaint();
2131
2655
 		} else
2132
2656
 		if (source == recompileItem)
2133
2657
 		{
..
..
@@ -2142,7 +2666,7 @@
2142
2666
 		if (source == invariantsItem)
2143
2667
 		{
2144
2668
                     System.out.println("Invariants:");
2145
-                    Grafreed.grafreeD.universe.invariants();
2669
+                    Grafreed.grafreed.universe.invariants();
2146
2670
 		} else
2147
2671
 		if (source == memoryItem)
2148
2672
 		{
..
..
@@ -2173,17 +2697,40 @@
2173
2697
 		{
2174
2698
 			ToggleFullScreen();
2175
2699
 		} else
2176
-		if (source == undoButton)
2700
+		if (source == previousVersionButton)
2177
2701
 		{
2178
-			Undo();
2702
+                        // Go to previous version
2703
+			//if (!Undo())
2704
+                            //java.awt.Toolkit.getDefaultToolkit().beep();
2705
+			PreviousVersion();
2179
2706
 		} else
2180
-		if (source == redoButton)
2707
+		if (source == restoreButton)
2181
2708
 		{
2182
-			Redo();
2709
+                        // Restore current version
2710
+			Restore();
2711
+        //restoreButton.setEnabled(false);
2183
2712
 		} else
2184
-		if (source == saveButton)
2713
+		if (source == replaceButton)
2185
2714
 		{
2186
-			Save();
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
2727
+			if (!Save(true))
2728
+                            java.awt.Toolkit.getDefaultToolkit().beep();
2729
+		} else
2730
+		if (source == deleteVersionButton)
2731
+		{
2732
+                        // Delete a new version
2733
+                        DeleteVersion();
2187
2734
 		} else
2188
2735
 		if (source == oneStepButton)
2189
2736
 		{
..
..
@@ -2192,17 +2739,14 @@
2192
2739
 		} else
2193
2740
 		if (source == screenfitButton)
2194
2741
 		{
2195
-			//Reload(lastConverter, lastFilename, true);
2196
2742
                     ScreenFit();
2197
2743
 		} else
2198
2744
 		if (source == screenfitpointButton)
2199
2745
 		{
2200
-			//Reload(lastConverter, lastFilename, true);
2201
2746
                     ScreenFitPoint();
2202
2747
 		} else
2203
2748
 		if (source == snapobjectButton)
2204
2749
 		{
2205
-			//Reload(lastConverter, lastFilename, true);
2206
2750
                     SnapObject();
2207
2751
 		} else
2208
2752
 //		if (event.getSource() == recompileButton)
..
..
@@ -2241,11 +2785,11 @@
2241
2785
 		} else
2242
2786
 		if (source == undoItem)
2243
2787
 		{
2244
-			Undo();
2788
+			PreviousVersion();
2245
2789
 		} else
2246
2790
 		if (source == redoItem)
2247
2791
 		{
2248
-			Redo();
2792
+			NextVersion();
2249
2793
 		} else
2250
2794
 		if (source == duplicateItem)
2251
2795
 		{
..
..
@@ -2566,7 +3110,7 @@
2566
3110
 		{
2567
3111
 			StepAll();
2568
3112
 		} else
2569
-		if (source == clearItem) // || event.getSource() == clearButton)
3113
+		if (source == deleteItem) // || event.getSource() == clearButton)
2570
3114
 		{
2571
3115
 			//int indices[] = jList.getSelectedIndices();
2572
3116
 			//for (int i = indices.length - 1; i >= 0; i--)
..
..
@@ -2726,15 +3270,28 @@
2726
3270
 		} else
2727
3271
 		if (source == ungroupItem || source == ungroupButton)
2728
3272
 		{
2729
-			//ungroup();
3273
+                    boolean hasRoot = false;
3274
+                    
2730
3275
                     for (int i=0; i<group.selection.size(); i++)
2731
3276
                     {
2732
-                        Ungroup(group.selection.get(i));
3277
+                        if (group.selection.get(i) == group)
3278
+                        {
3279
+                            hasRoot = true;
3280
+                            break;
3281
+                        }
2733
3282
                     }
2734
3283
 
2735
-                    ClearSelection(false);
2736
-                    
2737
-                    refreshContents();
3284
+                    if (!hasRoot)
3285
+                    {
3286
+                        for (int i=0; i<group.selection.size(); i++)
3287
+                        {
3288
+                            Ungroup(group.selection.get(i));
3289
+                        }
3290
+
3291
+                        ClearSelection(false);
3292
+
3293
+                        refreshContents();
3294
+                    }
2738
3295
 		} else
2739
3296
 		if (source == genUVItem)
2740
3297
                 {
..
..
@@ -3035,7 +3592,7 @@
3035
3592
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3036
3593
 			{
3037
3594
 				obj = (Object3D)e.nextElement();
3038
-                                obj.SetBumpTexture(null);
3595
+                                obj.ResetBumpTexture();
3039
3596
 			}
3040
3597
 			
3041
3598
 			refreshContents();
..
..
@@ -3049,6 +3606,31 @@
3049
3606
                                 obj.SetBumpTexture(obj.GetPigmentTexture());
3050
3607
 			}
3051
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
+                
3052
3634
 			refreshContents();
3053
3635
 		} else
3054
3636
 		if (source == flashSelectionButton)
..
..
@@ -3152,8 +3734,8 @@
3152
3734
 //                    centralPanel.setVisible(true);
3153
3735
 //                    XYZPanel.setVisible(true);
3154
3736
                     bigThree.ClearUI();
3737
+                    bigThree.add(scenePanel);
3155
3738
                     bigThree.add(centralPanel);
3156
-                    bigThree.add(XYZPanel);
3157
3739
                     bigThree.FlushUI();
3158
3740
                     
3159
3741
                     cameraView.requestFocusInWindow();
..
..
@@ -3233,8 +3815,8 @@
3233
3815
 //                    centralPanel.setVisible(true);
3234
3816
 //                    XYZPanel.setVisible(false);
3235
3817
                     bigThree.ClearUI();
3236
-                    bigThree.add(scenePanel);
3237
3818
                     bigThree.add(centralPanel);
3819
+                    bigThree.add(scenePanel);
3238
3820
                     bigThree.FlushUI();
3239
3821
                     
3240
3822
                     cameraView.requestFocusInWindow();
..
..
@@ -3326,6 +3908,12 @@
3326
3908
 		} else
3327
3909
 		if (source == editItem || source == editButton)
3328
3910
 		{
3911
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3912
+			{
3913
+				Object3D child = (Object3D)e.nextElement();
3914
+                                child.pinned = true;
3915
+                        }
3916
+                        
3329
3917
 			EditSelection(false);
3330
3918
 		} else
3331
3919
 		if (source == uneditButton)
..
..
@@ -3334,9 +3922,10 @@
3334
3922
 			{
3335
3923
 				Object3D child = (Object3D)e.nextElement();
3336
3924
                                 if(child.editWindow != null)
3337
-                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3925
+                                child.pinned = false;
3338
3926
 				child.CloseUI();
3339
3927
                                 listUI.remove(child);
3928
+//                                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3340
3929
                                 
3341
3930
                                 //child.editWindow = null; // ???????????
3342
3931
 			}
..
..
@@ -3351,16 +3940,18 @@
3351
3940
                     //copy.ClearUI();
3352
3941
                     for (Object3D obj : listUI)
3353
3942
                     {
3943
+                        obj.pinned = false;
3354
3944
                         obj.CloseUI();
3355
3945
                     }
3356
3946
                     listUI.clear();
3947
+                    SetPinStates(group.selection.size() > 0);
3357
3948
                     refreshContents(true);
3358
3949
 		} else
3359
3950
 		if (source == allParamsButton)
3360
3951
 		{
3361
3952
                     assert(copy == group);
3362
3953
                     
3363
-                    objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3954
+                    //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3364
3955
                     
3365
3956
                     for (Object3D obj : listUI)
3366
3957
                     {
..
..
@@ -3409,6 +4000,9 @@
3409
4000
                     }
3410
4001
                     
3411
4002
                     copy = group;
4003
+                    
4004
+                    SetUndoStates();
4005
+
3412
4006
                     //Globals.theRenderer.object = group;
3413
4007
                     if(!useclient)
3414
4008
                     {
..
..
@@ -3435,6 +4029,14 @@
3435
4029
                         currentLayout = sevenButton;
3436
4030
                      */
3437
4031
                     radio.layout.doClick();
4032
+                    
4033
+                    ClearUnpinned();
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)
4039
+                        EditSelection(false);
3438
4040
                     keepparent = group.parent;
3439
4041
                     // PARENT = NULL or not???
3440
4042
                     //group.parent = null; // ROOT
..
..
@@ -3446,11 +4048,13 @@
3446
4048
                 } else if (event.getSource() == editCameraItem)
3447
4049
                 {
3448
4050
                     cameraView.ProtectCamera();
4051
+                    cameraView.requestFocusInWindow();
3449
4052
                     cameraView.repaint();
3450
4053
                     return;
3451
4054
                 } else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
3452
4055
                 {
3453
4056
                     cameraView.RevertCamera();
4057
+                    cameraView.requestFocusInWindow();
3454
4058
                     cameraView.repaint();
3455
4059
                     return;
3456
4060
         //        } else if (event.getSource() == textureButton)
..
..
@@ -4027,7 +4631,7 @@
4027
4631
                             
4028
4632
                             try
4029
4633
                             {
4030
-                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4634
+                                texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4031
4635
                             }
4032
4636
                             catch (Exception e)
4033
4637
                             {
..
..
@@ -4502,12 +5106,14 @@
4502
5106
 //		}
4503
5107
 //	}
4504
5108
 	
4505
-        static boolean allparams = true;
4506
-        
4507
-        static Vector<Object3D> listUI = new Vector<Object3D>();
4508
-        
4509
5109
 	void EditSelection(boolean newWindow)
4510
5110
 	{
5111
+                if (group.selection == null)
5112
+                {
5113
+                     EditElement(group, newWindow); // ? new
5114
+                     return;
5115
+                }
5116
+                
4511
5117
         //    aConstraints.gridy = 0;
4512
5118
 		for (int i=0; i<group.selection.size(); i++)
4513
5119
 		{
..
..
@@ -4518,12 +5124,7 @@
4518
5124
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4519
5125
                         if(elem != group || !newWindow)
4520
5126
                         {
4521
-                        //    if (!(elem instanceof Composite))
4522
-                        //        newWindow = false;
4523
-                            listUI.add(elem);
4524
-                            elem.openEditWindow(this, newWindow); //, false);
4525
-                            System.out.println("edit : " + elem);
4526
-                            elem.editWindow.refreshContents(true); // ? new
5127
+                            EditElement(elem, newWindow); // ? new
4527
5128
                         }
4528
5129
 		}
4529
5130
 	}
..
..
@@ -4586,9 +5187,7 @@
4586
5187
 		
4587
5188
 		freezemodel = false;
4588
5189
 	}
4589
-	
4590
-        boolean flashIt = true;
4591
-        
5190
+	        
4592
5191
 	public void valueChanged(TreeSelectionEvent e)
4593
5192
 	//public boolean handleEvent(Event event)
4594
5193
 	{
..
..
@@ -4598,7 +5197,8 @@
4598
5197
 		//new Exception().printStackTrace();
4599
5198
 
4600
5199
 		freezemodel = true;
4601
-		
5200
+        ClearUnpinned();
5201
+                    
4602
5202
 		/**/
4603
5203
 		//switch (event.id)
4604
5204
 		{
..
..
@@ -4631,7 +5231,7 @@
4631
5231
 			if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4632
5232
                             // a camera
4633
5233
                         {
4634
-                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
5234
+                            if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4635
5235
                             {
4636
5236
                                 CameraPane.camerachangeframe = 0; // don't refuse it
4637
5237
                                 Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..
..
@@ -4640,6 +5240,13 @@
4640
5240
                          //   Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4641
5241
                         }
4642
5242
                             
5243
+                        if (tps != null && tps.length == 1)
5244
+                        {
5245
+                            EditSelection(false);
5246
+                        }
5247
+                        
5248
+                        SetPinStates(tps != null && tps.length > 0);
5249
+                        
4643
5250
 			refreshContents();
4644
5251
 			//return true;
4645
5252
 		}
..
..
@@ -4649,10 +5256,20 @@
4649
5256
 		freezemodel = false;
4650
5257
 	}
4651
5258
         
5259
+        void SetPinStates(boolean enabled)
5260
+        {
5261
+            editButton.setEnabled(enabled);
5262
+            uneditButton.setEnabled(enabled);
5263
+            //unselectButton.setEnabled(enabled);
5264
+            flashSelectionButton.setEnabled(enabled);
5265
+            
5266
+            clearPanelButton.setEnabled(!listUI.isEmpty());
5267
+        }
5268
+
4652
5269
         void refreshContents(boolean cp)
4653
5270
         {
4654
-            if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4655
-            if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
5271
+            //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5272
+            if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4656
5273
             {
4657
5274
                 objEditor.ClearInfo(); // .GetMaterial());
4658
5275
 
..
..
@@ -4751,8 +5368,8 @@
4751
5368
                 
4752
5369
 		if (cut)
4753
5370
 		{
4754
-        if (Globals.SAVEONMAKE)
4755
-                    Save();
5371
+//        if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5372
+//                    Save();
4756
5373
 			//int indices[] = jList.getSelectedIndices();
4757
5374
 			//for (int i = indices.length - 1; i >= 0; i--)
4758
5375
 			//jList.remove(indices[i]);
..
..
@@ -4855,6 +5472,10 @@
4855
5472
 	
4856
5473
 	void paste(boolean expand)
4857
5474
 	{
5475
+        if (Globals.REPLACEONMAKE)
5476
+            Save();
5477
+        boolean keep = Globals.REPLACEONMAKE;
5478
+        Globals.REPLACEONMAKE = false;
4858
5479
 	//	if (GrafreeD.clipboard == null)
4859
5480
 	//		return;
4860
5481
 		boolean first = true;
..
..
@@ -4914,6 +5535,7 @@
4914
5535
                         Grafreed.clipboard.get(0).parent = keepparent;
4915
5536
 		}
4916
5537
 		
5538
+        Globals.REPLACEONMAKE = keep;
4917
5539
 		ResetModel();
4918
5540
 		refreshContents();
4919
5541
 	}
..
..
@@ -5049,6 +5671,10 @@
5049
5671
         
5050
5672
 	void group(Object3D csg, boolean grab)
5051
5673
 	{
5674
+        if (Globals.REPLACEONMAKE)
5675
+            Save();
5676
+        boolean keep = Globals.REPLACEONMAKE;
5677
+        Globals.REPLACEONMAKE = false;
5052
5678
 		if (//false) // why??
5053
5679
                     !group.selection.isEmpty())
5054
5680
                 {
..
..
@@ -5162,10 +5788,15 @@
5162
5788
                 //node.add(csg);
5163
5789
 		//makeSomething(node);
5164
5790
 		makeSomething(csg);
5791
+        Globals.REPLACEONMAKE = keep;
5165
5792
 	}
5166
5793
 	
5167
5794
         void Ungroup(Object3D g)
5168
5795
         {
5796
+        if (Globals.REPLACEONMAKE)
5797
+            Save();
5798
+        boolean keep = Globals.REPLACEONMAKE;
5799
+        Globals.REPLACEONMAKE = false;
5169
5800
             if (g instanceof HiddenObject)
5170
5801
             {
5171
5802
                 HiddenObject h = (HiddenObject) g;
..
..
@@ -5182,6 +5813,7 @@
5182
5813
                     objEditor.makeSomething(g.get(i), false);
5183
5814
                 }
5184
5815
             }
5816
+        Globals.REPLACEONMAKE = keep;
5185
5817
         }
5186
5818
         
5187
5819
 	void ungroup()
..
..
@@ -5472,12 +6104,6 @@
5472
6104
 	
5473
6105
 	cButton restoreCameraButton;
5474
6106
         
5475
-	cButton minButton;
5476
-	cButton maxButton;
5477
-	cButton fullButton;
5478
-	cButton undoButton;
5479
-	cButton redoButton;
5480
-	cButton saveButton;
5481
6107
 	cButton oneStepButton;
5482
6108
         
5483
6109
         cButton groupButton;
..
..
@@ -5486,6 +6112,22 @@
5486
6112
         cButton switchButton;
5487
6113
         cButton loopButton;
5488
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;
5489
6131
         
5490
6132
         cButton gridButton;
5491
6133
         cButton boxButton;
..
..
@@ -5550,7 +6192,7 @@
5550
6192
 	private MenuItem pasteLinkItem;
5551
6193
 	private MenuItem pasteCloneItem;
5552
6194
 	private MenuItem pasteExpandItem;
5553
-	private MenuItem clearItem;
6195
+	private MenuItem deleteItem;
5554
6196
 	private MenuItem clearAllItem;
5555
6197
 	private MenuItem genUVItem;
5556
6198
 	private MenuItem genNormalsMESHItem;
..
..
@@ -5634,6 +6276,8 @@
5634
6276
 	private MenuItem attachBumpItem;
5635
6277
 	private MenuItem detachBumpItem;
5636
6278
 	private MenuItem pigmentBumpItem;
6279
+	private MenuItem embedTexturesItem;
6280
+	private MenuItem deEmbedTexturesItem;
5637
6281
 
5638
6282
 	private MenuItem particleItem;
5639
6283
 	private MenuItem ragdollItem;