blame | history | patch | commit | commitdiff
Normand Briere
2019-06-27 f78dd18c66d607b693c0bf5937fc59181bf5a26b 
 ObjEditor.java
....@@ -4,6 +4,7 @@
44 
55 import java.awt.*;
66 import java.awt.event.*;
7
+import java.awt.image.BufferedImage;
78 import javax.swing.*;
89 import javax.swing.event.*;
910 import javax.swing.text.*;
....@@ -13,6 +14,9 @@
1314 import javax.swing.plaf.metal.MetalLookAndFeel;
1415 //import javax.swing.plaf.ColorUIResource;
1516 //import javax.swing.plaf.metal.DefaultMetalTheme;
17
+
18
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
19
+import javax.swing.plaf.basic.BasicSplitPaneUI;
1620 
1721 //import javax.media.opengl.GLCanvas;
1822 
....@@ -35,6 +39,67 @@
3539 
3640     GroupEditor callee;
3741     JFrame frame;
42
+    
43
+    static ObjEditor theFrame;
44
+    
45
+    cButton GetButton(String name, boolean border)
46
+    {
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
+        }
56
+    }
57
+
58
+    cToggleButton GetToggleButton(String name, boolean border)
59
+    {
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
+        }
69
+    }
70
+
71
+    cCheckBox GetCheckBox(String name, boolean border)
72
+    {
73
+        try
74
+        {
75
+            ImageIcon icon = GetIcon(name);
76
+            return new cCheckBox(icon, border);
77
+        }
78
+        catch (Exception e)
79
+        {
80
+            return new cCheckBox(name, border);
81
+        }
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;
102
+    }
38103     
39104     // SCRIPT
40105     
....@@ -145,7 +210,7 @@
145210         
146211         objEditor.ctrlPanel.remove(namePanel);
147212         
148
-        if (!GroupEditor.allparams)
213
+        if (!allparams)
149214             return;
150215         
151216 //        objEditor.ctrlPanel.remove(liveCB);
....@@ -168,7 +233,8 @@
168233 //        objEditor.ctrlPanel.remove(remarkButton);
169234         
170235         objEditor.ctrlPanel.remove(setupPanel);
171
-        objEditor.ctrlPanel.remove(commandsPanel);
236
+        objEditor.ctrlPanel.remove(setupPanel2);
237
+        objEditor.ctrlPanel.remove(objectCommandsPanel);
172238         objEditor.ctrlPanel.remove(pushPanel);
173239         //objEditor.ctrlPanel.remove(fillPanel);
174240         
....@@ -243,6 +309,7 @@
243309         //localCopy.parent = null;
244310 
245311         frame = new JFrame();
312
+                frame.setUndecorated(true);
246313         objEditor = this;
247314         this.callee = callee;
248315 
....@@ -273,27 +340,48 @@
273340         return frame.action(event, obj);
274341     }
275342 
343
+    // Cannot work without static
344
+    static boolean allparams = true;
345
+
346
+    static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
347
+
276348     void SetupMenu()
277349     {
278350         frame.setMenuBar(menuBar = new MenuBar());
279
-        menuBar.add(windowMenu = new Menu("File"));
280
-        windowMenu.add(loadItem = new MenuItem("Load..."));
281
-        windowMenu.add("-");
282
-        windowMenu.add(saveItem = new MenuItem("Save"));
283
-        windowMenu.add(saveAsItem = new MenuItem("Save As..."));
351
+        menuBar.add(fileMenu = new Menu("File"));
352
+        fileMenu.add(newItem = new MenuItem("New"));
353
+        fileMenu.add(loadItem = new MenuItem("Open..."));
354
+        
355
+                //oe.menuBar.add(menu = new Menu("Include"));
356
+        Menu menu = new Menu("Import");
357
+		importOBJItem = menu.add(new MenuItem("OBJ file..."));
358
+		importOBJItem.addActionListener(this);
359
+		import3DSItem = menu.add(new MenuItem("3DS file..."));
360
+		import3DSItem.addActionListener(this);
361
+		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
362
+		importVRMLX3DItem.addActionListener(this);
363
+		menu.add("-");
364
+		importGFDItem = menu.add(new MenuItem("Grafreed file..."));
365
+		importGFDItem.addActionListener(this);
366
+        fileMenu.add(menu);
367
+        fileMenu.add("-");
368
+
369
+        fileMenu.add(saveItem = new MenuItem("Save"));
370
+        fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284371         //windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
285
-        windowMenu.add("-");
286
-        windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
287
-        windowMenu.add(reexportItem = new MenuItem("Re-export"));
288
-        windowMenu.add("-");
372
+        fileMenu.add("-");
373
+        fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
374
+        fileMenu.add(reexportItem = new MenuItem("Re-export"));
375
+        fileMenu.add("-");
289376         if (client.parent != null)
290377         {
291
-            windowMenu.add(closeItem = new MenuItem("Close"));
378
+            fileMenu.add(closeItem = new MenuItem("Close"));
292379         } else
293380         {
294
-            windowMenu.add(closeItem = new MenuItem("Exit"));
381
+            fileMenu.add(closeItem = new MenuItem("Exit"));
295382         }
296383 
384
+        newItem.addActionListener(this);
297385         loadItem.addActionListener(this);
298386         saveItem.addActionListener(this);
299387         saveAsItem.addActionListener(this);
....@@ -302,87 +390,53 @@
302390         //povItem.addActionListener(this);
303391         closeItem.addActionListener(this);
304392 
305
-        menuBar.add(cameraMenu = new Menu("View"));
306
-        //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
307
-        //zBufferItem.addActionListener(this);
308
-        //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
309
-        //normalLensItem.addActionListener(this);
310
-        cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
311
-        revertCameraItem.addActionListener(this);
312
-        
313
-        cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314
-        toggleFullScreenItem.addItemListener(this);
315
-        toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316
-        cameraMenu.add("-");
317
-        
318
-        cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319
-        toggleTextureItem.addItemListener(this);
320
-        toggleTextureItem.setState(CameraPane.textureon);
321
-        
322
-        cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
323
-        toggleSwitchItem.addItemListener(this);
324
-        toggleSwitchItem.setState(CameraPane.SWITCH);
325
-        
326
-        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
327
-        toggleHandleItem.addItemListener(this);
328
-        toggleHandleItem.setState(CameraPane.HANDLES);
329
-        
330
-        cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
331
-        togglePaintItem.addItemListener(this);
332
-        togglePaintItem.setState(CameraPane.PAINTMODE);
333
-        
334
-        if (Globals.ADVANCED)
335
-        {
336
-        cameraMenu.add("-");
337
-                cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
338
-                toggleLiveItem.addItemListener(this);
339
-                toggleLiveItem.setState(Globals.isLIVE());
340
-
341
-                cameraMenu.add(stepItem = new MenuItem("Step"));
342
-                stepItem.addActionListener(this);
343
-        //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
344
-        //		toggleDLItem.addItemListener(this);
345
-        //                toggleDLItem.setState(false);
346
-
347
-                cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
348
-                toggleRenderItem.addItemListener(this);
349
-                toggleRenderItem.setState(!CameraPane.frozen);
350
-
351
-                cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
352
-                toggleDebugItem.addItemListener(this);
353
-                toggleDebugItem.setState(CameraPane.DEBUG);
354
-
355
-                cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
356
-                toggleFrustumItem.addItemListener(this);
357
-                toggleFrustumItem.setState(CameraPane.FRUSTUM);
358
-
359
-                cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
360
-                toggleFootContactItem.addItemListener(this);
361
-                toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
362
-                
363
-                cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
364
-                toggleTimelineItem.addItemListener(this);
365
-        }
366
-        
367
-//		cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
368
-//		toggleRootItem.addItemListener(this);
369
-//                    toggleRootItem.setState(false);
370
-//		cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
371
-//		animationItem.addItemListener(this);
372
-//                    animationItem.setState(CameraPane.ANIMATION);
373
-        cameraMenu.add("-");
374
-        cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
375
-        editCameraItem.addActionListener(this);
376
-
377393         objectPanel = new JTabbedPane();
394
+        
395
+        ChangeListener changeListener = new ChangeListener()
396
+        {
397
+            public void stateChanged(ChangeEvent changeEvent)
398
+            {
399
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
400
+//                {
401
+//                    if (latestObject != null)
402
+//                    {
403
+//                        refreshContents(true);
404
+//                        SetMaterial(latestObject);
405
+//                    }
406
+//                    
407
+//                    materialFlushed = true;
408
+//                }
409
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
410
+//                {
411
+//                    if (listUI.size() == 0)
412
+//                        EditSelection(false);
413
+//                }
414
+
415
+                refreshContents(false); // To refresh Info tab
416
+            }
417
+        };
418
+        objectPanel.addChangeListener(changeListener);
419
+    
378420         toolbarPanel = new JPanel();
379421         toolbarPanel.setName("Toolbar");
380422         treePanel = new cGridBag();
381423         treePanel.setName("Tree");
424
+        
425
+        editPanel = new cGridBag().setVertical(true);
426
+        editPanel.setName("Edit");
427
+        
382428         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
383
-        ctrlPanel.setName("Edit");
429
+        
430
+        editCommandsPanel = new cGridBag();
431
+        editPanel.add(editCommandsPanel);
432
+        editPanel.add(ctrlPanel);
433
+                
434
+        toolboxPanel = new cGridBag().setVertical(false);
435
+        toolboxPanel.setName("Toolbox");
436
+        
384437         materialPanel = new cGridBag().setVertical(true);
385438         materialPanel.setName("Material");
439
+        
386440         /*JTextPane*/
387441         infoarea = createTextPane();
388442         doc = infoarea.getStyledDocument();
....@@ -407,7 +461,13 @@
407461         mainPanel.setDividerSize(9);
408462         mainPanel.setDividerLocation(0.5); //1.0);
409463         mainPanel.setResizeWeight(0.5);
410
-
464
+        
465
+//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!"));    
469
+    
470
+    
411471         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
412472         //mainPanel.setLayout(new GridBagLayout());
413473         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -475,10 +535,10 @@
475535             e.printStackTrace();
476536         }
477537         
478
-        String selection = infoarea.getText();
479
-        java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
480
-        java.awt.datatransfer.Clipboard clipboard = 
481
-                Toolkit.getDefaultToolkit().getSystemClipboard();
538
+//        String selection = infoarea.getText();
539
+//        java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
540
+//        java.awt.datatransfer.Clipboard clipboard = 
541
+//                Toolkit.getDefaultToolkit().getSystemClipboard();
482542         //clipboard.setContents(data, data);
483543     }
484544     
....@@ -501,13 +561,13 @@
501561         //SendInfo("Name:", "bold");
502562         if (sel.GetTextures() != null || debug)
503563         {
504
-            si.SendInfo(sel.toString(), "bold");
564
+            si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
505565             //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
506566             if (sel.Size() > 0)
507567             {
508568                 si.SendInfo("#children = " + sel.Size(), "regular");
509569             }
510
-            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent, "regular");
570
+            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
511571             if (debug)
512572             {
513573                 try
....@@ -549,7 +609,7 @@
549609                 }
550610                 if (sel.support != null)
551611                 {
552
-                    si.SendInfo("    support: " + sel.support, "regular");
612
+                    si.SendInfo("    support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
553613                 }
554614                 if (sel.scriptnode != null)
555615                 {
....@@ -638,20 +698,92 @@
638698         }
639699     }
640700 
701
+static GraphicsDevice device = GraphicsEnvironment
702
+        .getLocalGraphicsEnvironment().getScreenDevices()[0];
703
+
704
+    Rectangle keeprect;
705
+        cRadio radio;
706
+        
707
+cButton keepButton;
708
+	cButton twoButton; // Full 3D
709
+	cButton sixButton;
710
+	cButton threeButton;
711
+	cButton sevenButton;
712
+	cButton fourButton; // full panel
713
+	cButton oneButton; // full XYZ
714
+        //cButton currentLayout;
715
+        
716
+        boolean maximized;
717
+    
718
+        cButton fullscreenLayout;
719
+
720
+        void Minimize()
721
+        {
722
+            frame.setState(Frame.ICONIFIED);
723
+        }
724
+        
725
+        void Maximize()
726
+        {
727
+            if (maximized)
728
+            {
729
+                frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
730
+            }
731
+            else
732
+            {
733
+                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);
737
+//                frame.setState(Frame.MAXIMIZED_BOTH);
738
+            }
739
+            
740
+            maximized ^= true;
741
+        }
742
+        
641743         void ToggleFullScreen()
642744         {
643
-                if (CameraPane.FULLSCREEN)
745
+                cameraView.ToggleFullScreen();
746
+                
747
+                if (!CameraPane.FULLSCREEN)
644748                 {
645
-                    frame.getContentPane().remove(/*"Center",*/bigThree);
646
-                    framePanel.add(bigThree);
647
-                    frame.getContentPane().add(/*"Center",*/framePanel);
749
+                    device.setFullScreenWindow(null);
750
+                    //frame.setVisible(false);
751
+//                frame.removeNotify();
752
+//                frame.setUndecorated(false);
753
+//                frame.addNotify();
754
+                //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
755
+                    
756
+// X                   frame.getContentPane().remove(/*"Center",*/bigThree);
757
+// X                   framePanel.add(bigThree);
758
+// X                   frame.getContentPane().add(/*"Center",*/framePanel);
759
+                    framePanel.setDividerLocation(1);
760
+                    
761
+                    //frame.setVisible(true);
762
+                    radio.layout = keepButton;
763
+                    //theFrame = null;
764
+                    keepButton = null;
765
+                    radio.layout.doClick();
766
+                    
648767                 } else
649768                 {
650
-                    frame.getContentPane().remove(/*"Center",*/framePanel);
651
-                    framePanel.remove(bigThree);
652
-                    frame.getContentPane().add(/*"Center",*/bigThree);
769
+                    keepButton = radio.layout;
770
+                    //keeprect = frame.getBounds();
771
+//                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
772
+//                        frame.getToolkit().getScreenSize().height);
773
+                    //frame.setVisible(false);
774
+                    device.setFullScreenWindow(frame);
775
+//                frame.removeNotify();
776
+//                frame.setUndecorated(true);
777
+//                frame.addNotify();
778
+// X                   frame.getContentPane().remove(/*"Center",*/framePanel);
779
+// X                   framePanel.remove(bigThree);
780
+// X                   frame.getContentPane().add(/*"Center",*/bigThree);
781
+                    framePanel.setDividerLocation(0);
782
+
783
+                    radio.layout = fullscreenLayout;
784
+                    radio.layout.doClick();
785
+                    //frame.setVisible(true);
653786                 }
654
-                cameraView.ToggleFullScreen();
655787         }
656788 
657789     private JTextPane createTextPane()
....@@ -784,6 +916,7 @@
784916 //    NumberSlider vDivsField;
785917 //    JCheckBox endcaps;
786918     JCheckBox liveCB;
919
+    JCheckBox selectCB;
787920     JCheckBox hideCB;
788921     JCheckBox link2masterCB;
789922     JCheckBox markCB;
....@@ -791,7 +924,12 @@
791924     JCheckBox speedupCB;
792925     JCheckBox rewindCB;
793926     JCheckBox flipVCB;
927
+    
928
+    cCheckBox toggleTextureCB;
929
+    cCheckBox toggleSwitchCB;
930
+        
794931     JComboBox texresMenu;
932
+    
795933     JButton resetButton;
796934     JButton stepButton;
797935     JButton stepAllButton;
....@@ -800,9 +938,13 @@
800938     JButton fasterButton;
801939     JButton remarkButton;
802940     
941
+    cGridBag editPanel;
942
+    cGridBag editCommandsPanel;
943
+    
803944     cGridBag namePanel;
804945     cGridBag setupPanel;
805
-    cGridBag commandsPanel;
946
+    cGridBag setupPanel2;
947
+    cGridBag objectCommandsPanel;
806948     cGridBag pushPanel;
807949     cGridBag fillPanel;
808950 
....@@ -979,56 +1121,62 @@
9791121         
9801122         oe.ctrlPanel.Return();
9811123         
982
-        if (!GroupEditor.allparams)
1124
+        if (!allparams)
9831125             return;
9841126 
9851127             setupPanel = new cGridBag().setVertical(false);
9861128             
9871129         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
9881130                 liveCB.setToolTipText("Animate object");
1131
+        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1132
+                selectCB.setToolTipText("Make object selectable");
1133
+//            Return();
9891134         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
9901135                 hideCB.setToolTipText("Hide object");
991
-//            Return();
9921136         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
993
-        markCB.setToolTipText("Set the animation target transform");
1137
+        markCB.setToolTipText("As animation target transform");
9941138         
995
-        rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
1139
+            setupPanel2 = new cGridBag().setVertical(false);
1140
+            
1141
+        rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
9961142         rewindCB.setToolTipText("Rewind animation");
9971143         
998
-        randomCB = AddCheckBox(setupPanel, "Random", copy.random);
999
-        randomCB.setToolTipText("Option for switch node");
1144
+        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1145
+        randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
10001146 
10011147         if (Globals.ADVANCED)
10021148         {
1003
-                link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1149
+                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
10041150                 link2masterCB.setToolTipText("Attach to support");
1005
-                speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
1151
+                speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
10061152                 speedupCB.setToolTipText("Option motion capture");
10071153         }
10081154         
10091155         oe.ctrlPanel.add(setupPanel);
10101156         oe.ctrlPanel.Return();
1157
+        oe.ctrlPanel.add(setupPanel2);
1158
+        oe.ctrlPanel.Return();
10111159         
1012
-            commandsPanel = new cGridBag().setVertical(false);
1160
+            objectCommandsPanel = new cGridBag().setVertical(false);
10131161         
1014
-        resetButton = AddButton(commandsPanel, "Reset");
1162
+        resetButton = AddButton(objectCommandsPanel, "Reset");
10151163         resetButton.setToolTipText("Jump to frame zero");
1016
-        stepButton = AddButton(commandsPanel, "Step");
1164
+        stepButton = AddButton(objectCommandsPanel, "Step");
10171165         stepButton.setToolTipText("Step one frame");
10181166 //            resetAllButton = AddButton(oe, "Reset All");
10191167 //            stepAllButton = AddButton(oe, "Step All");
10201168 //            Return();
1021
-        slowerButton = AddButton(commandsPanel, "Slow");
1169
+        slowerButton = AddButton(objectCommandsPanel, "Slow");
10221170         slowerButton.setToolTipText("Decrease animation speed");
1023
-        fasterButton = AddButton(commandsPanel, "Fast");
1171
+        fasterButton = AddButton(objectCommandsPanel, "Fast");
10241172         fasterButton.setToolTipText("Increase animation speed");
1025
-        remarkButton = AddButton(commandsPanel, "Remark");
1173
+        remarkButton = AddButton(objectCommandsPanel, "Remark");
10261174         remarkButton.setToolTipText("Set the current transform as the target");
10271175 
1028
-        oe.ctrlPanel.add(commandsPanel);
1176
+        oe.ctrlPanel.add(objectCommandsPanel);
10291177         oe.ctrlPanel.Return();
10301178 
1031
-    pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
1179
+    pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
10321180     normalpushField = (cNumberSlider)pushPanel.getComponent(1);
10331181     //Return();
10341182 
....@@ -1231,8 +1379,11 @@
12311379         //worldPanel.setName("World");
12321380 	centralPanel = new cGridBag();
12331381         centralPanel.preferredWidth = 20;
1234
-	timelinePanel = new JPanel(new BorderLayout());
1235
-        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1382
+        
1383
+        if (Globals.ADVANCED)
1384
+        {
1385
+            timelinePanel = new JPanel(new BorderLayout());
1386
+            timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
12361387 
12371388         cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
12381389         cameraPanel.setContinuousLayout(true);
....@@ -1241,7 +1392,10 @@
12411392 //        cameraPanel.setDividerSize(9);
12421393         cameraPanel.setResizeWeight(1.0);
12431394         
1395
+        }
1396
+        
12441397         centralPanel.add(cameraView);
1398
+        centralPanel.setFocusable(true);
12451399         //frame.setJMenuBar(timelineMenubar);
12461400         //centralPanel.add(timelinePanel);
12471401         
....@@ -1308,8 +1462,9 @@
13081462 //        north.setName("Edit");
13091463 //        north.add(ctrlPanel, BorderLayout.NORTH);
13101464 //        objectPanel.add(north);
1311
-        objectPanel.add(ctrlPanel);
1465
+        objectPanel.add(editPanel);
13121466         objectPanel.add(infoPanel);
1467
+        objectPanel.add(toolboxPanel);
13131468 
13141469         /*
13151470         aConstraints.gridx = 0;
....@@ -1318,7 +1473,7 @@
13181473         aConstraints.gridy += 1;
13191474         aConstraints.gridwidth = 1;
13201475         mainPanel.add(objectPanel, aConstraints);
1321
-         */
1476
+        */
13221477 
13231478         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
13241479                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1335,9 +1490,7 @@
13351490         JTabbedPane tabbedPane = new JTabbedPane();
13361491         tabbedPane.add(scrollpane);
13371492 
1338
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1339
-
1340
-        optionsPanel = new cGridBag().setVertical(true);
1493
+        optionsPanel = new cGridBag().setVertical(false);
13411494 
13421495         optionsPanel.setName("Options");
13431496         
....@@ -1345,6 +1498,8 @@
13451498         
13461499         tabbedPane.add(optionsPanel);
13471500         
1501
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1502
+
13481503         scenePanel.add(tabbedPane);
13491504 
13501505         /*
....@@ -1437,8 +1592,12 @@
14371592 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14381593 
14391594         frame.setSize(1280, 860);
1595
+        
1596
+        frame.validate();
14401597         frame.setVisible(true);
14411598 
1599
+                    cameraView.requestFocusInWindow();
1600
+                    
14421601         gridPanel.setDividerLocation(1.0);
14431602 
14441603         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
....@@ -1988,6 +2147,7 @@
19882147             e2.printStackTrace();
19892148         }
19902149     }
2150
+    
19912151     LoadJMEThread loadThread;
19922152 
19932153     class LoadJMEThread extends Thread
....@@ -2045,6 +2205,7 @@
20452205             //LoadFile0(filename, converter);
20462206         }
20472207     }
2208
+    
20482209     LoadOBJThread loadObjThread;
20492210 
20502211     class LoadOBJThread extends Thread
....@@ -2123,19 +2284,19 @@
21232284 
21242285     void LoadObjFile(String fullname)
21252286     {
2126
-        /*
2287
+        System.out.println("Loading " + fullname);
2288
+        /**/
21272289         //lastFilename = fullname;
21282290         if(loadObjThread == null)
21292291         {
2130
-        loadObjThread = new LoadOBJThread();
2131
-        loadObjThread.start();
2292
+            loadObjThread = new LoadOBJThread();
2293
+            loadObjThread.start();
21322294         }
21332295         
21342296         loadObjThread.add(fullname);
2135
-         */
2297
+        /**/
21362298 
2137
-        System.out.println("Loading " + fullname);
2138
-        makeSomething(new FileObject(fullname, true), true);
2299
+        //makeSomething(new FileObject(fullname, true), true);
21392300     }
21402301 
21412302     void LoadGFDFile(String fullname)
....@@ -2752,6 +2913,8 @@
27522913 
27532914     void SetMaterial(Object3D object)
27542915     {
2916
+        latestObject = object;
2917
+        
27552918         cMaterial mat = object.material;
27562919 
27572920         if (mat == null)
....@@ -2863,12 +3026,17 @@
28633026 //                }
28643027 
28653028         /**/
2866
-        if (deselect)
3029
+        if (deselect || child == null)
28673030         {
28683031             //group.deselectAll();
28693032             //freeze = true;
28703033             GetTree().clearSelection();
28713034             //freeze = false;
3035
+            
3036
+            if (child == null)
3037
+            {
3038
+                return;
3039
+            }
28723040         }
28733041 
28743042         //group.addSelectee(child);
....@@ -2937,7 +3105,7 @@
29373105             cameraView.ToggleDL();
29383106             cameraView.repaint();
29393107             return;
2940
-        } else if (event.getSource() == toggleTextureItem)
3108
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
29413109         {
29423110             cameraView.ToggleTexture();
29433111             // june 2013           copy.HardTouch();
....@@ -2976,9 +3144,9 @@
29763144             frame.validate();
29773145 
29783146             return;
2979
-        } else if (event.getSource() == toggleSwitchItem)
3147
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
29803148         {
2981
-            cameraView.ToggleRandom();
3149
+            cameraView.ToggleSwitch();
29823150             cameraView.repaint();
29833151             return;
29843152         } else if (event.getSource() == toggleHandleItem)
....@@ -3006,6 +3174,10 @@
30063174         } else if (event.getSource() == liveCB)
30073175         {
30083176             copy.live ^= true;
3177
+            return;
3178
+        } else if (event.getSource() == selectCB)
3179
+        {
3180
+            copy.dontselect ^= true;
30093181             return;
30103182         } else if (event.getSource() == hideCB)
30113183         {
....@@ -3045,8 +3217,9 @@
30453217 
30463218     public void actionPerformed(ActionEvent event)
30473219     {
3220
+        Object source = event.getSource();
30483221         // SCRIPT DIALOG
3049
-        if (event.getSource() == okbutton)
3222
+        if (source == okbutton)
30503223         {
30513224             textpanel.setVisible(false);
30523225             textpanel.remove(textarea);
....@@ -3058,7 +3231,7 @@
30583231             textarea = null;
30593232             textpanel = null;
30603233         }
3061
-        if (event.getSource() == cancelbutton)
3234
+        if (source == cancelbutton)
30623235         {
30633236             textpanel.setVisible(false);
30643237             textpanel.remove(textarea);
....@@ -3070,50 +3243,50 @@
30703243         //applySelf();
30713244         //client.refreshEditWindow();
30723245         //refreshContents();
3073
-        if (event.getSource() == nameField)
3246
+        if (source == nameField)
30743247         {
30753248             //System.out.println("ObjEditor " + event);
30763249             applySelf0(true);
30773250             //parent.applySelf();
30783251             objEditor.refreshContents();
3079
-        } else if (event.getSource() == resetButton)
3252
+        } else if (source == resetButton)
30803253         {
30813254             CameraPane.fullreset = true;
30823255             copy.Reset(); // ResetMeshes();
30833256             copy.Touch();
30843257             objEditor.refreshContents();
3085
-        } else if (event.getSource() == stepItem)
3258
+        } else if (source == stepItem)
30863259         {
30873260             //cameraView.ONESTEP = true;
30883261             Globals.ONESTEP = true;
30893262             cameraView.repaint();
30903263             return;
3091
-        } else if (event.getSource() == stepButton)
3264
+        } else if (source == stepButton)
30923265         {
30933266             copy.Step();
30943267             copy.Touch();
30953268             objEditor.refreshContents();
3096
-        } else if (event.getSource() == slowerButton)
3269
+        } else if (source == slowerButton)
30973270         {
30983271             copy.Slower();
30993272             copy.Touch();
31003273             objEditor.refreshContents();
3101
-        } else if (event.getSource() == fasterButton)
3274
+        } else if (source == fasterButton)
31023275         {
31033276             copy.Faster();
31043277             copy.Touch();
31053278             objEditor.refreshContents();
3106
-        } else if (event.getSource() == remarkButton)
3279
+        } else if (source == remarkButton)
31073280         {
31083281             copy.Remark();
31093282             copy.Touch();
31103283             objEditor.refreshContents();
3111
-        } else if (event.getSource() == stepAllButton)
3284
+        } else if (source == stepAllButton)
31123285         {
31133286             copy.StepAll();
31143287             copy.Touch();
31153288             objEditor.refreshContents();
3116
-        } else if (event.getSource() == resetAllButton)
3289
+        } else if (source == resetAllButton)
31173290         {
31183291             //CameraPane.fullreset = true;
31193292             copy.ResetAll(); // ResetMeshes();
....@@ -3146,53 +3319,75 @@
31463319         //			Close();
31473320         //		}
31483321         //                else
3149
-        if (event.getSource() == resetSlidersButton)
3322
+        if (source == resetSlidersButton)
31503323         {
31513324             ResetSliders();
3152
-        } else if (event.getSource() == clearMaterialButton)
3325
+        } else if (source == clearMaterialButton)
31533326         {
31543327             ClearMaterial();
3155
-        } else if (event.getSource() == createMaterialButton)
3328
+        } else if (source == createMaterialButton)
31563329         {
31573330             CreateMaterial();
3158
-        } else if (event.getSource() == clearPanelButton)
3331
+        } else if (source == clearPanelButton)
31593332         {
31603333             copy.ClearUI();
31613334             refreshContents(true);
3162
-        } /*
3163
-        }
3164
-        
3165
-        public boolean action(Event event, Object arg)
3166
-        {
3167
-         */ else if (event.getSource() == closeItem)
3335
+        } else if (source == importGFDItem)
3336
+		{
3337
+			ImportGFD();
3338
+		} else
3339
+		if (source == importVRMLX3DItem)
3340
+		{
3341
+			ImportVRMLX3D();
3342
+		} else
3343
+		if (source == import3DSItem)
3344
+		{
3345
+			objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
3346
+		} else
3347
+		if (source == importOBJItem)
3348
+		{
3349
+			//objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
3350
+                            FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
3351
+                            browser.setVisible(true);
3352
+                            String filename = browser.getFile();
3353
+                            if (filename != null && filename.length() > 0)
3354
+                            {
3355
+                                String fullname = browser.getDirectory() + filename;
3356
+                                makeSomething(ReadOBJ(fullname), true);
3357
+                            }
3358
+		} else
3359
+        if (source == closeItem)
31683360         {
31693361             Close();
31703362             //return true;
3171
-        } else if (event.getSource() == loadItem)
3363
+        } else if (source == loadItem)
31723364         {
31733365             load();
31743366             //return true;
3175
-        } else if (event.getSource() == saveItem)
3367
+        } else if (source == newItem)
3368
+        {
3369
+            New();
3370
+        } else if (source == saveItem)
31763371         {
31773372             save();
31783373             //return true;
3179
-        } else if (event.getSource() == saveAsItem)
3374
+        } else if (source == saveAsItem)
31803375         {
31813376             saveAs();
31823377             //return true;
3183
-        } else if (event.getSource() == reexportItem)
3378
+        } else if (source == reexportItem)
31843379         {
31853380             reexport();
31863381             //return true;
3187
-        } else if (event.getSource() == exportAsItem)
3382
+        } else if (source == exportAsItem)
31883383         {
31893384             export();
31903385             //return true;
3191
-        } else if (event.getSource() == povItem)
3386
+        } else if (source == povItem)
31923387         {
31933388             generatePOV();
31943389             //return true;
3195
-        } else if (event.getSource() == zBufferItem)
3390
+        } else if (source == zBufferItem)
31963391         {
31973392             try
31983393             {
....@@ -3214,21 +3409,8 @@
32143409         cameraView.repaint();
32153410         //return true;
32163411         }
3217
-         */ else if (event.getSource() == editCameraItem)
3218
-        {
3219
-            cameraView.ProtectCamera();
3220
-            cameraView.repaint();
3221
-            return;
3222
-        } else if (event.getSource() == revertCameraItem)
3223
-        {
3224
-            cameraView.RevertCamera();
3225
-            cameraView.repaint();
3226
-            return;
3227
-//        } else if (event.getSource() == textureButton)
3228
-//        {
3229
-//            return; // true;
3230
-        } else // combos...
3231
-        if (event.getSource() == texresMenu)
3412
+         */ else // combos...
3413
+        if (source == texresMenu)
32323414         {
32333415             System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
32343416             copy.texres = texresMenu.getSelectedIndex();
....@@ -3240,6 +3422,281 @@
32403422         }
32413423     }
32423424 
3425
+    void New()
3426
+    {
3427
+        while (copy.Size() > 1)
3428
+        {
3429
+            copy.remove(1);
3430
+        }
3431
+        
3432
+        ResetModel();
3433
+        objEditor.refreshContents();
3434
+    }
3435
+    
3436
+    static public byte[] Compress(Object3D o)
3437
+    {
3438
+        try
3439
+        {
3440
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
3441
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3442
+            ObjectOutputStream out = new ObjectOutputStream(zstream);
3443
+
3444
+        Object3D parent = o.parent;
3445
+        o.parent = null;
3446
+        
3447
+            out.writeObject(o);
3448
+            
3449
+        o.parent = parent;
3450
+        
3451
+            out.flush();
3452
+
3453
+            zstream.close();
3454
+            out.close();
3455
+            
3456
+            return baos.toByteArray();
3457
+        } catch (Exception e)
3458
+        {
3459
+            System.err.println(e);
3460
+            return null;
3461
+        }
3462
+    }
3463
+
3464
+    static public Object Uncompress(byte[] bytes)
3465
+    {
3466
+        System.out.println("#bytes = " + bytes.length);
3467
+        try
3468
+        {
3469
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3470
+            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3471
+            ObjectInputStream in = new ObjectInputStream(istream);
3472
+            Object obj = in.readObject();
3473
+            in.close();
3474
+            
3475
+            return obj;
3476
+        } catch (Exception e)
3477
+        {
3478
+            System.err.println(e);
3479
+            return null;
3480
+        }
3481
+    }
3482
+
3483
+    static public Object clone(Object o)
3484
+    {
3485
+        try
3486
+        {
3487
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
3488
+            ObjectOutputStream out = new ObjectOutputStream(baos);
3489
+
3490
+            out.writeObject(o);
3491
+            
3492
+            out.flush();
3493
+            out.close();
3494
+            
3495
+            byte[] bytes = baos.toByteArray();
3496
+            
3497
+            System.out.println("clone = " + bytes.length);
3498
+
3499
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3500
+            ObjectInputStream in = new ObjectInputStream(bais);
3501
+            Object obj = in.readObject();
3502
+            in.close();
3503
+            
3504
+            return obj;
3505
+        } catch (Exception e)
3506
+        {
3507
+            System.err.println(e);
3508
+            return null;
3509
+        }
3510
+    }
3511
+
3512
+    cRadio GetCurrentTab()
3513
+    {
3514
+        cRadio ab;
3515
+        for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3516
+        {
3517
+            ab = (cRadio)e.nextElement();
3518
+            if(ab.GetObject() == copy)
3519
+            {
3520
+                return ab;
3521
+            }
3522
+        }
3523
+        
3524
+        return null;
3525
+    }
3526
+    
3527
+    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3528
+    
3529
+    public void Save()
3530
+    {
3531
+        System.err.println("Save");
3532
+        
3533
+        cRadio tab = GetCurrentTab();
3534
+        
3535
+        boolean temp = CameraPane.SWITCH;
3536
+        CameraPane.SWITCH = false;
3537
+        
3538
+        copy.ExtractBigData(hashtable);
3539
+        
3540
+        //EditorFrame.m_MainFrame.requestFocusInWindow();
3541
+        tab.graphs[tab.undoindex++] = Compress(copy);
3542
+
3543
+        copy.RestoreBigData(hashtable);
3544
+
3545
+        CameraPane.SWITCH = temp;
3546
+        
3547
+        //assert(hashtable.isEmpty());
3548
+        
3549
+        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3550
+        {
3551
+            tab.graphs[i] = null;
3552
+        }
3553
+
3554
+        SetUndoStates();
3555
+        
3556
+        // test save
3557
+        if (false)
3558
+        {
3559
+            try
3560
+            {
3561
+                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3562
+                ObjectOutputStream p = new ObjectOutputStream(ostream);
3563
+
3564
+                p.writeObject(copy);
3565
+                
3566
+                p.flush();
3567
+
3568
+                ostream.close();
3569
+            } catch (Exception e)
3570
+            {
3571
+                e.printStackTrace();
3572
+            }
3573
+        }
3574
+    }
3575
+
3576
+    void CopyChanged(Object3D obj)
3577
+    {
3578
+        SetUndoStates();
3579
+        
3580
+        boolean temp = CameraPane.SWITCH;
3581
+        CameraPane.SWITCH = false;
3582
+        
3583
+        copy.ExtractBigData(hashtable);
3584
+        
3585
+        copy.clear();
3586
+        
3587
+        for (int i=0; i<obj.Size(); i++)
3588
+        {
3589
+            copy.add(obj.get(i));
3590
+        }
3591
+        
3592
+        copy.RestoreBigData(hashtable);
3593
+        
3594
+        CameraPane.SWITCH = temp;
3595
+        
3596
+        //assert(hashtable.isEmpty());
3597
+        
3598
+        copy.Touch();
3599
+        
3600
+        ResetModel();
3601
+        copy.HardTouch(); // recompile?
3602
+        
3603
+        cRadio ab;
3604
+        for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3605
+        {
3606
+            ab = (cRadio)e.nextElement();
3607
+            Object3D test = copy.GetObject(ab.object.GetUUID());
3608
+            //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3609
+            if (test != null)
3610
+            {
3611
+                test.editWindow = ab.object.editWindow;
3612
+                ab.object = test;
3613
+            }
3614
+        }
3615
+        
3616
+        refreshContents();
3617
+    }
3618
+    
3619
+    cButton undoButton;
3620
+    cButton redoButton;
3621
+        
3622
+    void SetUndoStates()
3623
+    {
3624
+        cRadio tab = GetCurrentTab();
3625
+        
3626
+        undoButton.setEnabled(tab.undoindex > 0);
3627
+        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
3628
+    }
3629
+    
3630
+    public void Undo()
3631
+    {
3632
+        System.err.println("Undo");
3633
+        
3634
+        cRadio tab = GetCurrentTab();
3635
+        
3636
+        if (tab.undoindex == 0)
3637
+        {
3638
+            java.awt.Toolkit.getDefaultToolkit().beep();
3639
+            return;
3640
+        }
3641
+
3642
+        if (tab.graphs[tab.undoindex] == null)
3643
+        {
3644
+            Save();
3645
+            tab.undoindex -= 1;
3646
+        }
3647
+
3648
+        tab.undoindex -= 1;
3649
+
3650
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3651
+    }
3652
+
3653
+    public void Redo()
3654
+    {
3655
+        cRadio tab = GetCurrentTab();
3656
+        
3657
+        if (tab.graphs[tab.undoindex + 1] == null)
3658
+        {
3659
+            java.awt.Toolkit.getDefaultToolkit().beep();
3660
+            return;
3661
+        }
3662
+
3663
+        tab.undoindex += 1;
3664
+
3665
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3666
+    }
3667
+
3668
+        void ImportGFD()
3669
+        {
3670
+            FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3671
+            browser.show();
3672
+            String filename = browser.getFile();
3673
+            if (filename != null && filename.length() > 0)
3674
+            {
3675
+                String fullname = browser.getDirectory() + filename;
3676
+
3677
+                //Object3D readobj =
3678
+                        objEditor.ReadGFD(fullname, objEditor);
3679
+                //makeSomething(readobj);
3680
+            }
3681
+        }
3682
+        
3683
+	void ImportVRMLX3D()
3684
+	{
3685
+		if (Grafreed.standAlone)
3686
+		{
3687
+                    /**/
3688
+			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
3689
+			browser.show();
3690
+			String filename = browser.getFile();
3691
+			if (filename != null && filename.length() > 0)
3692
+			{
3693
+				String fullname = browser.getDirectory() + filename;
3694
+                                LoadVRMLX3D(fullname);
3695
+			}
3696
+                     /**/
3697
+		}
3698
+	}
3699
+				
32433700     void ToggleAnimation()
32443701     {
32453702         if (!Globals.ANIMATION)
....@@ -3357,7 +3814,7 @@
33573814         assert false;
33583815     }
33593816 
3360
-    void EditSelection()
3817
+    void EditSelection(boolean newWindow)
33613818     {
33623819     }
33633820 
....@@ -3588,7 +4045,7 @@
35884045         }
35894046         
35904047         if (normalpushField != null)
3591
-                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
4048
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35924049     }
35934050 
35944051         void SnapObject()
....@@ -3852,6 +4309,8 @@
38524309 
38534310     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
38544311     {
4312
+        if (Globals.SAVEONMAKE) // && resetmodel)
4313
+            Save();
38554314         //Tween.set(thing, 0).target(1).start(tweenManager);
38564315         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
38574316 //            if (thing instanceof GenericJointDemo)
....@@ -3938,6 +4397,12 @@
39384397         {
39394398             ResetModel();
39404399             Select(thing.GetTreePath(), true, false); // unselect... false);
4400
+            
4401
+        if (thing.Size() == 0)
4402
+        {
4403
+            //EditSelection(false);
4404
+        }
4405
+        
39414406             refreshContents();
39424407         }
39434408 
....@@ -4055,6 +4520,7 @@
40554520             }
40564521         }
40574522     }
4523
+    
40584524     LoadGFDThread loadGFDThread;
40594525 
40604526     void ReadGFD(String fullname, iCallBack cb)
....@@ -4074,8 +4540,10 @@
40744540 
40754541         try
40764542         {
4543
+            // Try compressed version first.
40774544             java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4078
-            java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4545
+            java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4546
+            java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
40794547 
40804548             readobj = (Object3D) p.readObject();
40814549             istream.close();
....@@ -4083,7 +4551,20 @@
40834551             readobj.ResetDisplayList();
40844552         } catch (Exception e)
40854553         {
4086
-            e.printStackTrace();
4554
+            //e.printStackTrace();
4555
+            try
4556
+            {
4557
+                java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4558
+                java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4559
+
4560
+                readobj = (Object3D) p.readObject();
4561
+                istream.close();
4562
+
4563
+                readobj.ResetDisplayList();
4564
+            } catch (Exception e2)
4565
+            {
4566
+                e2.printStackTrace();
4567
+            }
40874568         }
40884569 //            catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
40894570 //            catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4129,6 +4610,12 @@
41294610 
41304611     void LoadIt(Object obj)
41314612     {
4613
+        if (obj == null)
4614
+        {
4615
+            // Invalid file
4616
+            return;
4617
+        }
4618
+        
41324619         System.out.println("Loaded " + obj);
41334620         //new Exception().printStackTrace();
41344621         Object3D readobj = (Object3D) obj;
....@@ -4138,6 +4625,8 @@
41384625         
41394626         if (readobj != null)
41404627         {
4628
+        if (Globals.SAVEONMAKE)
4629
+            Save();
41414630             try
41424631             {
41434632                 //readobj.deepCopySelf(copy);
....@@ -4287,11 +4776,13 @@
42874776         try
42884777         {
42894778             FileOutputStream ostream = new FileOutputStream(lastname);
4290
-            ObjectOutputStream p = new ObjectOutputStream(ostream);
4779
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4780
+            ObjectOutputStream p = new ObjectOutputStream(zstream);
42914781 
42924782             p.writeObject(copy);
42934783             p.flush();
42944784 
4785
+            zstream.close();
42954786             ostream.close();
42964787 
42974788             //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4301,6 +4792,7 @@
43014792         {
43024793         }
43034794     }
4795
+    
43044796     String lastname;
43054797 
43064798     void saveAs()
....@@ -4312,6 +4804,8 @@
43124804             String filename = browser.getFile();
43134805             if (filename != null && filename.length() > 0)
43144806             {
4807
+                if (!filename.endsWith(".gfd"))
4808
+                    filename += ".gfd";
43154809                 lastname = browser.getDirectory() + filename;
43164810                 save();
43174811             }
....@@ -4410,8 +4904,8 @@
44104904         try
44114905         {
44124906             FileOutputStream ostream = new FileOutputStream(filename);
4413
-            // ??        java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4414
-            ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
4907
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4908
+            ObjectOutputStream p = new ObjectOutputStream(zstream);
44154909 
44164910             Object3D objectparent = obj.parent;
44174911             obj.parent = null;
....@@ -4428,8 +4922,8 @@
44284922             p.writeObject(object);
44294923             p.flush();
44304924 
4925
+            zstream.close();
44314926             ostream.close();
4432
-            //       zstream.close();
44334927 
44344928 //                                    group.selection.get(0).parent = parent;
44354929             //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4476,7 +4970,8 @@
44764970     Object3D client;
44774971     Object3D copy;
44784972     MenuBar menuBar;
4479
-    Menu windowMenu;
4973
+    Menu fileMenu;
4974
+    MenuItem newItem;
44804975     MenuItem loadItem;
44814976     MenuItem saveItem;
44824977     MenuItem saveAsItem;
....@@ -4484,11 +4979,9 @@
44844979     MenuItem reexportItem;
44854980     MenuItem povItem;
44864981     MenuItem closeItem;
4487
-    Menu cameraMenu;
4982
+    
44884983     CheckboxMenuItem zBufferItem;
44894984     //MenuItem normalLensItem;
4490
-    MenuItem editCameraItem;
4491
-    MenuItem revertCameraItem;
44924985     MenuItem stepItem;
44934986     CheckboxMenuItem toggleLiveItem;
44944987     CheckboxMenuItem toggleFullScreenItem;
....@@ -4506,18 +4999,31 @@
45064999     CheckboxMenuItem togglePaintItem;
45075000     JSplitPane mainPanel;
45085001     JScrollPane scrollpane;
5002
+    
45095003     JPanel toolbarPanel;
5004
+    
45105005     cGridBag treePanel;
5006
+    
45115007     JPanel radioPanel;
45125008     ButtonGroup buttonGroup;
4513
-    cGridBag ctrlPanel;
5009
+    
5010
+    cGridBag toolboxPanel;
45145011     cGridBag materialPanel;
5012
+    cGridBag ctrlPanel;
5013
+    
45155014     JScrollPane infoPanel;
5015
+    
45165016     cGridBag optionsPanel;
5017
+    
45175018     JTabbedPane objectPanel;
5019
+    boolean materialFlushed;
5020
+    Object3D latestObject;
5021
+    
45185022     cGridBag XYZPanel;
5023
+    
45195024     JSplitPane gridPanel;
45205025     JSplitPane bigPanel;
5026
+    
45215027     cGridBag bigThree;
45225028     cGridBag scenePanel;
45235029     cGridBag centralPanel;
....@@ -4632,8 +5138,13 @@
46325138     cNumberSlider fogField;
46335139     JLabel opacityPowerLabel;
46345140     cNumberSlider opacityPowerField;
4635
-    JTree jTree;
5141
+    cTree jTree;
46365142     //ObjectUI parent;
46375143     
46385144     cNumberSlider normalpushField;
5145
+    
5146
+	private MenuItem importGFDItem;
5147
+	private MenuItem importVRMLX3DItem;
5148
+	private MenuItem import3DSItem;
5149
+	private MenuItem importOBJItem;
46395150 }