Save skybox.

Normand Briere

2019-07-30 475f8cbdbd96fdbf8f5b216ffebb31a51f25c2f9

 GroupEditor.java
..
..
@@ -23,6 +23,240 @@
23
23
         DragGestureListener, DragSourceListener, DropTargetListener,
24
24
         ItemListener // ListSelectionListener
25
25
 {
26
+
27
+    public void AddSkyboxButton(String f, String s, cGridBag row)
28
+    {
29
+        cButton skyboxButton;
30
+        final String path = "cubemaps/" + f + "-skyboxes/" + s;
31
+        row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
32
+        //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
33
+        skyboxButton.setToolTipText(s);
34
+        skyboxButton.addActionListener(new ActionListener()
35
+        {
36
+                @Override
37
+                public void actionPerformed(ActionEvent e)
38
+                {
39
+                    ChangeSkybox(path);
40
+                }
41
+        });
42
+    }
43
+
44
+    public void AddSkyboxTab0(JTabbedPane skyboxpanel)
45
+    {
46
+        cGridBag tab0 = new cGridBag().setVertical(true);
47
+        
48
+        tab0.setName("Urban");
49
+        skyboxpanel.add(tab0);
50
+
51
+        cGridBag row0 = new cGridBag();
52
+        cGridBag row1 = new cGridBag();
53
+        cGridBag row2 = new cGridBag();
54
+        cGridBag row3 = new cGridBag();
55
+        cGridBag row4 = new cGridBag();
56
+        cGridBag row5 = new cGridBag();
57
+        cGridBag row6 = new cGridBag();
58
+        
59
+        AddSkyboxButton("default", "rgb", row0);
60
+        //AddSkyboxButton("default", "cornell", row0);
61
+        AddSkyboxButton("penguins", "dust", row0);
62
+        AddSkyboxButton("penguins", "tropic", row0);
63
+        AddSkyboxButton("default", "skycube", row0);
64
+
65
+        AddSkyboxButton("default", "uffizi", row1);
66
+        AddSkyboxButton("bridge", "Bridge", row1);
67
+        AddSkyboxButton("bridge", "Bridge2", row1);
68
+        AddSkyboxButton("urban", "GamlaStan2", row1);
69
+        
70
+        AddSkyboxButton("urban", "Parliament", row2);
71
+        AddSkyboxButton("urban", "Roundabout", row2);
72
+        AddSkyboxButton("urban", "SaintLazarusChurch", row2);
73
+        AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
74
+        
75
+        AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
76
+        AddSkyboxButton("urban", "UnionSquare", row3);
77
+        AddSkyboxButton("urban", "Medborgarplatsen", row3);
78
+        AddSkyboxButton("park", "BerzeliiPark", row3);
79
+        
80
+        AddSkyboxButton("park", "Buddha", row4);
81
+        AddSkyboxButton("park", "CNTower2", row4);
82
+        AddSkyboxButton("park", "NiagaraFalls1", row4);
83
+        AddSkyboxButton("park", "NiagaraFalls3", row4);
84
+        
85
+        AddSkyboxButton("park", "Park", row5);
86
+        AddSkyboxButton("park", "Pond", row5);
87
+        AddSkyboxButton("park", "Skansen", row5);
88
+        AddSkyboxButton("park", "Skansen2", row5);
89
+        
90
+        AddSkyboxButton("park", "Skansen3", row6);
91
+        AddSkyboxButton("park", "Skansen4", row6);
92
+        AddSkyboxButton("park", "Skansen5", row6);
93
+        AddSkyboxButton("park", "Stairs", row6);
94
+        
95
+        tab0.add(row0);
96
+        tab0.add(row1);
97
+        tab0.add(row2);
98
+        tab0.add(row3);
99
+        tab0.add(row4);
100
+        tab0.add(row5);
101
+        tab0.add(row6);
102
+        
103
+        for (int i=5; --i>=0;)
104
+        {
105
+            //oe.toolboxPanel.Return();
106
+            //tab0.add(new cGridBag());
107
+        }
108
+    }
109
+
110
+    public void AddSkyboxTab1(JTabbedPane skyboxpanel)
111
+    {
112
+        cGridBag tab0 = new cGridBag().setVertical(true);
113
+        
114
+        tab0.setName("Nature");
115
+        skyboxpanel.add(tab0);
116
+
117
+        cGridBag row0 = new cGridBag();
118
+        cGridBag row1 = new cGridBag();
119
+        cGridBag row2 = new cGridBag();
120
+        cGridBag row3 = new cGridBag();
121
+        cGridBag row4 = new cGridBag();
122
+        cGridBag row5 = new cGridBag();
123
+        cGridBag row6 = new cGridBag();
124
+        
125
+        AddSkyboxButton("beach", "HeartInTheSand", row0);
126
+        AddSkyboxButton("beach", "LarnacaBeach", row0);
127
+        AddSkyboxButton("beach", "PalmTrees", row0);
128
+        AddSkyboxButton("beach", "Tenerife", row0);
129
+        
130
+        AddSkyboxButton("beach", "Tenerife2", row1);
131
+        AddSkyboxButton("beach", "Tenerife3", row1);
132
+        AddSkyboxButton("field", "FishPond", row1);
133
+        AddSkyboxButton("field", "Footballfield", row1);
134
+
135
+        AddSkyboxButton("field", "Meadow", row2);
136
+        AddSkyboxButton("field", "Sorsele", row2);
137
+        AddSkyboxButton("field", "Sorsele2", row2);
138
+        AddSkyboxButton("field", "Sorsele3", row2);
139
+        
140
+        AddSkyboxButton("forest", "Brudslojan", row3);
141
+        AddSkyboxButton("forest", "Langholmen2", row3);
142
+        AddSkyboxButton("forest", "Plants", row3);
143
+        AddSkyboxButton("mountain", "Maskonaive", row3);
144
+        
145
+        AddSkyboxButton("mountain", "Maskonaive2", row4);
146
+        AddSkyboxButton("mountain", "Maskonaive3", row4);
147
+        AddSkyboxButton("mountain", "Ryfjallet", row4);
148
+        AddSkyboxButton("mountain", "Teide", row4);
149
+        AddSkyboxButton("park", "Tantolunden4", row4);
150
+        
151
+        AddSkyboxButton("penguins", "wrath", row5);
152
+        AddSkyboxButton("penguins", "yonder", row5);
153
+        AddSkyboxButton("rocky", "Langholmen", row5);
154
+        AddSkyboxButton("rocky", "Skinnarviksberget", row5);
155
+        AddSkyboxButton("rocky", "Tantolunden6", row5);
156
+        
157
+        AddSkyboxButton("default", "CloudyHills", row6);
158
+        AddSkyboxButton("daz", "Autumn", row6);
159
+        AddSkyboxButton("daz", "Greenlands", row6);
160
+        AddSkyboxButton("daz", "MountainTrail", row6);
161
+        AddSkyboxButton("daz", "Oasis", row6);
162
+        /*
163
+Autumn
164
+Greenlands
165
+MountainTrail
166
+Oasis
167
+TheRock
168
+TopOfTheWorld
169
+Winter
170
+         */
171
+        
172
+        tab0.add(row0);
173
+        tab0.add(row1);
174
+        tab0.add(row2);
175
+        tab0.add(row3);
176
+        tab0.add(row4);
177
+        tab0.add(row5);
178
+        tab0.add(row6);
179
+        
180
+        for (int i=5; --i>=0;)
181
+        {
182
+            //oe.toolboxPanel.Return();
183
+            //tab0.add(new cGridBag());
184
+        }
185
+    }
186
+    
187
+    public void AddSkyboxTab2(JTabbedPane skyboxpanel)
188
+    {
189
+        cGridBag tab0 = new cGridBag().setVertical(true);
190
+        
191
+        tab0.setName("Night");
192
+        skyboxpanel.add(tab0);
193
+
194
+        cGridBag row0 = new cGridBag();
195
+        cGridBag row1 = new cGridBag();
196
+        cGridBag row2 = new cGridBag();
197
+        cGridBag row3 = new cGridBag();
198
+        cGridBag row4 = new cGridBag();
199
+        cGridBag row5 = new cGridBag();
200
+        cGridBag row6 = new cGridBag();
201
+        
202
+        AddSkyboxButton("night", "NightPath", row0);
203
+        AddSkyboxButton("night", "PondNight", row0);
204
+        AddSkyboxButton("night", "Powerlines", row0);
205
+        AddSkyboxButton("night", "SwedishRoyalCastle", row0);
206
+        
207
+        AddSkyboxButton("urban", "CNTower", row1);
208
+        AddSkyboxButton("bridge", "ArstaBridge", row1);
209
+        AddSkyboxButton("rocky", "Riddarfjarden", row1);
210
+        AddSkyboxButton("penguins", "sleepyhollow", row1);
211
+        
212
+        AddSkyboxButton("penguins", "kenon_star", row2);
213
+        AddSkyboxButton("indoors", "DallasW", row2);
214
+        AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
215
+        AddSkyboxButton("indoors", "Vasa", row2);
216
+        
217
+        AddSkyboxButton("winter", "Backyard", row3);
218
+        AddSkyboxButton("winter", "Creek", row3);
219
+        AddSkyboxButton("winter", "FootballField3", row3);
220
+        AddSkyboxButton("winter", "Forest", row3);
221
+        
222
+        AddSkyboxButton("winter", "HornstullsStrand2", row4);
223
+        AddSkyboxButton("winter", "House", row4);
224
+        AddSkyboxButton("winter", "IceLake", row4);
225
+        AddSkyboxButton("winter", "IceRiver", row4);
226
+        
227
+        AddSkyboxButton("winter", "Park3", row5);
228
+        AddSkyboxButton("winter", "PondWinter", row5);
229
+        AddSkyboxButton("winter", "Tantolunden5", row5);
230
+        AddSkyboxButton("winter", "Vindelalven", row5);
231
+        
232
+        AddSkyboxButton("daz", "TheRock", row6);
233
+        AddSkyboxButton("daz", "TopOfTheWorld", row6);
234
+        AddSkyboxButton("daz", "Winter", row6);
235
+        AddSkyboxButton("penguins", "desertdawn", row6);
236
+        
237
+        tab0.add(row0);
238
+        tab0.add(row1);
239
+        tab0.add(row2);
240
+        tab0.add(row3);
241
+        tab0.add(row4);
242
+        tab0.add(row5);
243
+        tab0.add(row6);
244
+        
245
+        for (int i=5; --i>=0;)
246
+        {
247
+            //oe.toolboxPanel.Return();
248
+            //tab0.add(new cGridBag());
249
+        }
250
+    }
251
+    
252
+    public void ChangeSkybox(String name)
253
+    {
254
+        //cameraView.envyoff = false;
255
+        group.skyboxname = name;
256
+        group.skyboxext = "jpg";
257
+        cameraView.repaint();
258
+    }
259
+    
26
260
     //ObjEditor objEditor;
27
261
 	public void closeUI2()
28
262
 	{
..
..
@@ -60,6 +294,12 @@
60
294
 		this.copy = this.group = group;
61
295
 		//selectees = this.group.selectees;
62
296
 		
297
+        if (copy.versions == null)
298
+        {
299
+            copy.versions = new byte[100][];
300
+            copy.versionindex = -1;
301
+        }
302
+        
63
303
 		if(ui)
64
304
                     SetupUI(objEditor);
65
305
 	}
..
..
@@ -80,10 +320,22 @@
80
320
 		SetupViews(objEditor);
81
321
                 
82
322
                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
323
+                
324
+        if (copy.versions == null)
325
+        {
326
+            copy.versions = new byte[100][];
327
+            copy.versionindex = -1;
328
+            
329
+            Save(true);
330
+        }
83
331
 	}
