blame | history | patch | commit | commitdiff
Normand Briere
2019-07-30 475f8cbdbd96fdbf8f5b216ffebb31a51f25c2f9 
 ObjEditor.java
....@@ -15,6 +15,9 @@
1515 //import javax.swing.plaf.ColorUIResource;
1616 //import javax.swing.plaf.metal.DefaultMetalTheme;
1717 
18
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
19
+import javax.swing.plaf.basic.BasicSplitPaneUI;
20
+
1821 //import javax.media.opengl.GLCanvas;
1922 
2023 import //weka.core.
....@@ -41,48 +44,47 @@
4144     
4245     cButton GetButton(String name, boolean border)
4346     {
44
-        try
45
-        {
46
-            ImageIcon icon = GetIcon(name);
47
-            return new cButton(icon, border);
48
-        }
49
-        catch (Exception e)
50
-        {
51
-            return new cButton(name, border);
52
-        }
47
+        ImageIcon icon = GetIcon(name);
48
+        return new cButton(icon, border);
49
+    }
50
+
51
+    cToggleButton GetToggleButton(String name, boolean border)
52
+    {
53
+        ImageIcon icon = GetIcon(name);
54
+        return new cToggleButton(icon, border);
5355     }
5456 
5557     cCheckBox GetCheckBox(String name, boolean border)
5658     {
59
+        ImageIcon icon = GetIcon(name);
60
+        return new cCheckBox(icon, border);
61
+    }
62
+
63
+    ImageIcon GetIcon(String name)
64
+    {
5765         try
5866         {
59
-            ImageIcon icon = GetIcon(name);
60
-            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;
6183         }
6284         catch (Exception e)
6385         {
64
-            return new cCheckBox(name, border);
86
+            return null;
6587         }
66
-    }
67
-
68
-    private ImageIcon GetIcon(String name) throws IOException
69
-    {
70
-        BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
71
-        
72
-        if (image.getWidth() != 24 && image.getHeight() != 24)
73
-        {
74
-            BufferedImage resized = new BufferedImage(24, 24, image.getType());
75
-            Graphics2D g = resized.createGraphics();
76
-            g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
77
-            //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
78
-            g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
79
-            g.dispose();
80
-            
81
-            image = resized;
82
-        }
83
-        
84
-        javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
85
-        return icon;
8688     }
8789     
8890     // SCRIPT
....@@ -194,7 +196,7 @@
194196         
195197         objEditor.ctrlPanel.remove(namePanel);
196198         
197
-        if (!GroupEditor.allparams)
199
+        if (!allparams)
198200             return;
199201         
200202 //        objEditor.ctrlPanel.remove(liveCB);
....@@ -266,6 +268,12 @@
266268         client = inClient;
267269         copy = client;
268270 
271
+        if (copy.versions == null)
272
+        {
273
+            copy.versions = new byte[100][];
274
+            copy.versionindex = -1;
275
+        }
276
+        
269277         // "this" is not called: SetupUI2(objEditor);
270278     }
271279 
....@@ -279,6 +287,12 @@
279287         client = inClient;
280288         copy = client;
281289 
290
+        if (copy.versions == null)
291
+        {
292
+            copy.versions = new byte[100][];
293
+            copy.versionindex = -1;
294
+        }
295
+        
282296         SetupUI2(callee.GetEditor());
283297     }
284298 
....@@ -293,7 +307,7 @@
293307         //localCopy.parent = null;
294308 
295309         frame = new JFrame();
296
-                frame.setUndecorated(true);
310
+                frame.setUndecorated(false);
297311         objEditor = this;
298312         this.callee = callee;
299313 
....@@ -311,6 +325,12 @@
311325         copy = localCopy;
312326         copy.editWindow = this;
313327 
328
+        if (copy.versions == null)
329
+        {
330
+//            copy.versions = new byte[100][];
331
+//            copy.versionindex = -1;
332
+        }
333
+        
314334         SetupMenu();
315335 
316336         //SetupName(objEditor); // new
....@@ -324,12 +344,17 @@
324344         return frame.action(event, obj);
325345     }
326346 
347
+    // Cannot work without static
348
+    static boolean allparams = true;
349
+
350
+    static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
351
+
327352     void SetupMenu()
328353     {
329354         frame.setMenuBar(menuBar = new MenuBar());
330355         menuBar.add(fileMenu = new Menu("File"));
331356         fileMenu.add(newItem = new MenuItem("New"));
332
-        fileMenu.add(loadItem = new MenuItem("Open..."));
357
+        fileMenu.add(openItem = new MenuItem("Open..."));
333358         
334359                 //oe.menuBar.add(menu = new Menu("Include"));
335360         Menu menu = new Menu("Import");
....@@ -361,7 +386,7 @@
361386         }
362387 
363388         newItem.addActionListener(this);
364
-        loadItem.addActionListener(this);
389
+        openItem.addActionListener(this);
365390         saveItem.addActionListener(this);
366391         saveAsItem.addActionListener(this);
367392         exportAsItem.addActionListener(this);
....@@ -370,13 +395,40 @@
370395         closeItem.addActionListener(this);
371396 
372397         objectPanel = new JTabbedPane();
398
+        
399
+        ChangeListener changeListener = new ChangeListener()
400
+        {
401
+            public void stateChanged(ChangeEvent changeEvent)
402
+            {
403
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
404
+//                {
405
+//                    if (latestObject != null)
406
+//                    {
407
+//                        refreshContents(true);
408
+//                        SetMaterial(latestObject);
409
+//                    }
410
+//                    
411
+//                    materialFlushed = true;
412
+//                }
413
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
414
+//                {
415
+//                    if (listUI.size() == 0)
416
+//                        EditSelection(false);
417
+//                }
418
+
419
+                refreshContents(false); // To refresh Info tab
420
+            }
421
+        };
422
+        objectPanel.addChangeListener(changeListener);
423
+    
373424         toolbarPanel = new JPanel();
374425         toolbarPanel.setName("Toolbar");
426
+        
375427         treePanel = new cGridBag();
376428         treePanel.setName("Tree");
377429         
378430         editPanel = new cGridBag().setVertical(true);
379
-        editPanel.setName("Edit");
431
+        //editPanel.setName("Edit");
380432         
381433         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
382434         
....@@ -384,23 +436,27 @@
384436         editPanel.add(editCommandsPanel);
385437         editPanel.add(ctrlPanel);
386438                 
387
-        materialPanel = new cGridBag().setVertical(true);
439
+        toolboxPanel = new cGridBag().setVertical(true);
440
+        //toolboxPanel.setName("Toolbox");
388441         
389
-        materialPanel.setName("Material");
442
+        materialPanel = new cGridBag().setVertical(true);
443
+        //materialPanel.setName("Material");
444
+        
390445         /*JTextPane*/
391446         infoarea = createTextPane();
392447         doc = infoarea.getStyledDocument();
393448 
394449         infoarea.setEditable(true);
395450         SetText();
451
+        
396452 //            infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
397453 //            infoarea.setOpaque(false);
398454 //            //infoarea.setForeground(textcolor);
399455 // TEXTAREA           infoarea.setLineWrap(true);
400456 // TEXTAREA           infoarea.setWrapStyleWord(true);
401457         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
402
-        infoPanel.setPreferredSize(new Dimension(50, 200));
403
-        infoPanel.setName("Info");
458
+        infoPanel.setPreferredSize(new Dimension(1, 1));
459
+        //infoPanel.setName("Info");
404460         //infoPanel.setLayout(new BorderLayout());
405461         //infoPanel.add(createTextPane());
406462 
....@@ -411,7 +467,14 @@
411467         mainPanel.setDividerSize(9);
412468         mainPanel.setDividerLocation(0.5); //1.0);
413469         mainPanel.setResizeWeight(0.5);
414
-
470
+        
471
+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
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!"));    
475
+    
476
+    mainPanel.setUI(new BasicSplitPaneUI());
477
+    
415478         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
416479         //mainPanel.setLayout(new GridBagLayout());
417480         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -642,8 +705,8 @@
642705         }
643706     }
644707 
645
-static GraphicsDevice device = GraphicsEnvironment
646
-        .getLocalGraphicsEnvironment().getScreenDevices()[0];
708
+//static GraphicsDevice device = GraphicsEnvironment
709
+//        .getLocalGraphicsEnvironment().getScreenDevices()[0];
647710 
648711     Rectangle keeprect;
649712         cRadio radio;
....@@ -659,13 +722,24 @@
659722         
660723         boolean maximized;
661724     
725
+        cButton fullscreenLayout;
726
+
662727         void Minimize()
663728         {
664729             frame.setState(Frame.ICONIFIED);
730
+            frame.validate();
665731         }
666732         
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={}
667736         void Maximize()
668737         {
738
+            if (CameraPane.FULLSCREEN)
739
+            {
740
+                ToggleFullScreen();
741
+            }
742
+            
669743             if (maximized)
670744             {
671745                 frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
....@@ -673,20 +747,36 @@
673747             else
674748             {
675749                 keeprect = frame.getBounds();
676
-                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
677
-                Dimension rect2 = frame.getToolkit().getScreenSize();
678
-                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);
679753 //                frame.setState(Frame.MAXIMIZED_BOTH);
754
+                frame.setBounds(frame.getGraphicsConfiguration().getBounds());
680755             }
681756             
682757             maximized ^= true;
758
+            
759
+            frame.validate();
683760         }
761
+        
762
+	cButton minButton;
763
+	cButton maxButton;
764
+	cButton fullButton;
684765         
685766         void ToggleFullScreen()
686767         {
687
-                if (CameraPane.FULLSCREEN)
768
+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
769
+
770
+                cameraView.ToggleFullScreen();
771
+                
772
+                if (!CameraPane.FULLSCREEN)
688773                 {
689774                     device.setFullScreenWindow(null);
775
+                    frame.dispose();
776
+                frame.setUndecorated(false);
777
+            frame.validate();
778
+                    frame.setVisible(true);
779
+                    
690780                     //frame.setVisible(false);
691781 //                frame.removeNotify();
692782 //                frame.setUndecorated(false);
....@@ -696,7 +786,7 @@
696786 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
697787 // X                   framePanel.add(bigThree);
698788 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
699
-                    framePanel.setDividerLocation(1);
789
+                    framePanel.setDividerLocation(46);
700790                     
701791                     //frame.setVisible(true);
702792                     radio.layout = keepButton;
....@@ -711,7 +801,12 @@
711801 //                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
712802 //                        frame.getToolkit().getScreenSize().height);
713803                     //frame.setVisible(false);
804
+                    
805
+            frame.dispose();
806
+                frame.setUndecorated(true);
714807                     device.setFullScreenWindow(frame);
808
+            frame.validate();
809
+                    frame.setVisible(true);
715810 //                frame.removeNotify();
716811 //                frame.setUndecorated(true);
717812 //                frame.addNotify();
....@@ -720,13 +815,34 @@
720815 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
721816                     framePanel.setDividerLocation(0);
722817 
723
-                    radio.layout = twoButton;
818
+                    radio.layout = fullscreenLayout;
724819                     radio.layout.doClick();
725820                     //frame.setVisible(true);
726821                 }
727
-                
728
-                cameraView.ToggleFullScreen();
822
+            frame.validate();
729823         }
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
+    }
730846 
731847     private JTextPane createTextPane()
732848     {
....@@ -858,7 +974,7 @@
858974 //    NumberSlider vDivsField;
859975 //    JCheckBox endcaps;
860976     JCheckBox liveCB;
861
-    JCheckBox selectCB;
977
+    JCheckBox selectableCB;
862978     JCheckBox hideCB;
863979     JCheckBox link2masterCB;
864980     JCheckBox markCB;
....@@ -866,7 +982,12 @@
866982     JCheckBox speedupCB;
867983     JCheckBox rewindCB;
868984     JCheckBox flipVCB;
985
+    
986
+    cCheckBox toggleTextureCB;
987
+    cCheckBox toggleSwitchCB;
988
+        
869989     JComboBox texresMenu;
990
+    
870991     JButton resetButton;
871992     JButton stepButton;
872993     JButton stepAllButton;
....@@ -1053,38 +1174,42 @@
10531174             namePanel = new cGridBag();
10541175             
10551176         nameField = AddText(namePanel, copy.GetName());
1056
-        namePanel.add(nameField);
1177
+        namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
10571178         oe.ctrlPanel.add(namePanel);
10581179         
10591180         oe.ctrlPanel.Return();
10601181         
1061
-        if (!GroupEditor.allparams)
1182
+        if (!allparams)
10621183             return;
10631184 
10641185             setupPanel = new cGridBag().setVertical(false);
10651186             
10661187         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
10671188                 liveCB.setToolTipText("Animate object");
1068
-        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1069
-                selectCB.setToolTipText("Make object selectable");
1189
+        selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190
+                selectableCB.setToolTipText("Make object selectable");
10701191 //            Return();
1192
+                
10711193         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
10721194                 hideCB.setToolTipText("Hide object");
10731195         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1074
-        markCB.setToolTipText("Set the animation target transform");
1196
+        markCB.setToolTipText("As animation target transform");
1197
+        
1198
+        ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
10751199         
10761200             setupPanel2 = new cGridBag().setVertical(false);
10771201             
10781202         rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
10791203         rewindCB.setToolTipText("Rewind animation");
10801204         
1081
-        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1082
-        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
1205
+        randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1206
+        randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
10831207 
1208
+        link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1209
+        link2masterCB.setToolTipText("Attach to support");
1210
+        
10841211         if (Globals.ADVANCED)
10851212         {
1086
-                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1087
-                link2masterCB.setToolTipText("Attach to support");
10881213                 speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
10891214                 speedupCB.setToolTipText("Option motion capture");
10901215         }
....@@ -1358,6 +1483,7 @@
13581483         XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
13591484         XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
13601485         XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1486
+        //XYZPanel.setName("XYZ");
13611487 
13621488         /*
13631489         gridPanel = new JPanel(); //new BorderLayout());
....@@ -1395,12 +1521,23 @@
13951521         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
13961522         //tmp.setName("Edit");
13971523         objectPanel.add(materialPanel);
1524
+        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
13981525 //        JPanel north = new JPanel(new BorderLayout());
13991526 //        north.setName("Edit");
14001527 //        north.add(ctrlPanel, BorderLayout.NORTH);
14011528 //        objectPanel.add(north);
14021529         objectPanel.add(editPanel);
1403
-        objectPanel.add(infoPanel);
1530
+        objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1531
+        
1532
+        //if (Globals.ADVANCED)
1533
+            objectPanel.add(infoPanel);
1534
+        objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1535
+        
1536
+        objectPanel.add(XYZPanel);
1537
+        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1538
+        
1539
+        objectPanel.add(toolboxPanel);
1540
+        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
14041541 
14051542         /*
14061543         aConstraints.gridx = 0;
....@@ -1409,7 +1546,7 @@
14091546         aConstraints.gridy += 1;
14101547         aConstraints.gridwidth = 1;
14111548         mainPanel.add(objectPanel, aConstraints);
1412
-         */
1549
+        */
14131550 
14141551         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
14151552                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1421,14 +1558,12 @@
14211558         scrollpane.addMouseWheelListener(this); // Default not fast enough
14221559 
14231560         /*JTabbedPane*/ scenePanel = new cGridBag();
1424
-        scenePanel.preferredWidth = 6;
1561
+        scenePanel.preferredWidth = 5;
14251562         
14261563         JTabbedPane tabbedPane = new JTabbedPane();
14271564         tabbedPane.add(scrollpane);
14281565 
1429
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1430
-
1431
-        optionsPanel = new cGridBag().setVertical(true);
1566
+        optionsPanel = new cGridBag().setVertical(false);
14321567 
14331568         optionsPanel.setName("Options");
14341569         
....@@ -1436,6 +1571,8 @@
14361571         
14371572         tabbedPane.add(optionsPanel);
14381573         
1574
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1575
+
14391576         scenePanel.add(tabbedPane);
14401577 
14411578         /*
....@@ -1497,9 +1634,9 @@
14971634         /**/
14981635 
14991636         bigThree = new cGridBag();
1500
-        bigThree.addComponent(scenePanel);
15011637         bigThree.addComponent(centralPanel);
1502
-        bigThree.addComponent(XYZPanel);
1638
+        bigThree.addComponent(scenePanel);
1639
+        //bigThree.addComponent(XYZPanel);
15031640         
15041641 //                // SIDE EFFECT!!!
15051642 //		aConstraints.gridx = 0;
....@@ -1508,9 +1645,9 @@
15081645 //		aConstraints.gridheight = 1;
15091646 
15101647         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1511
-        framePanel.setContinuousLayout(true);
1512
-        framePanel.setOneTouchExpandable(true);
1513
-        framePanel.setDividerLocation(0.8);
1648
+        framePanel.setContinuousLayout(false);
1649
+        framePanel.setOneTouchExpandable(false);
1650
+        //.setDividerLocation(0.8);
15141651         //framePanel.setDividerSize(15);
15151652         //framePanel.setResizeWeight(0.15);
15161653         framePanel.setName("Frame");
....@@ -1528,11 +1665,14 @@
15281665 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
15291666 
15301667         frame.setSize(1280, 860);
1531
-        frame.setVisible(true);
1532
-
1668
+        
15331669                     cameraView.requestFocusInWindow();
15341670                     
15351671         gridPanel.setDividerLocation(1.0);
1672
+        
1673
+        frame.validate();
1674
+
1675
+        frame.setVisible(true);
15361676 
15371677         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
15381678         frame.addWindowListener(new WindowAdapter()
....@@ -1619,24 +1759,6 @@
16191759                 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
16201760         colorSection.add(texture);
16211761 
1622
-        cGridBag anisoU = new cGridBag();
1623
-                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1624
-                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1625
-                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1626
-        colorSection.add(anisoU);
1627
-
1628
-        cGridBag anisoV = new cGridBag();
1629
-                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1630
-                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631
-                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1632
-        colorSection.add(anisoV);
1633
-
1634
-        cGridBag shadowbias = new cGridBag();
1635
-                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1636
-                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1637
-                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1638
-        colorSection.add(shadowbias);
1639
-
16401762         panel.add(new JSeparator());
16411763         
16421764         panel.add(colorSection);
....@@ -1686,6 +1808,12 @@
16861808                 fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16871809                 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
16881810         diffuseSection.add(fakedepth);
1811
+
1812
+        cGridBag shadowbias = new cGridBag();
1813
+                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1814
+                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1815
+                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1816
+        diffuseSection.add(shadowbias);
16891817 
16901818         panel.add(new JSeparator());
16911819         
....@@ -1737,6 +1865,18 @@
17371865 //		aConstraints.gridy += 1;
17381866 //		aConstraints.gridwidth = 1;
17391867 
1868
+        cGridBag anisoU = new cGridBag();
1869
+                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1870
+                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1871
+                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1872
+        specularSection.add(anisoU);
1873
+
1874
+        cGridBag anisoV = new cGridBag();
1875
+                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1876
+                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1877
+                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1878
+        specularSection.add(anisoV);
1879
+
17401880 
17411881         panel.add(new JSeparator());
17421882         
....@@ -1744,35 +1884,35 @@
17441884         
17451885         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17461886         
1747
-        cGridBag globalSection = new cGridBag().setVertical(true);
1887
+        //cGridBag globalSection = new cGridBag().setVertical(true);
17481888 
17491889         cGridBag camera = new cGridBag();
17501890                 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
17511891                 cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17521892                 camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1753
-        globalSection.add(camera);
1893
+        colorSection.add(camera);
17541894 
17551895         cGridBag ambient = new cGridBag();
17561896                 ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
17571897                 ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17581898                 ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1759
-        globalSection.add(ambient);
1899
+        colorSection.add(ambient);
17601900 
17611901         cGridBag backlit = new cGridBag();
17621902                 backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
17631903                 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17641904                 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1765
-        globalSection.add(backlit);
1905
+        colorSection.add(backlit);
17661906 
17671907         cGridBag opacity = new cGridBag();
17681908                 opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
17691909                 opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17701910                 opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1771
-        globalSection.add(opacity);
1911
+        colorSection.add(opacity);
17721912 
1773
-        panel.add(new JSeparator());
1913
+        //panel.add(new JSeparator());
17741914         
1775
-        panel.add(globalSection);
1915
+        //panel.add(globalSection);
17761916         
17771917         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17781918         
....@@ -1879,8 +2019,9 @@
18792019             // 3D models
18802020             if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
18812021             {
1882
-                lastConverter = new com.jmex.model.converters.MaxToJme();
1883
-                LoadFile(filename, lastConverter);
2022
+                //lastConverter = new com.jmex.model.converters.MaxToJme();
2023
+                //LoadFile(filename, lastConverter);
2024
+                LoadObjFile(filename); // New 3ds loader
18842025                 continue;
18852026             }
18862027             if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -2606,6 +2747,7 @@
26062747                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
26072748                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
26082749             }
2750
+            
26092751             //cJME.count++;
26102752             //cJME.count %= 12;
26112753             if (gc)
....@@ -2789,6 +2931,7 @@
27892931             }
27902932         }
27912933     }
2934
+    
27922935     cFileSystemPane FSPane;
27932936 
27942937     void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2842,11 +2985,14 @@
28422985                 }
28432986             }
28442987         }
2988
+        
28452989         freezematerial = false;
28462990     }
28472991 
28482992     void SetMaterial(Object3D object)
28492993     {
2994
+        latestObject = object;
2995
+        
28502996         cMaterial mat = object.material;
28512997 
28522998         if (mat == null)
....@@ -2958,12 +3104,17 @@
29583104 //                }
29593105 
29603106         /**/
2961
-        if (deselect)
3107
+        if (deselect || child == null)
29623108         {
29633109             //group.deselectAll();
29643110             //freeze = true;
29653111             GetTree().clearSelection();
29663112             //freeze = false;
3113
+            
3114
+            if (child == null)
3115
+            {
3116
+                return;
3117
+            }
29673118         }
29683119 
29693120         //group.addSelectee(child);
....@@ -3032,7 +3183,7 @@
30323183             cameraView.ToggleDL();
30333184             cameraView.repaint();
30343185             return;
3035
-        } else if (event.getSource() == toggleTextureItem)
3186
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
30363187         {
30373188             cameraView.ToggleTexture();
30383189             // june 2013           copy.HardTouch();
....@@ -3071,7 +3222,7 @@
30713222             frame.validate();
30723223 
30733224             return;
3074
-        } else if (event.getSource() == toggleSwitchItem)
3225
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
30753226         {
30763227             cameraView.ToggleSwitch();
30773228             cameraView.repaint();
....@@ -3102,7 +3253,7 @@
31023253         {
31033254             copy.live ^= true;
31043255             return;
3105
-        } else if (event.getSource() == selectCB)
3256
+        } else if (event.getSource() == selectableCB)
31063257         {
31073258             copy.dontselect ^= true;
31083259             return;
....@@ -3287,9 +3438,9 @@
32873438         {
32883439             Close();
32893440             //return true;
3290
-        } else if (source == loadItem)
3441
+        } else if (source == openItem)
32913442         {
3292
-            load();
3443
+            Open();
32933444             //return true;
32943445         } else if (source == newItem)
32953446         {
....@@ -3314,6 +3465,10 @@
33143465         {
33153466             generatePOV();
33163467             //return true;
3468
+        } else if (event.getSource() == archiveItem)
3469
+        {
3470
+            cTools.Archive(frame);
3471
+            return;
33173472         } else if (source == zBufferItem)
33183473         {
33193474             try
....@@ -3365,8 +3520,8 @@
33653520         try
33663521         {
33673522             ByteArrayOutputStream baos = new ByteArrayOutputStream();
3368
-            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3369
-            ObjectOutputStream out = new ObjectOutputStream(zstream);
3523
+//            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3524
+            ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
33703525 
33713526         Object3D parent = o.parent;
33723527         o.parent = null;
....@@ -3377,10 +3532,14 @@
33773532         
33783533             out.flush();
33793534 
3380
-            zstream.close();
3535
+            baos //zstream
3536
+                    .close();
33813537             out.close();
33823538             
3383
-            return baos.toByteArray();
3539
+            byte[] bytes = baos.toByteArray();
3540
+            
3541
+        System.out.println("save #bytes = " + bytes.length);
3542
+            return bytes;
33843543         } catch (Exception e)
33853544         {
33863545             System.err.println(e);
....@@ -3390,13 +3549,16 @@
33903549 
33913550     static public Object Uncompress(byte[] bytes)
33923551     {
3393
-        System.out.println("#bytes = " + bytes.length);
3552
+        System.out.println("restore #bytes = " + bytes.length);
33943553         try
33953554         {
33963555             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3397
-            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3398
-            ObjectInputStream in = new ObjectInputStream(istream);
3556
+            //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3557
+            ObjectInputStream in = new ObjectInputStream(bais); // istream);
33993558             Object obj = in.readObject();
3559
+            
3560
+            bais //istream
3561
+                    .close();
34003562             in.close();
34013563             
34023564             return obj;
....@@ -3451,39 +3613,77 @@
34513613         return null;
34523614     }
34533615     
3454
-    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
34553616     
34563617     public void Save()
3618
+    {
3619
+        //Save(true);
3620
+        Replace();
3621
+    }
3622
+    
3623
+    private boolean Equal(byte[] compress, byte[] name)
3624
+    {
3625
+        if (compress.length != name.length)
3626
+        {
3627
+            return false;
3628
+        }
3629
+        
3630
+        for (int i=compress.length; --i>=0;)
3631
+        {
3632
+            if (compress[i] != name[i])
3633
+                return false;
3634
+        }
3635
+        
3636
+        return true;
3637
+    }
3638
+
3639
+    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3640
+    
3641
+    public boolean Save(boolean user)
34573642     {
34583643         System.err.println("Save");
34593644         
34603645         cRadio tab = GetCurrentTab();
34613646         
3462
-        boolean temp = CameraPane.SWITCH;
3463
-        CameraPane.SWITCH = false;
3647
+        byte[] compress = CompressCopy();
34643648         
3465
-        copy.ExtractBigData(hashtable);
3649
+        boolean thesame = false;
3650
+        
3651
+        // Quick heuristic using length. Works only when stream is compressed.
3652
+        if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3653
+        {
3654
+            thesame = true;
3655
+        }
34663656         
34673657         //EditorFrame.m_MainFrame.requestFocusInWindow();
3468
-        tab.graphs[tab.undoindex++] = Compress(copy);
3469
-
3470
-        copy.RestoreBigData(hashtable);
3471
-
3472
-        CameraPane.SWITCH = temp;
3473
-        
3474
-        //assert(hashtable.isEmpty());
3475
-        
3476
-        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3658
+        if (!thesame)
34773659         {
3478
-            tab.graphs[i] = null;
3660
+            //tab.user[tab.versionindex] = user;
3661
+            //boolean increment = true; // tab.graphs[tab.versionindex] == null;
3662
+            
3663
+            copy.versions[++copy.versionindex] = compress;
3664
+            
3665
+            // if (increment)
3666
+            //     tab.versionindex++;
34793667         }
34803668 
3669
+        //copy.RestoreBigData(versiontable);
3670
+
3671
+        //assert(hashtable.isEmpty());
3672
+        
3673
+        for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3674
+        {
3675
+            //tab.user[i] = false;
3676
+            copy.versions[i] = null;
3677
+        }
3678
+
3679
+        SetUndoStates();
3680
+        
34813681         // test save
34823682         if (false)
34833683         {
34843684             try
34853685             {
3486
-                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3686
+                FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
34873687                 ObjectOutputStream p = new ObjectOutputStream(ostream);
34883688 
34893689                 p.writeObject(copy);
....@@ -3496,14 +3696,18 @@
34963696                 e.printStackTrace();
34973697             }
34983698         }
3699
+        
3700
+        return !thesame;
34993701     }
35003702 
35013703     void CopyChanged(Object3D obj)
35023704     {
3705
+        SetUndoStates();
3706
+        
35033707         boolean temp = CameraPane.SWITCH;
35043708         CameraPane.SWITCH = false;
35053709         
3506
-        copy.ExtractBigData(hashtable);
3710
+        copy.ExtractBigData(versiontable);
35073711         
35083712         copy.clear();
35093713         
....@@ -3512,7 +3716,7 @@
35123716             copy.add(obj.get(i));
35133717         }
35143718         
3515
-        copy.RestoreBigData(hashtable);
3719
+        copy.RestoreBigData(versiontable);
35163720         
35173721         CameraPane.SWITCH = temp;
35183722         
....@@ -3539,42 +3743,130 @@
35393743         refreshContents();
35403744     }
35413745     
3542
-    public void Undo()
3746
+    cButton undoButton;
3747
+    cButton restoreButton;
3748
+    cButton replaceButton;
3749
+    cButton redoButton;
3750
+        
3751
+    boolean muteSlider;
3752
+    
3753
+    int VersionCount()
35433754     {
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
+    
3766
+    void SetUndoStates()
3767
+    {
3768
+        cRadio tab = GetCurrentTab();
3769
+        
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;
3780
+    }
3781
+    
3782
+    public boolean Undo()
3783
+    {
3784
+        // Option?
3785
+        Replace();
3786
+        
35443787         System.err.println("Undo");
35453788         
35463789         cRadio tab = GetCurrentTab();
35473790         
3548
-        if (tab.undoindex == 0)
3791
+        if (copy.versionindex == 0)
35493792         {
35503793             java.awt.Toolkit.getDefaultToolkit().beep();
3551
-            return;
3794
+            return false;
35523795         }
35533796 
3554
-        if (tab.graphs[tab.undoindex] == null)
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)
35553824         {
3556
-            Save();
3557
-            tab.undoindex -= 1;
3825
+            java.awt.Toolkit.getDefaultToolkit().beep();
3826
+            return false;
35583827         }
35593828 
3560
-        tab.undoindex -= 1;
3829
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3830
+        
3831
+        return true;
3832
+    }
35613833 
3562
-        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();
3847
+        
3848
+        return true;
35633849     }
35643850 
35653851     public void Redo()
35663852     {
3853
+        // Option?
3854
+        Replace();
3855
+        
35673856         cRadio tab = GetCurrentTab();
35683857         
3569
-        if (tab.graphs[tab.undoindex + 1] == null)
3858
+        if (copy.versions[copy.versionindex + 1] == null)
35703859         {
35713860             java.awt.Toolkit.getDefaultToolkit().beep();
35723861             return;
35733862         }
35743863 
3575
-        tab.undoindex += 1;
3864
+        copy.versionindex += 1;
35763865 
3577
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3866
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3867
+        
3868
+        //if (!tab.user[tab.versionindex])
3869
+        //    tab.graphs[tab.versionindex] = null;
35783870     }
35793871 
35803872         void ImportGFD()
....@@ -3726,7 +4018,7 @@
37264018         assert false;
37274019     }
37284020 
3729
-    void EditSelection()
4021
+    void EditSelection(boolean newWindow)
37304022     {
37314023     }
37324024 
....@@ -3870,9 +4162,25 @@
38704162         //copy.Touch();
38714163     }
38724164 
4165
+    cNumberSlider versionSlider;
4166
+    
38734167     public void stateChanged(ChangeEvent e)
38744168     {
38754169         //    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
+        }
38764184 
38774185         if (freezematerial)
38784186         {
....@@ -4221,7 +4529,7 @@
42214529 
42224530     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
42234531     {
4224
-        if (Globals.SAVEONMAKE)
4532
+        if (Globals.REPLACEONMAKE) // && resetmodel)
42254533             Save();
42264534         //Tween.set(thing, 0).target(1).start(tweenManager);
42274535         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4309,6 +4617,12 @@
43094617         {
43104618             ResetModel();
43114619             Select(thing.GetTreePath(), true, false); // unselect... false);
4620
+            
4621
+        if (thing.Size() == 0)
4622
+        {
4623
+            //EditSelection(false);
4624
+        }
4625
+        
43124626             refreshContents();
43134627         }
43144628 
....@@ -4457,7 +4771,9 @@
44574771             readobj.ResetDisplayList();
44584772         } catch (Exception e)
44594773         {
4460
-            //e.printStackTrace();
4774
+            if (!e.toString().contains("GZIP"))
4775
+                e.printStackTrace();
4776
+            
44614777             try
44624778             {
44634779                 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4531,12 +4847,14 @@
45314847         
45324848         if (readobj != null)
45334849         {
4534
-        if (Globals.SAVEONMAKE)
4535
-            Save();
4850
+        //if (Globals.SAVEONMAKE) // A new object cannot share meshes
4851
+        //    Save();
45364852             try
45374853             {
45384854                 //readobj.deepCopySelf(copy);
45394855                 copy.clear(); // june 2014
4856
+                copy.skyboxname = readobj.skyboxname;
4857
+                copy.skyboxext = readobj.skyboxext;
45404858                 for (int i = 0; i < readobj.size(); i++)
45414859                 {
45424860                     Object3D child = readobj.get(i); // reserve(i);
....@@ -4577,6 +4895,7 @@
45774895                 }
45784896             } catch (ClassCastException e)
45794897             {
4898
+                e.printStackTrace();
45804899                 assert (false);
45814900                 Composite c = (Composite) copy;
45824901                 c.children.clear();
....@@ -4587,13 +4906,24 @@
45874906                 c.addChild(csg);
45884907             }
45894908 
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
+            
45904920             ResetModel();
45914921             copy.HardTouch(); // recompile?
45924922             refreshContents();
45934923         }
45944924     }
45954925 
4596
-    void load() // throws ClassNotFoundException
4926
+    void Open() // throws ClassNotFoundException
45974927     {
45984928         if (Grafreed.standAlone)
45994929         {
....@@ -4696,6 +5026,7 @@
46965026             //ps.print(buffer.toString());
46975027         } catch (IOException e)
46985028         {
5029
+            e.printStackTrace();
46995030         }
47005031     }
47015032     
....@@ -4710,6 +5041,8 @@
47105041             String filename = browser.getFile();
47115042             if (filename != null && filename.length() > 0)
47125043             {
5044
+                if (!filename.endsWith(".gfd"))
5045
+                    filename += ".gfd";
47135046                 lastname = browser.getDirectory() + filename;
47145047                 save();
47155048             }
....@@ -4876,7 +5209,7 @@
48765209     MenuBar menuBar;
48775210     Menu fileMenu;
48785211     MenuItem newItem;
4879
-    MenuItem loadItem;
5212
+    MenuItem openItem;
48805213     MenuItem saveItem;
48815214     MenuItem saveAsItem;
48825215     MenuItem exportAsItem;
....@@ -4899,22 +5232,36 @@
48995232     CheckboxMenuItem toggleSwitchItem;
49005233     CheckboxMenuItem toggleRootItem;
49015234     CheckboxMenuItem animationItem;
5235
+    MenuItem archiveItem;
49025236     CheckboxMenuItem toggleHandleItem;
49035237     CheckboxMenuItem togglePaintItem;
49045238     JSplitPane mainPanel;
49055239     JScrollPane scrollpane;
5240
+    
49065241     JPanel toolbarPanel;
5242
+    
49075243     cGridBag treePanel;
5244
+    
49085245     JPanel radioPanel;
49095246     ButtonGroup buttonGroup;
4910
-    cGridBag ctrlPanel;
5247
+    
5248
+    cGridBag toolboxPanel;
49115249     cGridBag materialPanel;
5250
+    cGridBag ctrlPanel;
5251
+    
49125252     JScrollPane infoPanel;
5253
+    
49135254     cGridBag optionsPanel;
5255
+    
49145256     JTabbedPane objectPanel;
5257
+    boolean materialFlushed;
5258
+    Object3D latestObject;
5259
+    
49155260     cGridBag XYZPanel;
5261
+    
49165262     JSplitPane gridPanel;
49175263     JSplitPane bigPanel;
5264
+    
49185265     cGridBag bigThree;
49195266     cGridBag scenePanel;
49205267     cGridBag centralPanel;
....@@ -5029,7 +5376,7 @@
50295376     cNumberSlider fogField;
50305377     JLabel opacityPowerLabel;
50315378     cNumberSlider opacityPowerField;
5032
-    JTree jTree;
5379
+    cTree jTree;
50335380     //ObjectUI parent;
50345381     
50355382     cNumberSlider normalpushField;