blame | history | patch | commit | commitdiff
Normand Briere
2019-07-19 e79247ef52a0bbb3864d46bb1e2c716005b3ecf3 
 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
+    private 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() != 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
+            }
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 
....@@ -309,7 +307,7 @@
309307         //localCopy.parent = null;
310308 
311309         frame = new JFrame();
312
-                frame.setUndecorated(true);
310
+                frame.setUndecorated(false);
313311         objEditor = this;
314312         this.callee = callee;
315313 
....@@ -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
....@@ -350,7 +354,7 @@
350354         frame.setMenuBar(menuBar = new MenuBar());
351355         menuBar.add(fileMenu = new Menu("File"));
352356         fileMenu.add(newItem = new MenuItem("New"));
353
-        fileMenu.add(loadItem = new MenuItem("Open..."));
357
+        fileMenu.add(openItem = new MenuItem("Open..."));
354358         
355359                 //oe.menuBar.add(menu = new Menu("Include"));
356360         Menu menu = new Menu("Import");
....@@ -382,7 +386,7 @@
382386         }
383387 
384388         newItem.addActionListener(this);
385
-        loadItem.addActionListener(this);
389
+        openItem.addActionListener(this);
386390         saveItem.addActionListener(this);
387391         saveAsItem.addActionListener(this);
388392         exportAsItem.addActionListener(this);
....@@ -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         
....@@ -432,10 +437,10 @@
432437         editPanel.add(ctrlPanel);
433438                 
434439         toolboxPanel = new cGridBag().setVertical(false);
435
-        toolboxPanel.setName("Toolbox");
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,14 +448,15 @@
443448 
444449         infoarea.setEditable(true);
445450         SetText();
451
+        
446452 //            infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447453 //            infoarea.setOpaque(false);
448454 //            //infoarea.setForeground(textcolor);
449455 // TEXTAREA           infoarea.setLineWrap(true);
450456 // TEXTAREA           infoarea.setWrapStyleWord(true);
451457         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452
-        infoPanel.setPreferredSize(new Dimension(50, 200));
453
-        infoPanel.setName("Info");
458
+        infoPanel.setPreferredSize(new Dimension(1, 1));
459
+        //infoPanel.setName("Info");
454460         //infoPanel.setLayout(new BorderLayout());
455461         //infoPanel.add(createTextPane());
456462 
....@@ -463,10 +469,11 @@
463469         mainPanel.setResizeWeight(0.5);
464470         
465471 //mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
466
-//    BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
467
-//    divider.setDividerSize(15);
468
-//    divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));    
472
+    BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
473
+    divider.setDividerSize(15);
474
+    divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));    
469475     
476
+    mainPanel.setUI(new BasicSplitPaneUI());
470477     
471478         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
472479         //mainPanel.setLayout(new GridBagLayout());
....@@ -698,8 +705,8 @@
698705         }
699706     }
700707 
701
-static GraphicsDevice device = GraphicsEnvironment
702
-        .getLocalGraphicsEnvironment().getScreenDevices()[0];
708
+//static GraphicsDevice device = GraphicsEnvironment
709
+//        .getLocalGraphicsEnvironment().getScreenDevices()[0];
703710 
704711     Rectangle keeprect;
705712         cRadio radio;
....@@ -720,10 +727,19 @@
720727         void Minimize()
721728         {
722729             frame.setState(Frame.ICONIFIED);
730
+            frame.validate();
723731         }
724732         
733
+//        artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
734
+//        artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
735
+//        artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
725736         void Maximize()
726737         {
738
+            if (CameraPane.FULLSCREEN)
739
+            {
740
+                ToggleFullScreen();
741
+            }
742
+            
727743             if (maximized)
728744             {
729745                 frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
....@@ -731,22 +747,36 @@
731747             else
732748             {
733749                 keeprect = frame.getBounds();
734
-                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
735
-                Dimension rect2 = frame.getToolkit().getScreenSize();
736
-                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
750
+//                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
751
+//                Dimension rect2 = frame.getToolkit().getScreenSize();
752
+//                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
737753 //                frame.setState(Frame.MAXIMIZED_BOTH);
754
+                frame.setBounds(frame.getGraphicsConfiguration().getBounds());
738755             }
739756             
740757             maximized ^= true;
758
+            
759
+            frame.validate();
741760         }
761
+        
762
+	cButton minButton;
763
+	cButton maxButton;
764
+	cButton fullButton;
742765         
743766         void ToggleFullScreen()
744767         {
768
+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
769
+
745770                 cameraView.ToggleFullScreen();
746771                 
747772                 if (!CameraPane.FULLSCREEN)
748773                 {
749774                     device.setFullScreenWindow(null);
775
+                    frame.dispose();
776
+                frame.setUndecorated(false);
777
+            frame.validate();
778
+                    frame.setVisible(true);
779
+                    
750780                     //frame.setVisible(false);
751781 //                frame.removeNotify();
752782 //                frame.setUndecorated(false);
....@@ -756,7 +786,7 @@
756786 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
757787 // X                   framePanel.add(bigThree);
758788 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
759
-                    framePanel.setDividerLocation(1);
789
+                    framePanel.setDividerLocation(46);
760790                     
761791                     //frame.setVisible(true);
762792                     radio.layout = keepButton;
....@@ -771,7 +801,12 @@
771801 //                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
772802 //                        frame.getToolkit().getScreenSize().height);
773803                     //frame.setVisible(false);
804
+                    
805
+            frame.dispose();
806
+                frame.setUndecorated(true);
774807                     device.setFullScreenWindow(frame);
808
+            frame.validate();
809
+                    frame.setVisible(true);
775810 //                frame.removeNotify();
776811 //                frame.setUndecorated(true);
777812 //                frame.addNotify();
....@@ -784,7 +819,30 @@
784819                     radio.layout.doClick();
785820                     //frame.setVisible(true);
786821                 }
822
+            frame.validate();
787823         }
824
+
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
+    }
788846 
789847     private JTextPane createTextPane()
790848     {
....@@ -1116,7 +1174,7 @@
11161174             namePanel = new cGridBag();
11171175             
11181176         nameField = AddText(namePanel, copy.GetName());
1119
-        namePanel.add(nameField);
1177
+        namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
11201178         oe.ctrlPanel.add(namePanel);
11211179         
11221180         oe.ctrlPanel.Return();
....@@ -1141,13 +1199,14 @@
11411199         rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
11421200         rewindCB.setToolTipText("Rewind animation");
11431201         
1144
-        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1202
+        randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
11451203         randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11461204 
1205
+        link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1206
+        link2masterCB.setToolTipText("Attach to support");
1207
+        
11471208         if (Globals.ADVANCED)
11481209         {
1149
-                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1150
-                link2masterCB.setToolTipText("Attach to support");
11511210                 speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
11521211                 speedupCB.setToolTipText("Option motion capture");
11531212         }
....@@ -1421,6 +1480,7 @@
14211480         XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
14221481         XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
14231482         XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1483
+        //XYZPanel.setName("XYZ");
14241484 
14251485         /*
14261486         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1458,13 +1518,23 @@
14581518         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
14591519         //tmp.setName("Edit");
14601520         objectPanel.add(materialPanel);
1521
+        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
14611522 //        JPanel north = new JPanel(new BorderLayout());
14621523 //        north.setName("Edit");
14631524 //        north.add(ctrlPanel, BorderLayout.NORTH);
14641525 //        objectPanel.add(north);
14651526         objectPanel.add(editPanel);
1466
-        objectPanel.add(infoPanel);
1527
+        objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1528
+        
1529
+        //if (Globals.ADVANCED)
1530
+            objectPanel.add(infoPanel);
1531
+        objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1532
+        
1533
+        objectPanel.add(XYZPanel);
1534
+        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1535
+        
14671536         objectPanel.add(toolboxPanel);
1537
+        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
14681538 
14691539         /*
14701540         aConstraints.gridx = 0;
....@@ -1485,7 +1555,7 @@
14851555         scrollpane.addMouseWheelListener(this); // Default not fast enough
14861556 
14871557         /*JTabbedPane*/ scenePanel = new cGridBag();
1488
-        scenePanel.preferredWidth = 6;
1558
+        scenePanel.preferredWidth = 5;
14891559         
14901560         JTabbedPane tabbedPane = new JTabbedPane();
14911561         tabbedPane.add(scrollpane);
....@@ -1563,7 +1633,7 @@
15631633         bigThree = new cGridBag();
15641634         bigThree.addComponent(scenePanel);
15651635         bigThree.addComponent(centralPanel);
1566
-        bigThree.addComponent(XYZPanel);
1636
+        //bigThree.addComponent(XYZPanel);
15671637         
15681638 //                // SIDE EFFECT!!!
15691639 //		aConstraints.gridx = 0;
....@@ -1572,9 +1642,9 @@
15721642 //		aConstraints.gridheight = 1;
15731643 
15741644         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1575
-        framePanel.setContinuousLayout(true);
1576
-        framePanel.setOneTouchExpandable(true);
1577
-        framePanel.setDividerLocation(0.8);
1645
+        framePanel.setContinuousLayout(false);
1646
+        framePanel.setOneTouchExpandable(false);
1647
+        //.setDividerLocation(0.8);
15781648         //framePanel.setDividerSize(15);
15791649         //framePanel.setResizeWeight(0.15);
15801650         framePanel.setName("Frame");
....@@ -1593,12 +1663,13 @@
15931663 
15941664         frame.setSize(1280, 860);
15951665         
1596
-        frame.validate();
1597
-        frame.setVisible(true);
1598
-
15991666                     cameraView.requestFocusInWindow();
16001667                     
16011668         gridPanel.setDividerLocation(1.0);
1669
+        
1670
+        frame.validate();
1671
+
1672
+        frame.setVisible(true);
16021673 
16031674         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16041675         frame.addWindowListener(new WindowAdapter()
....@@ -1685,24 +1756,6 @@
16851756                 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
16861757         colorSection.add(texture);
16871758 
1688
-        cGridBag anisoU = new cGridBag();
1689
-                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1690
-                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1691
-                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1692
-        colorSection.add(anisoU);
1693
-
1694
-        cGridBag anisoV = new cGridBag();
1695
-                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1696
-                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1697
-                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1698
-        colorSection.add(anisoV);
1699
-
1700
-        cGridBag shadowbias = new cGridBag();
1701
-                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1702
-                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1703
-                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1704
-        colorSection.add(shadowbias);
1705
-
17061759         panel.add(new JSeparator());
17071760         
17081761         panel.add(colorSection);
....@@ -1752,6 +1805,12 @@
17521805                 fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17531806                 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
17541807         diffuseSection.add(fakedepth);
1808
+
1809
+        cGridBag shadowbias = new cGridBag();
1810
+                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1811
+                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1812
+                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1813
+        diffuseSection.add(shadowbias);
17551814 
17561815         panel.add(new JSeparator());
17571816         
....@@ -1803,6 +1862,18 @@
18031862 //		aConstraints.gridy += 1;
18041863 //		aConstraints.gridwidth = 1;
18051864 
1865
+        cGridBag anisoU = new cGridBag();
1866
+                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1867
+                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1868
+                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1869
+        specularSection.add(anisoU);
1870
+
1871
+        cGridBag anisoV = new cGridBag();
1872
+                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1873
+                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1874
+                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1875
+        specularSection.add(anisoV);
1876
+
18061877 
18071878         panel.add(new JSeparator());
18081879         
....@@ -1810,35 +1881,35 @@
18101881         
18111882         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
18121883         
1813
-        cGridBag globalSection = new cGridBag().setVertical(true);
1884
+        //cGridBag globalSection = new cGridBag().setVertical(true);
18141885 
18151886         cGridBag camera = new cGridBag();
18161887                 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
18171888                 cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18181889                 camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1819
-        globalSection.add(camera);
1890
+        colorSection.add(camera);
18201891 
18211892         cGridBag ambient = new cGridBag();
18221893                 ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
18231894                 ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18241895                 ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1825
-        globalSection.add(ambient);
1896
+        colorSection.add(ambient);
18261897 
18271898         cGridBag backlit = new cGridBag();
18281899                 backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
18291900                 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18301901                 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1831
-        globalSection.add(backlit);
1902
+        colorSection.add(backlit);
18321903 
18331904         cGridBag opacity = new cGridBag();
18341905                 opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
18351906                 opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18361907                 opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1837
-        globalSection.add(opacity);
1908
+        colorSection.add(opacity);
18381909 
1839
-        panel.add(new JSeparator());
1910
+        //panel.add(new JSeparator());
18401911         
1841
-        panel.add(globalSection);
1912
+        //panel.add(globalSection);
18421913         
18431914         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
18441915         
....@@ -1945,8 +2016,9 @@
19452016             // 3D models
19462017             if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
19472018             {
1948
-                lastConverter = new com.jmex.model.converters.MaxToJme();
1949
-                LoadFile(filename, lastConverter);
2019
+                //lastConverter = new com.jmex.model.converters.MaxToJme();
2020
+                //LoadFile(filename, lastConverter);
2021
+                LoadObjFile(filename); // New 3ds loader
19502022                 continue;
19512023             }
19522024             if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -2672,6 +2744,7 @@
26722744                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
26732745                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
26742746             }
2747
+            
26752748             //cJME.count++;
26762749             //cJME.count %= 12;
26772750             if (gc)
....@@ -2855,6 +2928,7 @@
28552928             }
28562929         }
28572930     }
2931
+    
28582932     cFileSystemPane FSPane;
28592933 
28602934     void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2908,6 +2982,7 @@
29082982                 }
29092983             }
29102984         }
2985
+        
29112986         freezematerial = false;
29122987     }
29132988 
....@@ -3360,9 +3435,9 @@
33603435         {
33613436             Close();
33623437             //return true;
3363
-        } else if (source == loadItem)
3438
+        } else if (source == openItem)
33643439         {
3365
-            load();
3440
+            Open();
33663441             //return true;
33673442         } else if (source == newItem)
33683443         {
....@@ -3387,6 +3462,10 @@
33873462         {
33883463             generatePOV();
33893464             //return true;
3465
+        } else if (event.getSource() == archiveItem)
3466
+        {
3467
+            cTools.Archive(frame);
3468
+            return;
33903469         } else if (source == zBufferItem)
33913470         {
33923471             try
....@@ -3438,8 +3517,8 @@
34383517         try
34393518         {
34403519             ByteArrayOutputStream baos = new ByteArrayOutputStream();
3441
-            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3442
-            ObjectOutputStream out = new ObjectOutputStream(zstream);
3520
+//            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3521
+            ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
34433522 
34443523         Object3D parent = o.parent;
34453524         o.parent = null;
....@@ -3450,10 +3529,14 @@
34503529         
34513530             out.flush();
34523531 
3453
-            zstream.close();
3532
+            baos //zstream
3533
+                    .close();
34543534             out.close();
34553535             
3456
-            return baos.toByteArray();
3536
+            byte[] bytes = baos.toByteArray();
3537
+            
3538
+        System.out.println("save #bytes = " + bytes.length);
3539
+            return bytes;
34573540         } catch (Exception e)
34583541         {
34593542             System.err.println(e);
....@@ -3463,13 +3546,16 @@
34633546 
34643547     static public Object Uncompress(byte[] bytes)
34653548     {
3466
-        System.out.println("#bytes = " + bytes.length);
3549
+        System.out.println("restore #bytes = " + bytes.length);
34673550         try
34683551         {
34693552             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3470
-            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3471
-            ObjectInputStream in = new ObjectInputStream(istream);
3553
+            //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3554
+            ObjectInputStream in = new ObjectInputStream(bais); // istream);
34723555             Object obj = in.readObject();
3556
+            
3557
+            bais //istream
3558
+                    .close();
34733559             in.close();
34743560             
34753561             return obj;
....@@ -3524,31 +3610,67 @@
35243610         return null;
35253611     }
35263612     
3527
-    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35283613     
35293614     public void Save()
3615
+    {
3616
+        //Save(true);
3617
+        Replace();
3618
+    }
3619
+    
3620
+    private boolean Equal(byte[] compress, byte[] name)
3621
+    {
3622
+        if (compress.length != name.length)
3623
+        {
3624
+            return false;
3625
+        }
3626
+        
3627
+        for (int i=compress.length; --i>=0;)
3628
+        {
3629
+            if (compress[i] != name[i])
3630
+                return false;
3631
+        }
3632
+        
3633
+        return true;
3634
+    }
3635
+
3636
+    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3637
+    
3638
+    public boolean Save(boolean user)
35303639     {
35313640         System.err.println("Save");
35323641         
35333642         cRadio tab = GetCurrentTab();
35343643         
3535
-        boolean temp = CameraPane.SWITCH;
3536
-        CameraPane.SWITCH = false;
3644
+        byte[] compress = CompressCopy();
35373645         
3538
-        copy.ExtractBigData(hashtable);
3646
+        boolean thesame = false;
3647
+        
3648
+        // Quick heuristic using length. Works only when stream is compressed.
3649
+        if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3650
+        {
3651
+            thesame = true;
3652
+        }
35393653         
35403654         //EditorFrame.m_MainFrame.requestFocusInWindow();
3541
-        tab.graphs[tab.undoindex++] = Compress(copy);
3655
+        if (!thesame)
3656
+        {
3657
+            //tab.user[tab.versionindex] = user;
3658
+            //boolean increment = true; // tab.graphs[tab.versionindex] == null;
3659
+            
3660
+            copy.versions[++copy.versionindex] = compress;
3661
+            
3662
+            // if (increment)
3663
+            //     tab.versionindex++;
3664
+        }
35423665 
3543
-        copy.RestoreBigData(hashtable);
3666
+        //copy.RestoreBigData(versiontable);
35443667 
3545
-        CameraPane.SWITCH = temp;
3546
-        
35473668         //assert(hashtable.isEmpty());
35483669         
3549
-        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3670
+        for (int i = copy.versionindex+1; i < copy.versions.length; i++)
35503671         {
3551
-            tab.graphs[i] = null;
3672
+            //tab.user[i] = false;
3673
+            copy.versions[i] = null;
35523674         }
35533675 
35543676         SetUndoStates();
....@@ -3558,7 +3680,7 @@
35583680         {
35593681             try
35603682             {
3561
-                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3683
+                FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
35623684                 ObjectOutputStream p = new ObjectOutputStream(ostream);
35633685 
35643686                 p.writeObject(copy);
....@@ -3571,6 +3693,8 @@
35713693                 e.printStackTrace();
35723694             }
35733695         }
3696
+        
3697
+        return !thesame;
35743698     }
35753699 
35763700     void CopyChanged(Object3D obj)
....@@ -3580,7 +3704,7 @@
35803704         boolean temp = CameraPane.SWITCH;
35813705         CameraPane.SWITCH = false;
35823706         
3583
-        copy.ExtractBigData(hashtable);
3707
+        copy.ExtractBigData(versiontable);
35843708         
35853709         copy.clear();
35863710         
....@@ -3589,7 +3713,7 @@
35893713             copy.add(obj.get(i));
35903714         }
35913715         
3592
-        copy.RestoreBigData(hashtable);
3716
+        copy.RestoreBigData(versiontable);
35933717         
35943718         CameraPane.SWITCH = temp;
35953719         
....@@ -3617,52 +3741,129 @@
36173741     }
36183742     
36193743     cButton undoButton;
3744
+    cButton restoreButton;
3745
+    cButton replaceButton;
36203746     cButton redoButton;
36213747         
3748
+    boolean muteSlider;
3749
+    
3750
+    int VersionCount()
3751
+    {
3752
+        int count = 0;
3753
+        
3754
+        for (int i = copy.versions.length; --i >= 0;)
3755
+        {
3756
+            if (copy.versions[i] != null)
3757
+                count++;
3758
+        }
3759
+        
3760
+        return count;
3761
+    }
3762
+    
36223763     void SetUndoStates()
36233764     {
36243765         cRadio tab = GetCurrentTab();
36253766         
3626
-        undoButton.setEnabled(tab.undoindex > 0);
3627
-        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
3767
+        restoreButton.setEnabled(copy.versionindex != -1);
3768
+        replaceButton.setEnabled(copy.versionindex != -1);
3769
+        
3770
+        undoButton.setEnabled(copy.versionindex > 0);
3771
+        redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3772
+        
3773
+        muteSlider = true;
3774
+        versionSlider.setMaximum(VersionCount() - 1);
3775
+        versionSlider.setInteger(copy.versionindex);
3776
+        muteSlider = false;
36283777     }
36293778     
3630
-    public void Undo()
3779
+    public boolean Undo()
36313780     {
3781
+        // Option?
3782
+        Replace();
3783
+        
36323784         System.err.println("Undo");
36333785         
36343786         cRadio tab = GetCurrentTab();
36353787         
3636
-        if (tab.undoindex == 0)
3788
+        if (copy.versionindex == 0)
36373789         {
36383790             java.awt.Toolkit.getDefaultToolkit().beep();
3639
-            return;
3791
+            return false;
36403792         }
36413793 
3642
-        if (tab.graphs[tab.undoindex] == null)
3794
+//        if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
3795
+//        {
3796
+//            if (Save(false))
3797
+//                tab.versionindex -= 1;
3798
+//            else
3799
+//            {
3800
+//                if (tab.versionindex <= 0)
3801
+//                    return false;
3802
+//                else
3803
+//                    tab.versionindex -= 1;
3804
+//            }
3805
+//        }
3806
+
3807
+        copy.versionindex -= 1;
3808
+
3809
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3810
+        
3811
+        return true;
3812
+    }
3813
+
3814
+    public boolean Restore()
3815
+    {
3816
+        System.err.println("Restore");
3817
+        
3818
+        cRadio tab = GetCurrentTab();
3819
+        
3820
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
36433821         {
3644
-            Save();
3645
-            tab.undoindex -= 1;
3822
+            java.awt.Toolkit.getDefaultToolkit().beep();
3823
+            return false;
36463824         }
36473825 
3648
-        tab.undoindex -= 1;
3826
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3827
+        
3828
+        return true;
3829
+    }
36493830 
3650
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3831
+    public boolean Replace()
3832
+    {
3833
+        System.err.println("Replace");
3834
+        
3835
+        cRadio tab = GetCurrentTab();
3836
+        
3837
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
3838
+        {
3839
+            // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3840
+            return false;
3841
+        }
3842
+
3843
+        copy.versions[copy.versionindex] = CompressCopy();
3844
+        
3845
+        return true;
36513846     }
36523847 
36533848     public void Redo()
36543849     {
3850
+        // Option?
3851
+        Replace();
3852
+        
36553853         cRadio tab = GetCurrentTab();
36563854         
3657
-        if (tab.graphs[tab.undoindex + 1] == null)
3855
+        if (copy.versions[copy.versionindex + 1] == null)
36583856         {
36593857             java.awt.Toolkit.getDefaultToolkit().beep();
36603858             return;
36613859         }
36623860 
3663
-        tab.undoindex += 1;
3861
+        copy.versionindex += 1;
36643862 
3665
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3863
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3864
+        
3865
+        //if (!tab.user[tab.versionindex])
3866
+        //    tab.graphs[tab.versionindex] = null;
36663867     }
36673868 
36683869         void ImportGFD()
....@@ -3958,9 +4159,25 @@
39584159         //copy.Touch();
39594160     }
39604161 
4162
+    cNumberSlider versionSlider;
4163
+    
39614164     public void stateChanged(ChangeEvent e)
39624165     {
39634166         //    assert(false);
4167
+        if (e.getSource() == versionSlider)
4168
+        {
4169
+            if (muteSlider)
4170
+                return;
4171
+            
4172
+            int version = versionSlider.getInteger();
4173
+            
4174
+            if (copy.versions[version] != null)
4175
+            {
4176
+                CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
4177
+            }
4178
+            
4179
+            return;
4180
+        }
39644181 
39654182         if (freezematerial)
39664183         {
....@@ -4309,7 +4526,7 @@
43094526 
43104527     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
43114528     {
4312
-        if (Globals.SAVEONMAKE) // && resetmodel)
4529
+        if (Globals.REPLACEONMAKE) // && resetmodel)
43134530             Save();
43144531         //Tween.set(thing, 0).target(1).start(tweenManager);
43154532         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4625,8 +4842,8 @@
46254842         
46264843         if (readobj != null)
46274844         {
4628
-        if (Globals.SAVEONMAKE)
4629
-            Save();
4845
+        //if (Globals.SAVEONMAKE) // A new object cannot share meshes
4846
+        //    Save();
46304847             try
46314848             {
46324849                 //readobj.deepCopySelf(copy);
....@@ -4681,13 +4898,24 @@
46814898                 c.addChild(csg);
46824899             }
46834900 
4901
+            copy.versions = readobj.versions;
4902
+            copy.versionindex = readobj.versionindex;
4903
+            
4904
+        if (copy.versions == null)
4905
+        {
4906
+            copy.versions = new byte[100][];
4907
+            copy.versionindex = -1;
4908
+        }
4909
+        
4910
+            //? SetUndoStates();
4911
+            
46844912             ResetModel();
46854913             copy.HardTouch(); // recompile?
46864914             refreshContents();
46874915         }
46884916     }
46894917 
4690
-    void load() // throws ClassNotFoundException
4918
+    void Open() // throws ClassNotFoundException
46914919     {
46924920         if (Grafreed.standAlone)
46934921         {
....@@ -4972,7 +5200,7 @@
49725200     MenuBar menuBar;
49735201     Menu fileMenu;
49745202     MenuItem newItem;
4975
-    MenuItem loadItem;
5203
+    MenuItem openItem;
49765204     MenuItem saveItem;
49775205     MenuItem saveAsItem;
49785206     MenuItem exportAsItem;
....@@ -4995,6 +5223,7 @@
49955223     CheckboxMenuItem toggleSwitchItem;
49965224     CheckboxMenuItem toggleRootItem;
49975225     CheckboxMenuItem animationItem;
5226
+    MenuItem archiveItem;
49985227     CheckboxMenuItem toggleHandleItem;
49995228     CheckboxMenuItem togglePaintItem;
50005229     JSplitPane mainPanel;