84
332
 
85
333
     void CloneSelection(boolean supports)
86
334
     {
335
+        if (Globals.REPLACEONMAKE)
336
+            Save();
337
+        boolean keep = Globals.REPLACEONMAKE;
338
+        Globals.REPLACEONMAKE = false;
87
339
         //   Object3D keep = GrafreeD.clipboard;
88
340
            //Object3D obj;
89
341
            for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..
..
@@ -94,6 +346,7 @@
94
346
                
95
347
                makeSomething(clone, i==group.selection.size()-1);
96
348
            }
349
+        Globals.REPLACEONMAKE = keep;
97
350
     }
98
351
 
99
352
     void CloneClipboard(boolean supports)
..
..
@@ -189,8 +442,8 @@
189
442
 //		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
190
443
 //		pasteExpandItem.addActionListener(this);
191
444
 		menu.add("-");
192
-		clearItem = menu.add(new MenuItem("Clear"));
193
-		clearItem.addActionListener(this);
445
+		deleteItem = menu.add(new MenuItem("Delete"));
446
+		deleteItem.addActionListener(this);
194
447
                 
195
448
         if (Globals.ADVANCED)
196
449
         {
..
..
@@ -380,13 +633,14 @@
380
633
 		shadowYItem.addActionListener(this);
381
634
                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382
635
 		shadowZItem.addActionListener(this);
636
+		attributeItem = menu.add(new MenuItem("Attribute"));
637
+		attributeItem.addActionListener(this);
638
+                
383
639
         if (Globals.ADVANCED)
384
640
         {
385
641
 		menu.add("-");
386
642
 		linkerItem = menu.add(new MenuItem("Linker"));
387
643
 		linkerItem.addActionListener(this);
388
-		attributeItem = menu.add(new MenuItem("Attribute"));
389
-		attributeItem.addActionListener(this);
390
644
 		templateItem = menu.add(new MenuItem("Template"));
391
645
 		templateItem.addActionListener(this);
392
646
 		pointflowItem = menu.add(new MenuItem("Point Flow"));
..
..
@@ -415,7 +669,7 @@
415
669
 		genNormalsMESHItem.addActionListener(this);
416
670
         if (Globals.ADVANCED)
417
671
         {
418
-		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
672
+		genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
419
673
 		genNormalsMINEItem.addActionListener(this);
420
674
         }
421
675
 		stripifyItem = menu.add(new MenuItem("Stripify"));
..
..
@@ -508,10 +762,15 @@
508
762
 		attachBumpItem.addActionListener(this);
509
763
 		pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
510
764
 		pigmentBumpItem.addActionListener(this);
765
+                //embedTexturesItem
511
766
 		detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
512
767
 		detachPigmentItem.addActionListener(this);
513
768
 		detachBumpItem = menu.add(new MenuItem("Detach Bump"));
514
769
 		detachBumpItem.addActionListener(this);
770
+		embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
771
+		embedTexturesItem.addActionListener(this);
772
+		deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
773
+		deEmbedTexturesItem.addActionListener(this);
515
774
 		menu.add("-");
516
775
 		sortbysizeItem = menu.add(new MenuItem("Sort by size"));
517
776
 		sortbysizeItem.addActionListener(this);
..
..
@@ -538,6 +797,7 @@
538
797
 		buildToolsMenu(menu);
539
798
 	}
540
799
 	
800
+        
541
801
 	void SetupUI2(ObjEditor oe)
542
802
 	{
543
803
             // June 2019
..
..
@@ -582,7 +842,7 @@
582
842
          */
583
843
                 cGridBag copyOptionsPanel = new cGridBag();
584
844
                                         
585
-                copyOptionsPanel.preferredHeight = 1;
845
+                copyOptionsPanel.preferredHeight = 2;
586
846
                 
587
847
                 //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
588
848
                 
..
..
@@ -601,42 +861,55 @@
601
861
                 fullButton.setToolTipText("Full-screen window");
602
862
 		fullButton.addActionListener(this);
603
863
                 
864
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
865
+                screenfitButton.setToolTipText("Screen fit");
866
+		screenfitButton.addActionListener(this);
867
+
604
868
 		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605
869
                 restoreCameraButton.setToolTipText("Restore viewpoint");
606
870
 		restoreCameraButton.addActionListener(this);
607
871
                 
872
+		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
873
+                saveButton.setToolTipText("New version");
874
+		saveButton.addActionListener(this);
875
+                                                
608
876
 		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609
-                undoButton.setToolTipText("Undo changes");
877
+                undoButton.setToolTipText("Previous version");
610
878
 		undoButton.addActionListener(this);
611
879
                 undoButton.setEnabled(false);
612
880
                 
881
+                cGridBag updown = new cGridBag().setVertical(true);
882
+		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
883
+                restoreButton.setToolTipText("Restore current");
884
+		restoreButton.addActionListener(this);
885
+                restoreButton.setEnabled(false);
886
+                
887
+		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
888
+                replaceButton.setToolTipText("Replace current");
889
+		replaceButton.addActionListener(this);
890
+                replaceButton.setEnabled(false);
891
+                
892
+                copyOptionsPanel.add(updown);
893
+                
613
894
 		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
614
-                redoButton.setToolTipText("Redo changes");
895
+                redoButton.setToolTipText("Next version");
615
896
 		redoButton.addActionListener(this);
616
897
                 redoButton.setEnabled(false);
617
898
                 
618
-		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
619
-                saveButton.setToolTipText("Save changes");
620
-		saveButton.addActionListener(this);
621
-                
622
-                copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
899
+                oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
623
900
                 liveCB.setToolTipText("Enable animation");
624
901
                                 liveCB.addItemListener(this);
625
902
 
626
-		copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
903
+		oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
627
904
                 oneStepButton.setToolTipText("Animate one step forward");
628
905
 		oneStepButton.addActionListener(this);
629
906
                 
630
-                copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
907
+                oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
631
908
                 fastCB.setToolTipText("Fast mode");
632
909
                                 fastCB.addItemListener(this);
633
910
                                 
634
911
                 //oe.toolboxPanel.Return();
635
912
                 
636
-		copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637
-                screenfitButton.setToolTipText("Screen fit");
638
-		screenfitButton.addActionListener(this);
639
-
640
913
 //                copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
641
914
 //                trackCB.setToolTipText("Enable tracking");
642
915
 //                                trackCB.addItemListener(this);
..
..
@@ -649,31 +922,32 @@
649
922
                         oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650
923
                         snapobjectButton.addActionListener(this);
651
924
                         snapobjectButton.setToolTipText("Snap Object");
925
+                        
926
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
927
+		fourButton.addActionListener(this);
928
+                fourButton.setToolTipText("Show control panel only");
652
929
                 }
653
930
 
654
931
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
655
932
                 
656
-		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
657
-                twoButton.setToolTipText("Show center view only");
933
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
934
+                twoButton.setToolTipText("Show 3D view only");
658
935
 		twoButton.addActionListener(this);
659
936
                 this.fullscreenLayout = twoButton;
660
937
                 
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");
938
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939
+                threeButton.setToolTipText("Show controls and 3D view");
669
940
 		threeButton.addActionListener(this);
670
-		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
671
-                sevenButton.setToolTipText("3-column layout");
672
-		sevenButton.addActionListener(this);
941
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
942
+                sixButton.setToolTipText("Show 3D view and controls");
943
+		sixButton.addActionListener(this);
944
+//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
945
+//                sevenButton.setToolTipText("3-column layout");
946
+//		sevenButton.addActionListener(this);
673
947
                 //
674
948
 
675
-		oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
676
-                rootButton.setToolTipText("Edit selection in new tab");
949
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
950
+                rootButton.setToolTipText("Open selection in new tab");
677
951
 		rootButton.addActionListener(this);
678
952
 
679
953
                 oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -682,28 +956,30 @@
682
956
 		//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
683
957
 		//clearButton.addActionListener(this);
684
958
 
959
+                cGridBag row1 = new cGridBag();
960
+                
685
961
                 // INSERT
686
-                oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
962
+                row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
687
963
                 gridButton.setToolTipText("Create grid");
688
964
                                 gridButton.addActionListener(this);
689
965
 
690
-                oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
966
+                row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691
967
                 boxButton.setToolTipText("Create box");
692
968
                                 boxButton.addActionListener(this);
693
969
 
694
-                oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
970
+                row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
695
971
                 sphereButton.setToolTipText("Create sphere");
696
972
                                 sphereButton.addActionListener(this);
697
973
 
698
-                oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
974
+                row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
699
975
                 coneButton.setToolTipText("Create cone");
700
976
                                 coneButton.addActionListener(this);
701
977
 
702
-                oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
978
+                row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703
979
                 torusButton.setToolTipText("Create torus");
704
980
                                 torusButton.addActionListener(this);
705
981
 
706
-                oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
982
+                row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
707
983
                 superButton.setToolTipText("Create superellipsoid");
708
984
                                 superButton.addActionListener(this);
709
985
 
..
..
@@ -714,51 +990,56 @@
714
990
                                     kleinButton.addActionListener(this);
715
991
                 }
