blame | history | patch | commit | commitdiff
Normand Briere
2019-08-01 c49ad213b600f844e9070cb09390c3e6d3d13db4 
 ObjEditor.java
....@@ -41,64 +41,78 @@
4141     JFrame frame;
4242     
4343     static ObjEditor theFrame;
44
+
45
+    public cGridBag GetSeparator()
46
+    {
47
+        cGridBag separator = new cGridBag();
48
+        separator.add(new JSeparator());
49
+        separator.preferredHeight = 5;
50
+        return separator;
51
+    }
4452     
4553     cButton GetButton(String name, boolean border)
4654     {
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
-        }
55
+        ImageIcon icon = GetIcon(name);
56
+        return new cButton(icon, border);
57
+    }
58
+
59
+    cLabel GetLabel(String name, boolean border)
60
+    {
61
+        //ImageIcon icon = GetIcon(name);
62
+        return new cLabel(GetImage(name), border);
5663     }
5764 
5865     cToggleButton GetToggleButton(String name, boolean border)
5966     {
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
-        }
67
+        ImageIcon icon = GetIcon(name);
68
+        return new cToggleButton(icon, border);
6969     }
7070 
7171     cCheckBox GetCheckBox(String name, boolean border)
7272     {
73
+        ImageIcon icon = GetIcon(name);
74
+        return new cCheckBox(icon, border);
75
+    }
76
+
77
+    ImageIcon GetIcon(String name)
78
+    {
7379         try
7480         {
75
-            ImageIcon icon = GetIcon(name);
76
-            return new cCheckBox(icon, border);
81
+            BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
82
+
83
+//            if (image.getWidth() > 48 && image.getHeight() > 48)
84
+//            {
85
+//                BufferedImage resized = new BufferedImage(48, 48, image.getType());
86
+//                Graphics2D g = resized.createGraphics();
87
+//                g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
88
+//                //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
89
+//                g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
90
+//                g.dispose();
91
+//
92
+//                image = resized;
93
+//            }
94
+
95
+            javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
96
+            return icon;
7797         }
7898         catch (Exception e)
7999         {
80
-            return new cCheckBox(name, border);
100
+            return null;
81101         }
82102     }
83
-
84
-    private ImageIcon GetIcon(String name) throws IOException
103
+    
104
+    BufferedImage GetImage(String name)
85105     {
86
-        BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87
-        
88
-        if (image.getWidth() != 24 && image.getHeight() != 24)
106
+        try
89107         {
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;
108
+            BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
109
+
110
+            return image;
98111         }
99
-        
100
-        javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101
-        return icon;
112
+        catch (Exception e)
113
+        {
114
+            return null;
115
+        }
102116     }
103117     
104118     // SCRIPT
....@@ -284,7 +298,7 @@
284298 
285299         if (copy.versions == null)
286300         {
287
-            copy.versions = new byte[100][];
301
+            copy.versions = new Object3D[100];
288302             copy.versionindex = -1;
289303         }
290304         
....@@ -303,7 +317,7 @@
303317 
304318         if (copy.versions == null)
305319         {
306
-            copy.versions = new byte[100][];
320
+            copy.versions = new Object3D[100];
307321             copy.versionindex = -1;
308322         }
309323         
....@@ -341,8 +355,8 @@
341355 
342356         if (copy.versions == null)
343357         {
344
-            copy.versions = new byte[100][];
345
-            copy.versionindex = -1;
358
+//            copy.versions = new byte[100][];
359
+//            copy.versionindex = -1;
346360         }
347361         
348362         SetupMenu();
....@@ -437,11 +451,12 @@
437451     
438452         toolbarPanel = new JPanel();
439453         toolbarPanel.setName("Toolbar");
454
+        
440455         treePanel = new cGridBag();
441456         treePanel.setName("Tree");
442457         
443458         editPanel = new cGridBag().setVertical(true);
444
-        editPanel.setName("Edit");
459
+        //editPanel.setName("Edit");
445460         
446461         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
447462         
....@@ -449,11 +464,11 @@
449464         editPanel.add(editCommandsPanel);
450465         editPanel.add(ctrlPanel);
451466                 
452
-        toolboxPanel = new cGridBag().setVertical(false);
453
-        toolboxPanel.setName("Toolbox");
467
+        toolboxPanel = new cGridBag().setVertical(true);
468
+        //toolboxPanel.setName("Toolbox");
454469         
455470         materialPanel = new cGridBag().setVertical(true);
456
-        materialPanel.setName("Material");
471
+        //materialPanel.setName("Material");
457472         
458473         /*JTextPane*/
459474         infoarea = createTextPane();
....@@ -461,6 +476,7 @@
461476 
462477         infoarea.setEditable(true);
463478         SetText();
479
+        
464480 //            infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
465481 //            infoarea.setOpaque(false);
466482 //            //infoarea.setForeground(textcolor);
....@@ -468,7 +484,7 @@
468484 // TEXTAREA           infoarea.setWrapStyleWord(true);
469485         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
470486         infoPanel.setPreferredSize(new Dimension(1, 1));
471
-        infoPanel.setName("Info");
487
+        //infoPanel.setName("Info");
472488         //infoPanel.setLayout(new BorderLayout());
473489         //infoPanel.add(createTextPane());
474490 
....@@ -834,7 +850,7 @@
834850             frame.validate();
835851         }
836852 
837
-    private byte[] CompressCopy()
853
+    private Object3D CompressCopy()
838854     {
839855         boolean temp = CameraPane.SWITCH;
840856         CameraPane.SWITCH = false;
....@@ -842,10 +858,11 @@
842858         copy.ExtractBigData(versiontable);
843859         // if (copy == client)
844860         
845
-        byte[] versions[] = copy.versions;
861
+        Object3D versions[] = copy.versions;
846862         copy.versions = null;
847863         
848
-        byte[] compress = Compress(copy);
864
+        //byte[] compress = Compress(copy);
865
+        Object3D compress = (Object3D)Grafreed.clone(copy);
849866         
850867         copy.versions = versions;
851868         
....@@ -986,7 +1003,7 @@
9861003 //    NumberSlider vDivsField;
9871004 //    JCheckBox endcaps;
9881005     JCheckBox liveCB;
989
-    JCheckBox selectCB;
1006
+    JCheckBox selectableCB;
9901007     JCheckBox hideCB;
9911008     JCheckBox link2masterCB;
9921009     JCheckBox markCB;
....@@ -1198,13 +1215,16 @@
11981215             
11991216         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12001217                 liveCB.setToolTipText("Animate object");
1201
-        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1202
-                selectCB.setToolTipText("Make object selectable");
1218
+        selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1219
+                selectableCB.setToolTipText("Make object selectable");
12031220 //            Return();
1221
+                
12041222         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12051223                 hideCB.setToolTipText("Hide object");
12061224         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
12071225         markCB.setToolTipText("As animation target transform");
1226
+        
1227
+        ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12081228         
12091229             setupPanel2 = new cGridBag().setVertical(false);
12101230             
....@@ -1492,6 +1512,7 @@
14921512         XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
14931513         XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
14941514         XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1515
+        //XYZPanel.setName("XYZ");
14951516 
14961517         /*
14971518         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1529,16 +1550,29 @@
15291550         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15301551         //tmp.setName("Edit");
15311552         objectPanel.add(materialPanel);
1553
+        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1554
+        objectPanel.setToolTipTextAt(0, "Material panel");
1555
+    
15321556 //        JPanel north = new JPanel(new BorderLayout());
15331557 //        north.setName("Edit");
15341558 //        north.add(ctrlPanel, BorderLayout.NORTH);
15351559 //        objectPanel.add(north);
15361560         objectPanel.add(editPanel);
1561
+        objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1562
+        objectPanel.setToolTipTextAt(1, "Edit panel");
15371563         
15381564         //if (Globals.ADVANCED)
15391565             objectPanel.add(infoPanel);
1566
+        objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1567
+        objectPanel.setToolTipTextAt(2, "Info panel");
1568
+        
1569
+        objectPanel.add(XYZPanel);
1570
+        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1571
+        objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
15401572         
15411573         objectPanel.add(toolboxPanel);
1574
+        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1575
+        objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
15421576 
15431577         /*
15441578         aConstraints.gridx = 0;
....@@ -1559,7 +1593,7 @@
15591593         scrollpane.addMouseWheelListener(this); // Default not fast enough
15601594 
15611595         /*JTabbedPane*/ scenePanel = new cGridBag();
1562
-        scenePanel.preferredWidth = 6;
1596
+        scenePanel.preferredWidth = 5;
15631597         
15641598         JTabbedPane tabbedPane = new JTabbedPane();
15651599         tabbedPane.add(scrollpane);
....@@ -1637,7 +1671,7 @@
16371671         bigThree = new cGridBag();
16381672         bigThree.addComponent(scenePanel);
16391673         bigThree.addComponent(centralPanel);
1640
-        bigThree.addComponent(XYZPanel);
1674
+        //bigThree.addComponent(XYZPanel);
16411675         
16421676 //                // SIDE EFFECT!!!
16431677 //		aConstraints.gridx = 0;
....@@ -1678,7 +1712,6 @@
16781712         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16791713         frame.addWindowListener(new WindowAdapter()
16801714         {
1681
-
16821715             public void windowClosing(WindowEvent e)
16831716             {
16841717                 Close();
....@@ -1740,27 +1773,48 @@
17401773         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17411774 
17421775         cGridBag colorSection = new cGridBag().setVertical(true);
1776
+
1777
+        cGridBag huepanel = new cGridBag();
1778
+            cGridBag huelabel = new cGridBag();
1779
+            huelabel.add(GetLabel("icons/hue.png", false));
1780
+            huelabel.preferredWidth = 20;
1781
+            huepanel.add(new cGridBag()); // Label
1782
+            huepanel.add(huelabel); // Field/slider
1783
+            
1784
+        huepanel.preferredHeight = 7;
1785
+
1786
+        colorSection.add(huepanel);
17431787         
17441788         cGridBag color = new cGridBag();
1745
-                color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1746
-                colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1747
-                color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1789
+        
1790
+            color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1791
+            colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1792
+            color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1793
+
17481794         //colorField.preferredWidth = 200;
17491795         colorSection.add(color);
17501796 
17511797         cGridBag modulation = new cGridBag();
17521798                 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
17531799                 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1754
-                modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1800
+                modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
17551801         colorSection.add(modulation);
17561802 
1803
+        cGridBag opacity = new cGridBag();
1804
+                opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1805
+                opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1806
+                opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1807
+        colorSection.add(opacity);
1808
+
1809
+        colorSection.add(GetSeparator());
1810
+        
17571811         cGridBag texture = new cGridBag();
17581812                 texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
17591813                 textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17601814                 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
17611815         colorSection.add(texture);
17621816 
1763
-        panel.add(new JSeparator());
1817
+        panel.add(GetSeparator());
17641818         
17651819         panel.add(colorSection);
17661820         
....@@ -1816,7 +1870,7 @@
18161870                 shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
18171871         diffuseSection.add(shadowbias);
18181872 
1819
-        panel.add(new JSeparator());
1873
+        panel.add(GetSeparator());
18201874         
18211875         panel.add(diffuseSection);
18221876         
....@@ -1879,7 +1933,7 @@
18791933         specularSection.add(anisoV);
18801934 
18811935 
1882
-        panel.add(new JSeparator());
1936
+        panel.add(GetSeparator());
18831937         
18841938         panel.add(specularSection);
18851939         
....@@ -1904,12 +1958,6 @@
19041958                 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
19051959                 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
19061960         colorSection.add(backlit);
1907
-
1908
-        cGridBag opacity = new cGridBag();
1909
-                opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1910
-                opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1911
-                opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1912
-        colorSection.add(opacity);
19131961 
19141962         //panel.add(new JSeparator());
19151963         
....@@ -1955,7 +2003,7 @@
19552003                 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
19562004         textureSection.add(opacityPower);
19572005 
1958
-        panel.add(new JSeparator());
2006
+        panel.add(GetSeparator());
19592007         
19602008         panel.add(textureSection);
19612009         
....@@ -3254,7 +3302,7 @@
32543302         {
32553303             copy.live ^= true;
32563304             return;
3257
-        } else if (event.getSource() == selectCB)
3305
+        } else if (event.getSource() == selectableCB)
32583306         {
32593307             copy.dontselect ^= true;
32603308             return;
....@@ -3518,6 +3566,7 @@
35183566     
35193567     static public byte[] Compress(Object3D o)
35203568     {
3569
+        // Slower to actually compress.
35213570         try
35223571         {
35233572             ByteArrayOutputStream baos = new ByteArrayOutputStream();
....@@ -3645,15 +3694,14 @@
36453694         
36463695         cRadio tab = GetCurrentTab();
36473696         
3648
-        byte[] compress = CompressCopy();
3697
+        Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
36493698         
36503699         boolean thesame = false;
36513700         
3652
-        // Quick heuristic using length. Works only when stream is compressed.
3653
-        if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3654
-        {
3655
-            thesame = true;
3656
-        }
3701
+//        if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3702
+//        {
3703
+//            thesame = true;
3704
+//        }
36573705         
36583706         //EditorFrame.m_MainFrame.requestFocusInWindow();
36593707         if (!thesame)
....@@ -3712,6 +3760,9 @@
37123760         
37133761         copy.clear();
37143762         
3763
+        copy.skyboxname = obj.skyboxname;
3764
+        copy.skyboxext = obj.skyboxext;
3765
+                
37153766         for (int i=0; i<obj.Size(); i++)
37163767         {
37173768             copy.add(obj.get(i));
....@@ -3810,7 +3861,7 @@
38103861 
38113862         copy.versionindex -= 1;
38123863 
3813
-        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3864
+        CopyChanged((Object3D)copy.versions[copy.versionindex]);
38143865         
38153866         return true;
38163867     }
....@@ -3827,7 +3878,8 @@
38273878             return false;
38283879         }
38293880 
3830
-        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3881
+        //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3882
+        CopyChanged(copy.versions[copy.versionindex]);
38313883         
38323884         return true;
38333885     }
....@@ -3864,7 +3916,7 @@
38643916 
38653917         copy.versionindex += 1;
38663918 
3867
-        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3919
+        CopyChanged(copy.versions[copy.versionindex]);
38683920         
38693921         //if (!tab.user[tab.versionindex])
38703922         //    tab.graphs[tab.versionindex] = null;
....@@ -4177,7 +4229,7 @@
41774229             
41784230             if (copy.versions[version] != null)
41794231             {
4180
-                CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
4232
+                CopyChanged(copy.versions[copy.versionindex = version]);
41814233             }
41824234             
41834235             return;
....@@ -4772,7 +4824,9 @@
47724824             readobj.ResetDisplayList();
47734825         } catch (Exception e)
47744826         {
4775
-            //e.printStackTrace();
4827
+            if (!e.toString().contains("GZIP"))
4828
+                e.printStackTrace();
4829
+            
47764830             try
47774831             {
47784832                 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4852,6 +4906,8 @@
48524906             {
48534907                 //readobj.deepCopySelf(copy);
48544908                 copy.clear(); // june 2014
4909
+                copy.skyboxname = readobj.skyboxname;
4910
+                copy.skyboxext = readobj.skyboxext;
48554911                 for (int i = 0; i < readobj.size(); i++)
48564912                 {
48574913                     Object3D child = readobj.get(i); // reserve(i);
....@@ -4892,6 +4948,7 @@
48924948                 }
48934949             } catch (ClassCastException e)
48944950             {
4951
+                e.printStackTrace();
48954952                 assert (false);
48964953                 Composite c = (Composite) copy;
48974954                 c.children.clear();
....@@ -4907,7 +4964,7 @@
49074964             
49084965         if (copy.versions == null)
49094966         {
4910
-            copy.versions = new byte[100][];
4967
+            copy.versions = new Object3D[100];
49114968             copy.versionindex = -1;
49124969         }
49134970         
....@@ -5022,6 +5079,7 @@
50225079             //ps.print(buffer.toString());
50235080         } catch (IOException e)
50245081         {
5082
+            e.printStackTrace();
50255083         }
50265084     }
50275085