Save skybox.

Normand Briere

2019-07-30 475f8cbdbd96fdbf8f5b216ffebb31a51f25c2f9

 ObjEditor.java
..
..
@@ -60,23 +60,23 @@
60
60
         return new cCheckBox(icon, border);
61
61
     }
62
62
 
63
-    private ImageIcon GetIcon(String name)
63
+    ImageIcon GetIcon(String name)
64
64
     {
65
65
         try
66
66
         {
67
67
             BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
68
68
 
69
-            if (image.getWidth() != 24 && image.getHeight() != 24)
70
-            {
71
-                BufferedImage resized = new BufferedImage(24, 24, image.getType());
72
-                Graphics2D g = resized.createGraphics();
73
-                g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
74
-                //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
75
-                g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
76
-                g.dispose();
77
-
78
-                image = resized;
79
-            }
69
+//            if (image.getWidth() > 48 && image.getHeight() > 48)
70
+//            {
71
+//                BufferedImage resized = new BufferedImage(48, 48, image.getType());
72
+//                Graphics2D g = resized.createGraphics();
73
+//                g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
74
+//                //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
75
+//                g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
76
+//                g.dispose();
77
+//
78
+//                image = resized;
79
+//            }
80
80
 
81
81
             javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
82
82
             return icon;
..
..
@@ -327,8 +327,8 @@
327
327
 
328
328
         if (copy.versions == null)
329
329
         {
330
-            copy.versions = new byte[100][];
331
-            copy.versionindex = -1;
330
+//            copy.versions = new byte[100][];
331
+//            copy.versionindex = -1;
332
332
         }
333
333
         
334
334
         SetupMenu();
..
..
@@ -436,7 +436,7 @@
436
436
         editPanel.add(editCommandsPanel);
437
437
         editPanel.add(ctrlPanel);
438
438
                 
439
-        toolboxPanel = new cGridBag().setVertical(false);
439
+        toolboxPanel = new cGridBag().setVertical(true);
440
440
         //toolboxPanel.setName("Toolbox");
441
441
         
442
442
         materialPanel = new cGridBag().setVertical(true);
..
..
@@ -974,7 +974,7 @@
974
974
 //    NumberSlider vDivsField;
975
975
 //    JCheckBox endcaps;
976
976
     JCheckBox liveCB;
977
-    JCheckBox selectCB;
977
+    JCheckBox selectableCB;
978
978
     JCheckBox hideCB;
979
979
     JCheckBox link2masterCB;
980
980
     JCheckBox markCB;
..
..
@@ -1186,13 +1186,16 @@
1186
1186
             
1187
1187
         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1188
1188
                 liveCB.setToolTipText("Animate object");
1189
-        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190
-                selectCB.setToolTipText("Make object selectable");
1189
+        selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190
+                selectableCB.setToolTipText("Make object selectable");
1191
1191
 //            Return();
1192
+                
1192
1193
         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1193
1194
                 hideCB.setToolTipText("Hide object");
1194
1195
         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1195
1196
         markCB.setToolTipText("As animation target transform");
1197
+        
1198
+        ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1196
1199
         
1197
1200
             setupPanel2 = new cGridBag().setVertical(false);
1198
1201
             
..
..
@@ -1631,8 +1634,8 @@
1631
1634
         /**/
1632
1635
 
1633
1636
         bigThree = new cGridBag();
1634
-        bigThree.addComponent(scenePanel);
1635
1637
         bigThree.addComponent(centralPanel);
1638
+        bigThree.addComponent(scenePanel);
1636
1639
         //bigThree.addComponent(XYZPanel);
1637
1640
         
1638
1641
 //                // SIDE EFFECT!!!
..
..
@@ -3250,7 +3253,7 @@
3250
3253
         {
3251
3254
             copy.live ^= true;
3252
3255
             return;
3253
-        } else if (event.getSource() == selectCB)
3256
+        } else if (event.getSource() == selectableCB)
3254
3257
         {
3255
3258
             copy.dontselect ^= true;
3256
3259
             return;
..
..
@@ -4768,7 +4771,9 @@
4768
4771
             readobj.ResetDisplayList();
4769
4772
         } catch (Exception e)
4770
4773
         {
4771
-            //e.printStackTrace();
4774
+            if (!e.toString().contains("GZIP"))
4775
+                e.printStackTrace();
4776
+            
4772
4777
             try
4773
4778
             {
4774
4779
                 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..
..
@@ -4848,6 +4853,8 @@
4848
4853
             {
4849
4854
                 //readobj.deepCopySelf(copy);
4850
4855
                 copy.clear(); // june 2014
4856
+                copy.skyboxname = readobj.skyboxname;
4857
+                copy.skyboxext = readobj.skyboxext;
4851
4858
                 for (int i = 0; i < readobj.size(); i++)
4852
4859
                 {
4853
4860
                     Object3D child = readobj.get(i); // reserve(i);
..
..
@@ -4888,6 +4895,7 @@
4888
4895
                 }
4889
4896
             } catch (ClassCastException e)
4890
4897
             {
4898
+                e.printStackTrace();
4891
4899
                 assert (false);
4892
4900
                 Composite c = (Composite) copy;
4893
4901
                 c.children.clear();
..
..
@@ -5018,6 +5026,7 @@
5018
5026
             //ps.print(buffer.toString());
5019
5027
         } catch (IOException e)
5020
5028
         {
5029
+            e.printStackTrace();
5021
5030
         }
5022
5031
     }
5023
5032