716
992
                 
717
-                oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
993
+                row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
718
994
                 particlesButton.setToolTipText("Create particle system");
719
995
                                particlesButton.addActionListener(this);
720
996
 
721
-                oe.toolboxPanel.Return();
997
+                oe.toolboxPanel.add(row1);
722
998
                 
723
-                oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
999
+                cGridBag row2 = new cGridBag();
1000
+                
1001
+                row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
724
1002
                 groupButton.setToolTipText("Create group");
725
1003
                                groupButton.addActionListener(this);
726
1004
 
727
-                oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1005
+                row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
728
1006
                 compositeButton.setToolTipText("Create composite");
729
1007
                                compositeButton.addActionListener(this);
730
1008
 
731
-                oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1009
+                row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
732
1010
                 switchButton.setToolTipText("Create item switcher");
733
1011
                                switchButton.addActionListener(this);
734
1012
 
735
-                oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1013
+                row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
736
1014
                 loopButton.setToolTipText("Create loop");
737
1015
                                loopButton.addActionListener(this);
738
1016
 
739
-                oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1017
+                row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
740
1018
                 textureButton.setToolTipText("Create texture");
741
1019
                                textureButton.addActionListener(this);
742
1020
 
743
-                oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1021
+                row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
744
1022
                 overlayButton.setToolTipText("Create overlay");
