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 
....@@ -816,6 +822,28 @@
816822             frame.validate();
817823         }
818824 
825
+    private byte[] CompressCopy()
826
+    {
827
+        boolean temp = CameraPane.SWITCH;
828
+        CameraPane.SWITCH = false;
829
+        
830
+        copy.ExtractBigData(versiontable);
831
+        // if (copy == client)
832
+        
833
+        byte[] versions[] = copy.versions;
834
+        copy.versions = null;
835
+        
836
+        byte[] compress = Compress(copy);
837
+        
838
+        copy.versions = versions;
839
+        
840
+        copy.RestoreBigData(versiontable);
841
+        
842
+        CameraPane.SWITCH = temp;
843
+        
844
+        return compress;
845
+    }
846
+
819847     private JTextPane createTextPane()
820848     {
821849 // TEXTAREA       String[] initString =
....@@ -946,7 +974,7 @@
946974 //    NumberSlider vDivsField;
947975 //    JCheckBox endcaps;
948976     JCheckBox liveCB;
949
-    JCheckBox selectCB;
977
+    JCheckBox selectableCB;
950978     JCheckBox hideCB;
951979     JCheckBox link2masterCB;
952980     JCheckBox markCB;
....@@ -1158,13 +1186,16 @@
11581186             
11591187         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
11601188                 liveCB.setToolTipText("Animate object");
1161
-        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162
-                selectCB.setToolTipText("Make object selectable");
1189
+        selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190
+                selectableCB.setToolTipText("Make object selectable");
11631191 //            Return();
1192
+                
11641193         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
11651194                 hideCB.setToolTipText("Hide object");
11661195         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
11671196         markCB.setToolTipText("As animation target transform");
1197
+        
1198
+        ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
11681199         
11691200             setupPanel2 = new cGridBag().setVertical(false);
11701201             
....@@ -1452,6 +1483,7 @@
14521483         XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
14531484         XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
14541485         XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1486
+        //XYZPanel.setName("XYZ");
14551487 
14561488         /*
14571489         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1489,16 +1521,23 @@
14891521         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
14901522         //tmp.setName("Edit");
14911523         objectPanel.add(materialPanel);
1524
+        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
14921525 //        JPanel north = new JPanel(new BorderLayout());
14931526 //        north.setName("Edit");
14941527 //        north.add(ctrlPanel, BorderLayout.NORTH);
14951528 //        objectPanel.add(north);
14961529         objectPanel.add(editPanel);
1530
+        objectPanel.setIconAt(1, GetIcon("icons/write.png"));
14971531         
14981532         //if (Globals.ADVANCED)
14991533             objectPanel.add(infoPanel);
1534
+        objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1535
+        
1536
+        objectPanel.add(XYZPanel);
1537
+        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
15001538         
15011539         objectPanel.add(toolboxPanel);
1540
+        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
15021541 
15031542         /*
15041543         aConstraints.gridx = 0;
....@@ -1519,7 +1558,7 @@
15191558         scrollpane.addMouseWheelListener(this); // Default not fast enough
15201559 
15211560         /*JTabbedPane*/ scenePanel = new cGridBag();
1522
-        scenePanel.preferredWidth = 6;
1561
+        scenePanel.preferredWidth = 5;
15231562         
15241563         JTabbedPane tabbedPane = new JTabbedPane();
15251564         tabbedPane.add(scrollpane);
....@@ -1595,9 +1634,9 @@
15951634         /**/
15961635 
15971636         bigThree = new cGridBag();
1598
-        bigThree.addComponent(scenePanel);
15991637         bigThree.addComponent(centralPanel);
1600
-        bigThree.addComponent(XYZPanel);
1638
+        bigThree.addComponent(scenePanel);
1639
+        //bigThree.addComponent(XYZPanel);
16011640         
16021641 //                // SIDE EFFECT!!!
16031642 //		aConstraints.gridx = 0;
....@@ -3214,7 +3253,7 @@
32143253         {
32153254             copy.live ^= true;
32163255             return;
3217
-        } else if (event.getSource() == selectCB)
3256
+        } else if (event.getSource() == selectableCB)
32183257         {
32193258             copy.dontselect ^= true;
32203259             return;
....@@ -3574,11 +3613,11 @@
35743613         return null;
35753614     }
35763615     
3577
-    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35783616     
35793617     public void Save()
35803618     {
3581
-        Save(true);
3619
+        //Save(true);
3620
+        Replace();
35823621     }
35833622     
35843623     private boolean Equal(byte[] compress, byte[] name)
....@@ -3597,25 +3636,20 @@
35973636         return true;
35983637     }
35993638 
3639
+    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3640
+    
36003641     public boolean Save(boolean user)
36013642     {
36023643         System.err.println("Save");
36033644         
36043645         cRadio tab = GetCurrentTab();
36053646         
3606
-        boolean temp = CameraPane.SWITCH;
3607
-        CameraPane.SWITCH = false;
3608
-        
3609
-        copy.ExtractBigData(hashtable);
3610
-        
3611
-        byte[] compress = Compress(copy);
3612
-
3613
-        CameraPane.SWITCH = temp;
3647
+        byte[] compress = CompressCopy();
36143648         
36153649         boolean thesame = false;
36163650         
36173651         // Quick heuristic using length. Works only when stream is compressed.
3618
-        if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
3652
+        if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
36193653         {
36203654             thesame = true;
36213655         }
....@@ -3623,23 +3657,23 @@
36233657         //EditorFrame.m_MainFrame.requestFocusInWindow();
36243658         if (!thesame)
36253659         {
3626
-            //tab.user[tab.undoindex] = user;
3627
-            boolean increment = tab.graphs[tab.undoindex] == null;
3660
+            //tab.user[tab.versionindex] = user;
3661
+            //boolean increment = true; // tab.graphs[tab.versionindex] == null;
36283662             
3629
-            tab.graphs[tab.undoindex] = compress;
3663
+            copy.versions[++copy.versionindex] = compress;
36303664             
3631
-            if (increment)
3632
-                tab.undoindex++;
3665
+            // if (increment)
3666
+            //     tab.versionindex++;
36333667         }
36343668 
3635
-        copy.RestoreBigData(hashtable);
3669
+        //copy.RestoreBigData(versiontable);
36363670 
36373671         //assert(hashtable.isEmpty());
36383672         
3639
-        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3673
+        for (int i = copy.versionindex+1; i < copy.versions.length; i++)
36403674         {
36413675             //tab.user[i] = false;
3642
-        //    tab.graphs[i] = null;
3676
+            copy.versions[i] = null;
36433677         }
36443678 
36453679         SetUndoStates();
....@@ -3649,7 +3683,7 @@
36493683         {
36503684             try
36513685             {
3652
-                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3686
+                FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
36533687                 ObjectOutputStream p = new ObjectOutputStream(ostream);
36543688 
36553689                 p.writeObject(copy);
....@@ -3673,7 +3707,7 @@
36733707         boolean temp = CameraPane.SWITCH;
36743708         CameraPane.SWITCH = false;
36753709         
3676
-        copy.ExtractBigData(hashtable);
3710
+        copy.ExtractBigData(versiontable);
36773711         
36783712         copy.clear();
36793713         
....@@ -3682,7 +3716,7 @@
36823716             copy.add(obj.get(i));
36833717         }
36843718         
3685
-        copy.RestoreBigData(hashtable);
3719
+        copy.RestoreBigData(versiontable);
36863720         
36873721         CameraPane.SWITCH = temp;
36883722         
....@@ -3710,64 +3744,129 @@
37103744     }
37113745     
37123746     cButton undoButton;
3747
+    cButton restoreButton;
3748
+    cButton replaceButton;
37133749     cButton redoButton;
37143750         
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
+    
37153766     void SetUndoStates()
37163767     {
37173768         cRadio tab = GetCurrentTab();
37183769         
3719
-        undoButton.setEnabled(tab.undoindex > 0);
3720
-        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
3770
+        restoreButton.setEnabled(copy.versionindex != -1);
3771
+        replaceButton.setEnabled(copy.versionindex != -1);
3772
+        
3773
+        undoButton.setEnabled(copy.versionindex > 0);
3774
+        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;
37213780     }
37223781     
37233782     public boolean Undo()
37243783     {
3784
+        // Option?
3785
+        Replace();
3786
+        
37253787         System.err.println("Undo");
37263788         
37273789         cRadio tab = GetCurrentTab();
37283790         
3729
-        if (tab.undoindex == 0)
3791
+        if (copy.versionindex == 0)
37303792         {
37313793             java.awt.Toolkit.getDefaultToolkit().beep();
37323794             return false;
37333795         }
37343796 
3735
-        if (tab.graphs[tab.undoindex] == null) // || !tab.user[tab.undoindex])
3797
+//        if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
3798
+//        {
3799
+//            if (Save(false))
3800
+//                tab.versionindex -= 1;
3801
+//            else
3802
+//            {
3803
+//                if (tab.versionindex <= 0)
3804
+//                    return false;
3805
+//                else
3806
+//                    tab.versionindex -= 1;
3807
+//            }
3808
+//        }
3809
+
3810
+        copy.versionindex -= 1;
3811
+
3812
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3813
+        
3814
+        return true;
3815
+    }
3816
+
3817
+    public boolean Restore()
3818
+    {
3819
+        System.err.println("Restore");
3820
+        
3821
+        cRadio tab = GetCurrentTab();
3822
+        
3823
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
37363824         {
3737
-            if (Save(false))
3738
-                tab.undoindex -= 1;
3739
-            else
3740
-            {
3741
-                if (tab.undoindex <= 0)
3742
-                    return false;
3743
-                else
3744
-                    tab.undoindex -= 1;
3745
-            }
3825
+            java.awt.Toolkit.getDefaultToolkit().beep();
3826
+            return false;
37463827         }
37473828 
3748
-        tab.undoindex -= 1;
3829
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3830
+        
3831
+        return true;
3832
+    }
37493833 
3750
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3834
+    public boolean Replace()
3835
+    {
3836
+        System.err.println("Replace");
3837
+        
3838
+        cRadio tab = GetCurrentTab();
3839
+        
3840
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
3841
+        {
3842
+            // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3843
+            return false;
3844
+        }
3845
+
3846
+        copy.versions[copy.versionindex] = CompressCopy();
37513847         
37523848         return true;
37533849     }
37543850 
37553851     public void Redo()
37563852     {
3853
+        // Option?
3854
+        Replace();
3855
+        
37573856         cRadio tab = GetCurrentTab();
37583857         
3759
-        if (tab.graphs[tab.undoindex + 1] == null)
3858
+        if (copy.versions[copy.versionindex + 1] == null)
37603859         {
37613860             java.awt.Toolkit.getDefaultToolkit().beep();
37623861             return;
37633862         }
37643863 
3765
-        tab.undoindex += 1;
3864
+        copy.versionindex += 1;
37663865 
3767
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3866
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
37683867         
3769
-        //if (!tab.user[tab.undoindex])
3770
-        //    tab.graphs[tab.undoindex] = null;
3868
+        //if (!tab.user[tab.versionindex])
3869
+        //    tab.graphs[tab.versionindex] = null;
37713870     }
37723871 
37733872         void ImportGFD()
....@@ -4063,9 +4162,25 @@
40634162         //copy.Touch();
40644163     }
40654164 
4165
+    cNumberSlider versionSlider;
4166
+    
40664167     public void stateChanged(ChangeEvent e)
40674168     {
40684169         //    assert(false);
4170
+        if (e.getSource() == versionSlider)
4171
+        {
4172
+            if (muteSlider)
4173
+                return;
4174
+            
4175
+            int version = versionSlider.getInteger();
4176
+            
4177
+            if (copy.versions[version] != null)
4178
+            {
4179
+                CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
4180
+            }
4181
+            
4182
+            return;
4183
+        }
40694184 
40704185         if (freezematerial)
40714186         {
....@@ -4414,7 +4529,7 @@
44144529 
44154530     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
44164531     {
4417
-        if (Globals.SAVEONMAKE) // && resetmodel)
4532
+        if (Globals.REPLACEONMAKE) // && resetmodel)
44184533             Save();
44194534         //Tween.set(thing, 0).target(1).start(tweenManager);
44204535         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4656,7 +4771,9 @@
46564771             readobj.ResetDisplayList();
46574772         } catch (Exception e)
46584773         {
4659
-            //e.printStackTrace();
4774
+            if (!e.toString().contains("GZIP"))
4775
+                e.printStackTrace();
4776
+            
46604777             try
46614778             {
46624779                 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4736,6 +4853,8 @@
47364853             {
47374854                 //readobj.deepCopySelf(copy);
47384855                 copy.clear(); // june 2014
4856
+                copy.skyboxname = readobj.skyboxname;
4857
+                copy.skyboxext = readobj.skyboxext;
47394858                 for (int i = 0; i < readobj.size(); i++)
47404859                 {
47414860                     Object3D child = readobj.get(i); // reserve(i);
....@@ -4776,6 +4895,7 @@
47764895                 }
47774896             } catch (ClassCastException e)
47784897             {
4898
+                e.printStackTrace();
47794899                 assert (false);
47804900                 Composite c = (Composite) copy;
47814901                 c.children.clear();
....@@ -4786,6 +4906,17 @@
47864906                 c.addChild(csg);
47874907             }
47884908 
4909
+            copy.versions = readobj.versions;
4910
+            copy.versionindex = readobj.versionindex;
4911
+            
4912
+        if (copy.versions == null)
4913
+        {
4914
+            copy.versions = new byte[100][];
4915
+            copy.versionindex = -1;
4916
+        }
4917
+        
4918
+            //? SetUndoStates();
4919
+            
47894920             ResetModel();
47904921             copy.HardTouch(); // recompile?
47914922             refreshContents();
....@@ -4895,6 +5026,7 @@
48955026             //ps.print(buffer.toString());
48965027         } catch (IOException e)
48975028         {
5029
+            e.printStackTrace();
48985030         }
48995031     }
49005032