Random node + optimizations.

Normand Briere

2019-08-14 0c1f740dd6ddd6432dc29266e42ef851e26027bb

 GroupEditor.java
..
..
@@ -31,7 +31,7 @@
31
31
         final String path = "cubemaps/" + f + "-skyboxes/" + s;
32
32
         row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
33
33
         //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34
-        skyboxButton.setToolTipText(s);
34
+        skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35
35
         skyboxButton.addActionListener(new ActionListener()
36
36
         {
37
37
                 @Override
..
..
@@ -73,7 +73,7 @@
73
73
         cGridBag row5 = new cGridBag();
74
74
         cGridBag row6 = new cGridBag();
75
75
         
76
-        AddSkyboxButton("default", "rgb", row0);
76
+        AddSkyboxButton("default", "", row0);
77
77
         //AddSkyboxButton("default", "cornell", row0);
78
78
         AddSkyboxButton("penguins", "dust", row0);
79
79
         AddSkyboxButton("penguins", "tropic", row0);
..
..
@@ -330,10 +330,19 @@
330
330
         
331
331
     public void ChangeSkybox(String skybox)
332
332
     {
333
-        //cameraView.envyoff = false;
334
-        group.skyboxname = skybox;
335
-        group.skyboxext = "jpg";
336
-        cameraView.repaint();
333
+        if (skybox.endsWith("/"))
334
+        {
335
+            group.skyboxname = null;
336
+            group.skyboxext = null;
337
+            cameraView.repaint();
338
+        }
339
+        else
340
+        {
341
+            //cameraView.envyoff = false;
342
+            group.skyboxname = skybox;
343
+            group.skyboxext = "jpg";
344
+            cameraView.repaint();
345
+        }
337
346
     }
338
347
 
339
348
     public void CreateSkyboxPanel(cGridBag skyboxPanel)
..
..
@@ -1034,8 +1043,8 @@
1034
1043
 //                    maxButton.addActionListener(this);
1035
1044
                 }
1036
1045
                 
1037
-//                cButton gcButton;
1038
-//                
1046
+                cButton gcButton;
1047
+                
1039
1048
 //		oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1040
1049
 //                gcButton.setToolTipText("Garbage collect");
1041
1050
 //                gcButton.addActionListener(new ActionListener()
..
..
@@ -1459,11 +1468,11 @@
1459
1468
         {
1460
1469
             assert(obj instanceof Composite);
1461
1470
             
1462
-            if (obj.versionlist == null)
1463
-            {
1464
-                obj.versionlist = new Object3D[100];
1465
-                obj.versionindex = -1;
1466
-            }
1471
+//            if (obj.versionlist == null)
1472
+//            {
1473
+//                obj.versionlist = new Object3D[100];
1474
+//                obj.versionindex = -1;
1475
+//            }
1467
1476
             
1468
1477
             cRadio radioButton = new cRadio(obj.name);
1469
1478
             
..
..
@@ -4067,7 +4076,17 @@
4067
4076
                      */
4068
4077
                     radio.layout.doClick();
4069
4078
                     
4070
-                    SetUndoStates();
4079
+                    assert(copy instanceof Composite);
4080
+                    
4081
+        if (copy.versionlist == null)
4082
+        {
4083
+            copy.versionlist = new Object3D[100];
4084
+            copy.versionindex = -1;
4085
+            
4086
+            Save(true);
4087
+        }
4088
+        
4089
+                    SetVersionStates();
4071
4090
 
4072
4091
                     ClearUnpinned();
4073
4092
                     
..
..
@@ -5306,6 +5325,7 @@
5306
5325
             
5307
5326
             boolean allComposites = true;
5308
5327
             
5328
+            if (group.selection != null)
5309
5329
             for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5310
5330
             {
5311
5331
                     if (!(e.nextElement() instanceof Composite))