745
1023
                                overlayButton.addActionListener(this);
746
1024
 
747
-                oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1025
+                row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
748
1026
                 lightButton.setToolTipText("Create light");
749
1027
                                lightButton.addActionListener(this);
750
1028
 
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
-                }
1029
+                oe.toolboxPanel.add(row2);
1030
+                
1031
+                // ENVYMAPS
1032
+                cGridBag skyboxpane = new cGridBag();
1033
+                skyboxpane.preferredHeight = 100;
1034
+                
1035
+                oe.toolboxPanel.add(skyboxpane);
1036
+                
1037
+                JTabbedPane skyboxpanel = new JTabbedPane();
1038
+                skyboxpane.add(skyboxpanel);
1039
+                
1040
+                AddSkyboxTab0(skyboxpanel);
1041
+                AddSkyboxTab1(skyboxpanel);
1042
+                AddSkyboxTab2(skyboxpanel);
762
1043
                 
763
1044
                 // EDIT panel
764
1045
 		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -814,9 +1095,12 @@
814
1095
 
815
1096
                 oe.treePanel.add(copyOptionsPanel);
816
1097
                 oe.treePanel.Return();
1098
+        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1099
+            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1100
+            sliderPane.preferredHeight = 1;
817
1101
                 
818
-//        mainPanel.setDividerLocation(0.5); //1.0);
819
-//        mainPanel.setResizeWeight(0.5);
1102
+//        mainPanel.setDividerLocation(0.1); //1.0);
1103
+        mainPanel.setResizeWeight(0.4);
820
1104
         
