blame | history | patch | commit | commitdiff
Normand Briere
2019-07-30 475f8cbdbd96fdbf8f5b216ffebb31a51f25c2f9 
 ObjEditor.java
....@@ -44,61 +44,47 @@
4444     
4545     cButton GetButton(String name, boolean border)
4646     {
47
-        try
48
-        {
49
-            ImageIcon icon = GetIcon(name);
50
-            return new cButton(icon, border);
51
-        }
52
-        catch (Exception e)
53
-        {
54
-            return new cButton(name, border);
55
-        }
47
+        ImageIcon icon = GetIcon(name);
48
+        return new cButton(icon, border);
5649     }
5750 
5851     cToggleButton GetToggleButton(String name, boolean border)
5952     {
60
-        try
61
-        {
62
-            ImageIcon icon = GetIcon(name);
63
-            return new cToggleButton(icon, border);
64
-        }
65
-        catch (Exception e)
66
-        {
67
-            return new cToggleButton(name, border);
68
-        }
53
+        ImageIcon icon = GetIcon(name);
54
+        return new cToggleButton(icon, border);
6955     }
7056 
7157     cCheckBox GetCheckBox(String name, boolean border)
7258     {
59
+        ImageIcon icon = GetIcon(name);
60
+        return new cCheckBox(icon, border);
61
+    }
62
+
63
+    ImageIcon GetIcon(String name)
64
+    {
7365         try
7466         {
75
-            ImageIcon icon = GetIcon(name);
76
-            return new cCheckBox(icon, border);
67
+            BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
68
+
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
+
81
+            javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
82
+            return icon;
7783         }
7884         catch (Exception e)
7985         {
80
-            return new cCheckBox(name, border);
86
+            return null;
8187         }
82
-    }
83
-
84
-    private ImageIcon GetIcon(String name) throws IOException
85
-    {
86
-        BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87
-        
88
-        if (image.getWidth() != 24 && image.getHeight() != 24)
89
-        {
90
-            BufferedImage resized = new BufferedImage(24, 24, image.getType());
91
-            Graphics2D g = resized.createGraphics();
92
-            g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93
-            //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94
-            g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95
-            g.dispose();
96
-            
97
-            image = resized;
98
-        }
99
-        
100
-        javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101
-        return icon;
10288     }
10389     
10490     // SCRIPT
....@@ -341,8 +327,8 @@
341327 
342328         if (copy.versions == null)
343329         {
344
-            copy.versions = new byte[100][];
345
-            copy.versionindex = -1;
330
+//            copy.versions = new byte[100][];
331
+//            copy.versionindex = -1;
346332         }
347333         
348334         SetupMenu();
....@@ -437,11 +423,12 @@
437423     
438424         toolbarPanel = new JPanel();
439425         toolbarPanel.setName("Toolbar");
426
+        
440427         treePanel = new cGridBag();
441428         treePanel.setName("Tree");
442429         
443430         editPanel = new cGridBag().setVertical(true);
444
-        editPanel.setName("Edit");
431
+        //editPanel.setName("Edit");
445432         
446433         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
447434         
....@@ -449,11 +436,11 @@
449436         editPanel.add(editCommandsPanel);
450437         editPanel.add(ctrlPanel);
451438                 
452
-        toolboxPanel = new cGridBag().setVertical(false);
453
-        toolboxPanel.setName("Toolbox");
439
+        toolboxPanel = new cGridBag().setVertical(true);
440
+        //toolboxPanel.setName("Toolbox");
454441         
455442         materialPanel = new cGridBag().setVertical(true);
456
-        materialPanel.setName("Material");
443
+        //materialPanel.setName("Material");
457444         
458445         /*JTextPane*/
459446         infoarea = createTextPane();
....@@ -461,6 +448,7 @@
461448 
462449         infoarea.setEditable(true);
463450         SetText();
451
+        
464452 //            infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
465453 //            infoarea.setOpaque(false);
466454 //            //infoarea.setForeground(textcolor);
....@@ -468,7 +456,7 @@
468456 // TEXTAREA           infoarea.setWrapStyleWord(true);
469457         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
470458         infoPanel.setPreferredSize(new Dimension(1, 1));
471
-        infoPanel.setName("Info");
459
+        //infoPanel.setName("Info");
472460         //infoPanel.setLayout(new BorderLayout());
473461         //infoPanel.add(createTextPane());
474462 
....@@ -986,7 +974,7 @@
986974 //    NumberSlider vDivsField;
987975 //    JCheckBox endcaps;
988976     JCheckBox liveCB;
989
-    JCheckBox selectCB;
977
+    JCheckBox selectableCB;
990978     JCheckBox hideCB;
991979     JCheckBox link2masterCB;
992980     JCheckBox markCB;
....@@ -1198,13 +1186,16 @@
11981186             
11991187         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12001188                 liveCB.setToolTipText("Animate object");
1201
-        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1202
-                selectCB.setToolTipText("Make object selectable");
1189
+        selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190
+                selectableCB.setToolTipText("Make object selectable");
12031191 //            Return();
1192
+                
12041193         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12051194                 hideCB.setToolTipText("Hide object");
12061195         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
12071196         markCB.setToolTipText("As animation target transform");
1197
+        
1198
+        ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12081199         
12091200             setupPanel2 = new cGridBag().setVertical(false);
12101201             
....@@ -1492,6 +1483,7 @@
14921483         XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
14931484         XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
14941485         XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1486
+        //XYZPanel.setName("XYZ");
14951487 
14961488         /*
14971489         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1529,16 +1521,23 @@
15291521         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15301522         //tmp.setName("Edit");
15311523         objectPanel.add(materialPanel);
1524
+        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
15321525 //        JPanel north = new JPanel(new BorderLayout());
15331526 //        north.setName("Edit");
15341527 //        north.add(ctrlPanel, BorderLayout.NORTH);
15351528 //        objectPanel.add(north);
15361529         objectPanel.add(editPanel);
1530
+        objectPanel.setIconAt(1, GetIcon("icons/write.png"));
15371531         
15381532         //if (Globals.ADVANCED)
15391533             objectPanel.add(infoPanel);
1534
+        objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1535
+        
1536
+        objectPanel.add(XYZPanel);
1537
+        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
15401538         
15411539         objectPanel.add(toolboxPanel);
1540
+        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
15421541 
15431542         /*
15441543         aConstraints.gridx = 0;
....@@ -1559,7 +1558,7 @@
15591558         scrollpane.addMouseWheelListener(this); // Default not fast enough
15601559 
15611560         /*JTabbedPane*/ scenePanel = new cGridBag();
1562
-        scenePanel.preferredWidth = 6;
1561
+        scenePanel.preferredWidth = 5;
15631562         
15641563         JTabbedPane tabbedPane = new JTabbedPane();
15651564         tabbedPane.add(scrollpane);
....@@ -1635,9 +1634,9 @@
16351634         /**/
16361635 
16371636         bigThree = new cGridBag();
1638
-        bigThree.addComponent(scenePanel);
16391637         bigThree.addComponent(centralPanel);
1640
-        bigThree.addComponent(XYZPanel);
1638
+        bigThree.addComponent(scenePanel);
1639
+        //bigThree.addComponent(XYZPanel);
16411640         
16421641 //                // SIDE EFFECT!!!
16431642 //		aConstraints.gridx = 0;
....@@ -3254,7 +3253,7 @@
32543253         {
32553254             copy.live ^= true;
32563255             return;
3257
-        } else if (event.getSource() == selectCB)
3256
+        } else if (event.getSource() == selectableCB)
32583257         {
32593258             copy.dontselect ^= true;
32603259             return;
....@@ -4772,7 +4771,9 @@
47724771             readobj.ResetDisplayList();
47734772         } catch (Exception e)
47744773         {
4775
-            //e.printStackTrace();
4774
+            if (!e.toString().contains("GZIP"))
4775
+                e.printStackTrace();
4776
+            
47764777             try
47774778             {
47784779                 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4852,6 +4853,8 @@
48524853             {
48534854                 //readobj.deepCopySelf(copy);
48544855                 copy.clear(); // june 2014
4856
+                copy.skyboxname = readobj.skyboxname;
4857
+                copy.skyboxext = readobj.skyboxext;
48554858                 for (int i = 0; i < readobj.size(); i++)
48564859                 {
48574860                     Object3D child = readobj.get(i); // reserve(i);
....@@ -4892,6 +4895,7 @@
48924895                 }
48934896             } catch (ClassCastException e)
48944897             {
4898
+                e.printStackTrace();
48954899                 assert (false);
48964900                 Composite c = (Composite) copy;
48974901                 c.children.clear();
....@@ -5022,6 +5026,7 @@
50225026             //ps.print(buffer.toString());
50235027         } catch (IOException e)
50245028         {
5029
+            e.printStackTrace();
50255030         }
50265031     }
50275032