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;
..
..
@@ -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);
..
..
@@ -1195,6 +1195,8 @@
1195
1195
         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1196
1196
         markCB.setToolTipText("As animation target transform");
1197
1197
         
1198
+        ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1199
+        
1198
1200
             setupPanel2 = new cGridBag().setVertical(false);
1199
1201
             
1200
1202
         rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
..
..
@@ -1632,8 +1634,8 @@
1632
1634
         /**/
1633
1635
 
1634
1636
         bigThree = new cGridBag();
1635
-        bigThree.addComponent(scenePanel);
1636
1637
         bigThree.addComponent(centralPanel);
1638
+        bigThree.addComponent(scenePanel);
1637
1639
         //bigThree.addComponent(XYZPanel);
1638
1640
         
1639
1641
 //                // SIDE EFFECT!!!
..
..
@@ -4769,7 +4771,9 @@
4769
4771
             readobj.ResetDisplayList();
4770
4772
         } catch (Exception e)
4771
4773
         {
4772
-            e.printStackTrace();
4774
+            if (!e.toString().contains("GZIP"))
4775
+                e.printStackTrace();
4776
+            
4773
4777
             try
4774
4778
             {
4775
4779
                 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..
..
@@ -4849,6 +4853,8 @@
4849
4853
             {
4850
4854
                 //readobj.deepCopySelf(copy);
4851
4855
                 copy.clear(); // june 2014
4856
+                copy.skyboxname = readobj.skyboxname;
4857
+                copy.skyboxext = readobj.skyboxext;
4852
4858
                 for (int i = 0; i < readobj.size(); i++)
4853
4859
                 {
4854
4860
                     Object3D child = readobj.get(i); // reserve(i);
..
..
@@ -4889,6 +4895,7 @@
4889
4895
                 }
4890
4896
             } catch (ClassCastException e)
4891
4897
             {
4898
+                e.printStackTrace();
4892
4899
                 assert (false);
4893
4900
                 Composite c = (Composite) copy;
4894
4901
                 c.children.clear();
..
..
@@ -5019,6 +5026,7 @@
5019
5026
             //ps.print(buffer.toString());
5020
5027
         } catch (IOException e)
5021
5028
         {
5029
+            e.printStackTrace();
5022
5030
         }
5023
5031
     }
5024
5032