821
1105
 		//jList.addListSelectionListener(this);
822
1106
 		oe.jTree.addTreeSelectionListener(this);
..
..
@@ -824,7 +1108,7 @@
824
1108
 		//jTree.setEditable(true);
825
1109
 		oe.jTree.setDragEnabled(true);
826
1110
 		//jTree.setPreferredSize(new Dimension(10,10));
827
-		jSP.setPreferredSize(new Dimension(100,200));
1111
+		//jSP.setPreferredSize(new Dimension(100,200));
828
1112
 		
829
1113
                 oe.jTree.setCellRenderer(new cTreeModel.Renderer());
830
1114
                 
..
..
@@ -836,7 +1120,7 @@
836
1120
 		dgr.addDragGestureListener(this);
837
1121
 		}catch(Exception e) {}
838
1122
 		*/
839
-        radio.layout = sevenButton;
1123
+        radio.layout = sixButton; // sevenButton;
840
1124
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
841
1125
 	}
842
1126
         
..
..
@@ -939,9 +1223,9 @@
939
1223
                 toggleSwitchCB.setToolTipText("Choose a single item");
940
1224
                                 toggleSwitchCB.addItemListener(this);
941
1225
                                 
942
-                panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
943
-                autosaveCB.setToolTipText("On structure change");
944
-                                autosaveCB.addItemListener(this);
1226
+                panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
1227
+                autokeepCB.setToolTipText("On structure change");
1228
+                                autokeepCB.addItemListener(this);
945
1229
 
946
1230
                 panel.Return();
947
1231
             if (Globals.ADVANCED)
..
..
@@ -970,7 +1254,7 @@
970
1254
         {
971
1255
             cRadio radioButton = new cRadio(obj.name);
972
1256
             
973
-            // Patch to avoid bug with transparency.
1257
+            // June 2019. Patch to avoid bug with transparency.
974
1258
             radioButton.hadMaterial = obj.material != null;
975
1259
             if (!radioButton.hadMaterial)
976
1260
             {
..
..
@@ -978,7 +1262,7 @@
978
1262
             }
979
1263
             
980
1264
             radioButton.SetObject(obj);
981
-            radioButton.layout = sevenButton;
1265
+            radioButton.layout = sixButton; // sevenButton;
982
1266
             radioButton.SetCamera(cameraView.renderCamera, false);
983
1267
             radioButton.addActionListener(this);
984
1268
             radioPanel.add(radioButton);
..
..
@@ -1018,7 +1302,7 @@
1018
1302
         
1019
1303
         cCheckBox oeilCB;
1020
1304
         cCheckBox shadowCB;
1021
-        cCheckBox autosaveCB;
1305
+        cCheckBox autokeepCB;
1022
1306
         cCheckBox lookAtCB;
1023
1307
         
1024
1308
 //        static int COLOR = 1;
..
..
@@ -1130,9 +1414,9 @@
1130
1414
             {
1131
1415
                 Globals.FREEZEONMOVE ^= true;
1132
1416
             }
1133
-            else if(e.getSource() == autosaveCB)
1417
+            else if(e.getSource() == autokeepCB)
1134
1418
             {
1135
-                Globals.SAVEONMAKE ^= true;
1419
+                Globals.REPLACEONMAKE ^= true;
1136
1420
             }
1137
1421
             else if(e.getSource() == lookAtCB)
1138
1422
             {
..
..
@@ -1214,8 +1498,6 @@
1214
1498
                         }
1215
1499
                     }
