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
....@@ -282,6 +268,12 @@
282268         client = inClient;
283269         copy = client;
284270 
271
+        if (copy.versions == null)
272
+        {
273
+            copy.versions = new byte[100][];
274
+            copy.versionindex = -1;
275
+        }
276
+        
285277         // "this" is not called: SetupUI2(objEditor);
286278     }
287279 
....@@ -295,6 +287,12 @@
295287         client = inClient;
296288         copy = client;
297289 
290
+        if (copy.versions == null)
291
+        {
292
+            copy.versions = new byte[100][];
293
+            copy.versionindex = -1;
294
+        }
295
+        
298296         SetupUI2(callee.GetEditor());
299297     }
300298 
....@@ -327,6 +325,12 @@
327325         copy = localCopy;
328326         copy.editWindow = this;
329327 
328
+        if (copy.versions == null)
329
+        {
330
+//            copy.versions = new byte[100][];
331
+//            copy.versionindex = -1;
332
+        }
333
+        
330334         SetupMenu();
331335 
332336         //SetupName(objEditor); // new
....@@ -419,11 +423,12 @@
419423     
420424         toolbarPanel = new JPanel();
421425         toolbarPanel.setName("Toolbar");
426
+        
422427         treePanel = new cGridBag();
423428         treePanel.setName("Tree");
424429         
425430         editPanel = new cGridBag().setVertical(true);
426
-        editPanel.setName("Edit");
431
+        //editPanel.setName("Edit");
427432         
428433         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429434         
....@@ -431,11 +436,11 @@
431436         editPanel.add(editCommandsPanel);
432437         editPanel.add(ctrlPanel);
433438                 
434
-        toolboxPanel = new cGridBag().setVertical(false);
435
-        toolboxPanel.setName("Toolbox");
439
+        toolboxPanel = new cGridBag().setVertical(true);
440
+        //toolboxPanel.setName("Toolbox");
436441         
437442         materialPanel = new cGridBag().setVertical(true);
438
-        materialPanel.setName("Material");
443
+        //materialPanel.setName("Material");
439444         
440445         /*JTextPane*/
441446         infoarea = createTextPane();
....@@ -443,6 +448,7 @@
443448 
444449         infoarea.setEditable(true);
445450         SetText();
451
+        
446452 //            infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447453 //            infoarea.setOpaque(false);
448454 //            //infoarea.setForeground(textcolor);
....@@ -450,7 +456,7 @@
450456 // TEXTAREA           infoarea.setWrapStyleWord(true);
451457         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452458         infoPanel.setPreferredSize(new Dimension(1, 1));
453
-        infoPanel.setName("Info");
459
+        //infoPanel.setName("Info");
454460         //infoPanel.setLayout(new BorderLayout());
455461         //infoPanel.add(createTextPane());
456462 
....@@ -968,7 +974,7 @@
968974 //    NumberSlider vDivsField;
969975 //    JCheckBox endcaps;
970976     JCheckBox liveCB;
971
-    JCheckBox selectCB;
977
+    JCheckBox selectableCB;
972978     JCheckBox hideCB;
973979     JCheckBox link2masterCB;
974980     JCheckBox markCB;
....@@ -1180,13 +1186,16 @@
11801186             
11811187         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
11821188                 liveCB.setToolTipText("Animate object");
1183
-        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1184
-                selectCB.setToolTipText("Make object selectable");
1189
+        selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190
+                selectableCB.setToolTipText("Make object selectable");
11851191 //            Return();
1192
+                
11861193         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
11871194                 hideCB.setToolTipText("Hide object");
11881195         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
11891196         markCB.setToolTipText("As animation target transform");
1197
+        
1198
+        ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
11901199         
11911200             setupPanel2 = new cGridBag().setVertical(false);
11921201             
....@@ -1474,6 +1483,7 @@
14741483         XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
14751484         XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
14761485         XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1486
+        //XYZPanel.setName("XYZ");
14771487 
14781488         /*
14791489         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1511,16 +1521,23 @@
15111521         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15121522         //tmp.setName("Edit");
15131523         objectPanel.add(materialPanel);
1524
+        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
15141525 //        JPanel north = new JPanel(new BorderLayout());
15151526 //        north.setName("Edit");
15161527 //        north.add(ctrlPanel, BorderLayout.NORTH);
15171528 //        objectPanel.add(north);
15181529         objectPanel.add(editPanel);
1530
+        objectPanel.setIconAt(1, GetIcon("icons/write.png"));
15191531         
15201532         //if (Globals.ADVANCED)
15211533             objectPanel.add(infoPanel);
1534
+        objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1535
+        
1536
+        objectPanel.add(XYZPanel);
1537
+        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
15221538         
15231539         objectPanel.add(toolboxPanel);
1540
+        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
15241541 
15251542         /*
15261543         aConstraints.gridx = 0;
....@@ -1541,7 +1558,7 @@
15411558         scrollpane.addMouseWheelListener(this); // Default not fast enough
15421559 
15431560         /*JTabbedPane*/ scenePanel = new cGridBag();
1544
-        scenePanel.preferredWidth = 6;
1561
+        scenePanel.preferredWidth = 5;
15451562         
15461563         JTabbedPane tabbedPane = new JTabbedPane();
15471564         tabbedPane.add(scrollpane);
....@@ -1617,9 +1634,9 @@
16171634         /**/
16181635 
16191636         bigThree = new cGridBag();
1620
-        bigThree.addComponent(scenePanel);
16211637         bigThree.addComponent(centralPanel);
1622
-        bigThree.addComponent(XYZPanel);
1638
+        bigThree.addComponent(scenePanel);
1639
+        //bigThree.addComponent(XYZPanel);
16231640         
16241641 //                // SIDE EFFECT!!!
16251642 //		aConstraints.gridx = 0;
....@@ -3236,7 +3253,7 @@
32363253         {
32373254             copy.live ^= true;
32383255             return;
3239
-        } else if (event.getSource() == selectCB)
3256
+        } else if (event.getSource() == selectableCB)
32403257         {
32413258             copy.dontselect ^= true;
32423259             return;
....@@ -3731,18 +3748,42 @@
37313748     cButton replaceButton;
37323749     cButton redoButton;
37333750         
3751
+    boolean muteSlider;
3752
+    
3753
+    int VersionCount()
3754
+    {
3755
+        int count = 0;
3756
+        
3757
+        for (int i = copy.versions.length; --i >= 0;)
3758
+        {
3759
+            if (copy.versions[i] != null)
3760
+                count++;
3761
+        }
3762
+        
3763
+        return count;
3764
+    }
3765
+    
37343766     void SetUndoStates()
37353767     {
37363768         cRadio tab = GetCurrentTab();
37373769         
37383770         restoreButton.setEnabled(copy.versionindex != -1);
37393771         replaceButton.setEnabled(copy.versionindex != -1);
3772
+        
37403773         undoButton.setEnabled(copy.versionindex > 0);
37413774         redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3775
+        
3776
+        muteSlider = true;
3777
+        versionSlider.setMaximum(VersionCount() - 1);
3778
+        versionSlider.setInteger(copy.versionindex);
3779
+        muteSlider = false;
37423780     }
37433781     
37443782     public boolean Undo()
37453783     {
3784
+        // Option?
3785
+        Replace();
3786
+        
37463787         System.err.println("Undo");
37473788         
37483789         cRadio tab = GetCurrentTab();
....@@ -3809,6 +3850,9 @@
38093850 
38103851     public void Redo()
38113852     {
3853
+        // Option?
3854
+        Replace();
3855
+        
38123856         cRadio tab = GetCurrentTab();
38133857         
38143858         if (copy.versions[copy.versionindex + 1] == null)
....@@ -4118,14 +4162,17 @@
41184162         //copy.Touch();
41194163     }
41204164 
4121
-    cNumberSlider versionField;
4165
+    cNumberSlider versionSlider;
41224166     
41234167     public void stateChanged(ChangeEvent e)
41244168     {
41254169         //    assert(false);
4126
-        if (e.getSource() == versionField)
4170
+        if (e.getSource() == versionSlider)
41274171         {
4128
-            int version = versionField.getInteger();
4172
+            if (muteSlider)
4173
+                return;
4174
+            
4175
+            int version = versionSlider.getInteger();
41294176             
41304177             if (copy.versions[version] != null)
41314178             {
....@@ -4724,7 +4771,9 @@
47244771             readobj.ResetDisplayList();
47254772         } catch (Exception e)
47264773         {
4727
-            //e.printStackTrace();
4774
+            if (!e.toString().contains("GZIP"))
4775
+                e.printStackTrace();
4776
+            
47284777             try
47294778             {
47304779                 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4804,6 +4853,8 @@
48044853             {
48054854                 //readobj.deepCopySelf(copy);
48064855                 copy.clear(); // june 2014
4856
+                copy.skyboxname = readobj.skyboxname;
4857
+                copy.skyboxext = readobj.skyboxext;
48074858                 for (int i = 0; i < readobj.size(); i++)
48084859                 {
48094860                     Object3D child = readobj.get(i); // reserve(i);
....@@ -4844,6 +4895,7 @@
48444895                 }
48454896             } catch (ClassCastException e)
48464897             {
4898
+                e.printStackTrace();
48474899                 assert (false);
48484900                 Composite c = (Composite) copy;
48494901                 c.children.clear();
....@@ -4857,7 +4909,13 @@
48574909             copy.versions = readobj.versions;
48584910             copy.versionindex = readobj.versionindex;
48594911             
4860
-            SetUndoStates();
4912
+        if (copy.versions == null)
4913
+        {
4914
+            copy.versions = new byte[100][];
4915
+            copy.versionindex = -1;
4916
+        }
4917
+        
4918
+            //? SetUndoStates();
48614919             
48624920             ResetModel();
48634921             copy.HardTouch(); // recompile?
....@@ -4968,6 +5026,7 @@
49685026             //ps.print(buffer.toString());
49695027         } catch (IOException e)
49705028         {
5029
+            e.printStackTrace();
49715030         }
49725031     }
49735032