1216
1500
                     
1217
-                    String string = (String) object;
1218
-                    
1219
1501
                     System.out.println("Transfer = " + object + "; drop : " + target);
1220
1502
 //                    if( object instanceof java.io.File[])
1221
1503
 //                    {
..
..
@@ -1223,6 +1505,8 @@
1223
1505
 //                        objEditor.DropFile((java.io.File[]) object, true);
1224
1506
 //                        return;
1225
1507
 //                    }
1508
+                    
1509
+                    String string = object.toString();
1226
1510
                     
1227
1511
                     // File path for Mac and Windows
1228
1512
                     if (string.charAt(0) == '/' || string.charAt(1) == ':')
..
..
@@ -1487,6 +1771,8 @@
1487
1771
 		reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1488
1772
 		reduce34MorphItem.addActionListener(this);
1489
1773
 		menu.add("-");
1774
+		menu.add(memoryItem = new MenuItem("Memory Usage"));
1775
+		memoryItem.addActionListener(this);
1490
1776
 		menu.add(computeAOItem = new MenuItem("Compute AO"));
1491
1777
 		computeAOItem.addActionListener(this);
1492
1778
                 
..
..
@@ -1495,8 +1781,6 @@
1495
1781
 		mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1496
1782
 		mirrorItem.addActionListener(this);
1497
1783
 		menu.add("-");
1498
-		menu.add(memoryItem = new MenuItem("Memory Usage"));
1499
-		memoryItem.addActionListener(this);
1500
1784
 		menu.add(analyzeItem = new MenuItem("Analyze"));
1501
1785
 		analyzeItem.addActionListener(this);
1502
1786
 		menu.add(dumpItem = new MenuItem("Print"));
..
..
@@ -1657,6 +1941,16 @@
1657
1941
                 listUI.remove(i);
1658
1942
             }
1659
1943
         }
1944
+    }
1945
+
1946
+    private void EditElement(Object3D elem, boolean newWindow)
1947
+    {
1948
+        //    if (!(elem instanceof Composite))
1949
+        //        newWindow = false;
1950
+            listUI.add(elem);
1951
+            elem.openEditWindow(this, newWindow); //, false);
1952
+            System.out.println("edit : " + elem);
1953
+            elem.editWindow.refreshContents(true); // ? new
1660
1954
     }
1661
1955
         
1662
1956
     /**
..
..
@@ -2086,6 +2380,23 @@
2086
2380
 		{
2087
2381
 			makeSomething(new Light());
2088
2382
 		} else
2383
+//		if (source == skybox1Button ||
2384
+//                    source == skybox2Button ||
2385
+//                    source == skybox3Button ||
2386
+//                    source == skybox4Button ||
2387
+//                    source == skybox5Button ||
2388
+//                    source == skybox6Button ||
2389
+//                    source == skybox7Button ||
2390
+//                    source == skybox11Button ||
2391
+//                    source == skybox12Button ||
2392
+//                    source == skybox13Button ||
2393
+//                    source == skybox14Button ||
2394
+//                    source == skybox15Button ||
2395
+//                    source == skybox16Button ||
2396
+//                    source == skybox17Button)
2397
+//		{
2398
+//                    ChangeSkybox(source);
2399
+//		} else
2089
2400
 		if (source == csgItem)
2090
2401
 		{
2091
2402
 			group(new CSG());
..
..
@@ -2171,7 +2482,7 @@
2171
2482
 		if (source == computeAOItem)
2172
2483
 		{
2173
2484
                     Globals.drawMode = CameraPane.OCCLUSION;
2174
-                    Globals.theRenderer.repaint();
2485
+                    cameraView.repaint();
2175
2486
 		} else
2176
2487
 		if (source == recompileItem)
2177
2488
 		{
..
..
@@ -2219,15 +2530,31 @@
2219
2530
 		} else
2220
2531
 		if (source == undoButton)
2221
2532
 		{
2533
+                        // Go to previous version
2534
+			//if (!Undo())
2535
+                            //java.awt.Toolkit.getDefaultToolkit().beep();
2222
2536
 			Undo();
2537
+		} else
2538
+		if (source == restoreButton)
2539
+		{
2540
+                        // Restore current version
2541
+			Restore();
2542
+		} else
2543
+		if (source == replaceButton)
2544
+		{
2545
+                        // Overwrite current version
2546
+			Replace();
2223
2547
 		} else
2224
2548
 		if (source == redoButton)
2225
2549
 		{
2550
+                        // Go to next version
2226
2551
 			Redo();
2227
2552
 		} else
2228
2553
 		if (source == saveButton)
2229
2554
 		{
2230
-			Save();
2555
+                        // Save a new version
2556
+			if (!Save(true))
2557
+                            java.awt.Toolkit.getDefaultToolkit().beep();
2231
2558
 		} else
2232
2559
 		if (source == oneStepButton)
2233
2560
 		{
..
..
@@ -2236,17 +2563,14 @@
2236
2563
 		} else
2237
2564
 		if (source == screenfitButton)
2238
2565
 		{
2239
-			//Reload(lastConverter, lastFilename, true);
2240
2566
                     ScreenFit();
2241
2567
 		} else
2242
2568
 		if (source == screenfitpointButton)
2243
2569
 		{
2244
-			//Reload(lastConverter, lastFilename, true);
2245
2570
                     ScreenFitPoint();
2246
2571
 		} else
2247
2572
 		if (source == snapobjectButton)
2248
2573
 		{
2249
-			//Reload(lastConverter, lastFilename, true);
2250
2574
                     SnapObject();
2251
2575
 		} else
2252
2576
 //		if (event.getSource() == recompileButton)
..
..
@@ -2610,7 +2934,7 @@
2610
2934
 		{
2611
2935
 			StepAll();
2612
2936
 		} else
2613
-		if (source == clearItem) // || event.getSource() == clearButton)
2937
+		if (source == deleteItem) // || event.getSource() == clearButton)
2614
2938
 		{
2615
2939
 			//int indices[] = jList.getSelectedIndices();
2616
2940
 			//for (int i = indices.length - 1; i >= 0; i--)
..
..
@@ -3092,7 +3416,7 @@
3092
3416
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3093
3417
 			{
3094
3418
 				obj = (Object3D)e.nextElement();
3095
-                                obj.SetBumpTexture(null);
3419
+                                obj.ResetBumpTexture();
3096
3420
 			}
3097
3421
 			
3098
3422
 			refreshContents();
..
..
@@ -3106,6 +3430,31 @@
3106
3430
                                 obj.SetBumpTexture(obj.GetPigmentTexture());
3107
3431
 			}
3108
3432
 			
3433
+			refreshContents();
3434
+		} else
3435
+		if (source == embedTexturesItem)
3436
+		{
3437
+			Object3D obj;
3438
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3439
+			{
3440
+				obj = (Object3D)e.nextElement();
3441
+                                obj.EmbedTextures(true);
3442
+			}
3443
+			
3444
+			refreshContents();
3445
+		} else
3446
+		if (source == deEmbedTexturesItem)
3447
+		{
3448
+			Object3D obj;
3449
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3450
+			{
3451
+				obj = (Object3D)e.nextElement();
3452
+                                obj.EmbedTextures(false);
3453
+			}
3454
+			
3455
+                CameraPane.texturepigment.clear();
3456
+                CameraPane.texturebump.clear();
3457
+                
3109
3458
 			refreshContents();
3110
3459
 		} else
3111
3460
 		if (source == flashSelectionButton)
..
..
@@ -3209,8 +3558,8 @@
3209
3558
 //                    centralPanel.setVisible(true);
3210
3559
 //                    XYZPanel.setVisible(true);
3211
3560
                     bigThree.ClearUI();
3561
+                    bigThree.add(scenePanel);
3212
3562
                     bigThree.add(centralPanel);
3213
-                    bigThree.add(XYZPanel);
3214
3563
                     bigThree.FlushUI();
3215
3564
                     
3216
3565
                     cameraView.requestFocusInWindow();
..
..
@@ -3290,8 +3639,8 @@
3290
3639
 //                    centralPanel.setVisible(true);
3291
3640
 //                    XYZPanel.setVisible(false);
3292
3641
                     bigThree.ClearUI();
3293
-                    bigThree.add(scenePanel);
3294
3642
                     bigThree.add(centralPanel);
3643
+                    bigThree.add(scenePanel);
3295
3644
                     bigThree.FlushUI();
3296
3645
                     
3297
3646
                     cameraView.requestFocusInWindow();
..
..
@@ -3474,6 +3823,9 @@
3474
3823
                     }
3475
3824
                     
3476
3825
                     copy = group;
3826
+                    
3827
+                    SetUndoStates();
3828
+
3477
3829
                     //Globals.theRenderer.object = group;
3478
3830
                     if(!useclient)
3479
3831
                     {
..
..
@@ -3502,8 +3854,10 @@
3502
3854
                     radio.layout.doClick();
3503
3855
                     
3504
3856
                     ClearUnpinned();
3505
-                    SetPinStates(group.selection.size() > 0);
3506
-                    if (group.selection.size() == 1)
3857
+                    //Grafreed.Assert(group != null);
3858
+                    //Grafreed.Assert(group.selection != null);
3859
+                    SetPinStates(group.selection == null || group.selection.size() > 0);
3860
+                    if (group.selection == null || group.selection.size() == 1)
3507
3861
                         EditSelection(false);
3508
3862
                     keepparent = group.parent;
3509
3863
                     // PARENT = NULL or not???
..
..
@@ -4097,7 +4451,7 @@
4097
4451
                             
4098
4452
                             try
4099
4453
                             {
4100
-                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4454
+                                texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4101
4455
                             }
4102
4456
                             catch (Exception e)
4103
4457
                             {
..
..
@@ -4574,6 +4928,12 @@
4574
4928
 	
4575
4929
 	void EditSelection(boolean newWindow)
4576
4930
 	{
4931
+                if (group.selection == null)
4932
+                {
4933
+                     EditElement(group, newWindow); // ? new
4934
+                     return;
4935
+                }
4936
+                
4577
4937
         //    aConstraints.gridy = 0;
4578
4938
 		for (int i=0; i<group.selection.size(); i++)
4579
4939
 		{
..
..
@@ -4584,12 +4944,7 @@
4584
4944
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4585
4945
                         if(elem != group || !newWindow)
4586
4946
                         {
4587
-                        //    if (!(elem instanceof Composite))
4588
-                        //        newWindow = false;
4589
-                            listUI.add(elem);
4590
-                            elem.openEditWindow(this, newWindow); //, false);
4591
-                            System.out.println("edit : " + elem);
4592
-                            elem.editWindow.refreshContents(true); // ? new
4947
+                            EditElement(elem, newWindow); // ? new
4593
4948
                         }
4594
4949
 		}
4595
4950
 	}
..
..
@@ -4733,7 +5088,7 @@
4733
5088
 
4734
5089
         void refreshContents(boolean cp)
4735
5090
         {
4736
-            if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
5091
+            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4737
5092
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4738
5093
             {
4739
5094
                 objEditor.ClearInfo(); // .GetMaterial());
..
..
@@ -4833,8 +5188,8 @@
4833
5188
                 
4834
5189
 		if (cut)
4835
5190
 		{
4836
-        if (Globals.SAVEONMAKE)
4837
-                    Save();
5191
+//        if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
5192
+//                    Save();
4838
5193
 			//int indices[] = jList.getSelectedIndices();
4839
5194
 			//for (int i = indices.length - 1; i >= 0; i--)
4840
5195
 			//jList.remove(indices[i]);
..
..
@@ -4937,6 +5292,10 @@
4937
5292
 	
4938
5293
 	void paste(boolean expand)
4939
5294
 	{
5295
+        if (Globals.REPLACEONMAKE)
5296
+            Save();
5297
+        boolean keep = Globals.REPLACEONMAKE;
5298
+        Globals.REPLACEONMAKE = false;
4940
5299
 	//	if (GrafreeD.clipboard == null)
4941
5300
 	//		return;
4942
5301
 		boolean first = true;
..
..
@@ -4996,6 +5355,7 @@
4996
5355
                         Grafreed.clipboard.get(0).parent = keepparent;
4997
5356
 		}
4998
5357
 		
5358
+        Globals.REPLACEONMAKE = keep;
4999
5359
 		ResetModel();
5000
5360
 		refreshContents();
5001
5361
 	}
..
..
@@ -5131,6 +5491,10 @@
5131
5491
         
5132
5492
 	void group(Object3D csg, boolean grab)
5133
5493
 	{
5494
+        if (Globals.REPLACEONMAKE)
5495
+            Save();
5496
+        boolean keep = Globals.REPLACEONMAKE;
5497
+        Globals.REPLACEONMAKE = false;
5134
5498
 		if (//false) // why??
5135
5499
                     !group.selection.isEmpty())
5136
5500
                 {
..
..
@@ -5244,10 +5608,15 @@
5244
5608
                 //node.add(csg);
5245
5609
 		//makeSomething(node);
5246
5610
 		makeSomething(csg);
5611
+        Globals.REPLACEONMAKE = keep;
5247
5612
 	}
5248
5613
 	
5249
5614
         void Ungroup(Object3D g)
5250
5615
         {
5616
+        if (Globals.REPLACEONMAKE)
5617
+            Save();
5618
+        boolean keep = Globals.REPLACEONMAKE;
5619
+        Globals.REPLACEONMAKE = false;
5251
5620
             if (g instanceof HiddenObject)
5252
5621
             {
5253
5622
                 HiddenObject h = (HiddenObject) g;
..
..
@@ -5264,6 +5633,7 @@
5264
5633
                     objEditor.makeSomething(g.get(i), false);
5265
5634
                 }
5266
5635
             }
5636
+        Globals.REPLACEONMAKE = keep;
5267
5637
         }
5268
5638
         
5269
5639
 	void ungroup()
..
..
@@ -5564,6 +5934,22 @@
5564
5934
         cButton loopButton;
5565
5935
         cButton textureButton;
5566
5936
         
5937
+        cButton skybox1Button;
5938
+        cButton skybox2Button;
5939
+        cButton skybox3Button;
5940
+        cButton skybox4Button;
5941
+        cButton skybox5Button;
5942
+        cButton skybox6Button;
5943
+        cButton skybox7Button;
5944
+        
5945
+        cButton skybox11Button;
5946
+        cButton skybox12Button;
5947
+        cButton skybox13Button;
5948
+        cButton skybox14Button;
5949
+        cButton skybox15Button;
5950
+        cButton skybox16Button;
5951
+        cButton skybox17Button;
5952
+        
5567
5953
         cButton gridButton;
5568
5954
         cButton boxButton;
5569
5955
         cButton sphereButton;
..
..
@@ -5627,7 +6013,7 @@
5627
6013
 	private MenuItem pasteLinkItem;
5628
6014
 	private MenuItem pasteCloneItem;
5629
6015
 	private MenuItem pasteExpandItem;
5630
-	private MenuItem clearItem;
6016
+	private MenuItem deleteItem;
5631
6017
 	private MenuItem clearAllItem;
5632
6018
 	private MenuItem genUVItem;
5633
6019
 	private MenuItem genNormalsMESHItem;
..
..
@@ -5711,6 +6097,8 @@
5711
6097
 	private MenuItem attachBumpItem;
5712
6098
 	private MenuItem detachBumpItem;
5713
6099
 	private MenuItem pigmentBumpItem;
6100
+	private MenuItem embedTexturesItem;
6101
+	private MenuItem deEmbedTexturesItem;
5714
6102
 
5715
6103
 	private MenuItem particleItem;
5716
6104
 	private MenuItem ragdollItem;