blame | history | patch | commit | commitdiff
Normand Briere
2019-06-27 1807e7752960ac229cddd34b100e92cadbac9459 
 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,14 @@
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
+    mainPanel.setUI(new BasicSplitPaneUI());
471
+    
411472         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
412473         //mainPanel.setLayout(new GridBagLayout());
413474         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -475,10 +536,10 @@
475536             e.printStackTrace();
476537         }
477538         
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();
539
+//        String selection = infoarea.getText();
540
+//        java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
541
+//        java.awt.datatransfer.Clipboard clipboard = 
542
+//                Toolkit.getDefaultToolkit().getSystemClipboard();
482543         //clipboard.setContents(data, data);
483544     }
484545     
....@@ -501,13 +562,13 @@
501562         //SendInfo("Name:", "bold");
502563         if (sel.GetTextures() != null || debug)
503564         {
504
-            si.SendInfo(sel.toString(), "bold");
565
+            si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
505566             //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
506567             if (sel.Size() > 0)
507568             {
508569                 si.SendInfo("#children = " + sel.Size(), "regular");
509570             }
510
-            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent, "regular");
571
+            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
511572             if (debug)
512573             {
513574                 try
....@@ -549,7 +610,7 @@
549610                 }
550611                 if (sel.support != null)
551612                 {
552
-                    si.SendInfo("    support: " + sel.support, "regular");
613
+                    si.SendInfo("    support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
553614                 }
554615                 if (sel.scriptnode != null)
555616                 {
....@@ -638,20 +699,92 @@
638699         }
639700     }
640701 
702
+static GraphicsDevice device = GraphicsEnvironment
703
+        .getLocalGraphicsEnvironment().getScreenDevices()[0];
704
+
705
+    Rectangle keeprect;
706
+        cRadio radio;
707
+        
708
+cButton keepButton;
709
+	cButton twoButton; // Full 3D
710
+	cButton sixButton;
711
+	cButton threeButton;
712
+	cButton sevenButton;
713
+	cButton fourButton; // full panel
714
+	cButton oneButton; // full XYZ
715
+        //cButton currentLayout;
716
+        
717
+        boolean maximized;
718
+    
719
+        cButton fullscreenLayout;
720
+
721
+        void Minimize()
722
+        {
723
+            frame.setState(Frame.ICONIFIED);
724
+        }
725
+        
726
+        void Maximize()
727
+        {
728
+            if (maximized)
729
+            {
730
+                frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
731
+            }
732
+            else
733
+            {
734
+                keeprect = frame.getBounds();
735
+                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
736
+                Dimension rect2 = frame.getToolkit().getScreenSize();
737
+                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
738
+//                frame.setState(Frame.MAXIMIZED_BOTH);
739
+            }
740
+            
741
+            maximized ^= true;
742
+        }
743
+        
641744         void ToggleFullScreen()
642745         {
643
-                if (CameraPane.FULLSCREEN)
746
+                cameraView.ToggleFullScreen();
747
+                
748
+                if (!CameraPane.FULLSCREEN)
644749                 {
645
-                    frame.getContentPane().remove(/*"Center",*/bigThree);
646
-                    framePanel.add(bigThree);
647
-                    frame.getContentPane().add(/*"Center",*/framePanel);
750
+                    device.setFullScreenWindow(null);
751
+                    //frame.setVisible(false);
752
+//                frame.removeNotify();
753
+//                frame.setUndecorated(false);
754
+//                frame.addNotify();
755
+                //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
756
+                    
757
+// X                   frame.getContentPane().remove(/*"Center",*/bigThree);
758
+// X                   framePanel.add(bigThree);
759
+// X                   frame.getContentPane().add(/*"Center",*/framePanel);
760
+                    framePanel.setDividerLocation(1);
761
+                    
762
+                    //frame.setVisible(true);
763
+                    radio.layout = keepButton;
764
+                    //theFrame = null;
765
+                    keepButton = null;
766
+                    radio.layout.doClick();
767
+                    
648768                 } else
649769                 {
650
-                    frame.getContentPane().remove(/*"Center",*/framePanel);
651
-                    framePanel.remove(bigThree);
652
-                    frame.getContentPane().add(/*"Center",*/bigThree);
770
+                    keepButton = radio.layout;
771
+                    //keeprect = frame.getBounds();
772
+//                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
773
+//                        frame.getToolkit().getScreenSize().height);
774
+                    //frame.setVisible(false);
775
+                    device.setFullScreenWindow(frame);
776
+//                frame.removeNotify();
777
+//                frame.setUndecorated(true);
778
+//                frame.addNotify();
779
+// X                   frame.getContentPane().remove(/*"Center",*/framePanel);
780
+// X                   framePanel.remove(bigThree);
781
+// X                   frame.getContentPane().add(/*"Center",*/bigThree);
782
+                    framePanel.setDividerLocation(0);
783
+
784
+                    radio.layout = fullscreenLayout;
785
+                    radio.layout.doClick();
786
+                    //frame.setVisible(true);
653787                 }
654
-                cameraView.ToggleFullScreen();
655788         }
656789 
657790     private JTextPane createTextPane()
....@@ -784,6 +917,7 @@
784917 //    NumberSlider vDivsField;
785918 //    JCheckBox endcaps;
786919     JCheckBox liveCB;
920
+    JCheckBox selectCB;
787921     JCheckBox hideCB;
788922     JCheckBox link2masterCB;
789923     JCheckBox markCB;
....@@ -791,7 +925,12 @@
791925     JCheckBox speedupCB;
792926     JCheckBox rewindCB;
793927     JCheckBox flipVCB;
928
+    
929
+    cCheckBox toggleTextureCB;
930
+    cCheckBox toggleSwitchCB;
931
+        
794932     JComboBox texresMenu;
933
+    
795934     JButton resetButton;
796935     JButton stepButton;
797936     JButton stepAllButton;
....@@ -800,9 +939,13 @@
800939     JButton fasterButton;
801940     JButton remarkButton;
802941     
942
+    cGridBag editPanel;
943
+    cGridBag editCommandsPanel;
944
+    
803945     cGridBag namePanel;
804946     cGridBag setupPanel;
805
-    cGridBag commandsPanel;
947
+    cGridBag setupPanel2;
948
+    cGridBag objectCommandsPanel;
806949     cGridBag pushPanel;
807950     cGridBag fillPanel;
808951 
....@@ -979,56 +1122,62 @@
9791122         
9801123         oe.ctrlPanel.Return();
9811124         
982
-        if (!GroupEditor.allparams)
1125
+        if (!allparams)
9831126             return;
9841127 
9851128             setupPanel = new cGridBag().setVertical(false);
9861129             
9871130         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
9881131                 liveCB.setToolTipText("Animate object");
1132
+        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1133
+                selectCB.setToolTipText("Make object selectable");
1134
+//            Return();
9891135         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
9901136                 hideCB.setToolTipText("Hide object");
991
-//            Return();
9921137         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
993
-        markCB.setToolTipText("Set the animation target transform");
1138
+        markCB.setToolTipText("As animation target transform");
9941139         
995
-        rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
1140
+            setupPanel2 = new cGridBag().setVertical(false);
1141
+            
1142
+        rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
9961143         rewindCB.setToolTipText("Rewind animation");
9971144         
998
-        randomCB = AddCheckBox(setupPanel, "Random", copy.random);
999
-        randomCB.setToolTipText("Option for switch node");
1145
+        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1146
+        randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
10001147 
10011148         if (Globals.ADVANCED)
10021149         {
1003
-                link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1150
+                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
10041151                 link2masterCB.setToolTipText("Attach to support");
1005
-                speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
1152
+                speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
10061153                 speedupCB.setToolTipText("Option motion capture");
10071154         }
10081155         
10091156         oe.ctrlPanel.add(setupPanel);
10101157         oe.ctrlPanel.Return();
1158
+        oe.ctrlPanel.add(setupPanel2);
1159
+        oe.ctrlPanel.Return();
10111160         
1012
-            commandsPanel = new cGridBag().setVertical(false);
1161
+            objectCommandsPanel = new cGridBag().setVertical(false);
10131162         
1014
-        resetButton = AddButton(commandsPanel, "Reset");
1163
+        resetButton = AddButton(objectCommandsPanel, "Reset");
10151164         resetButton.setToolTipText("Jump to frame zero");
1016
-        stepButton = AddButton(commandsPanel, "Step");
1165
+        stepButton = AddButton(objectCommandsPanel, "Step");
10171166         stepButton.setToolTipText("Step one frame");
10181167 //            resetAllButton = AddButton(oe, "Reset All");
10191168 //            stepAllButton = AddButton(oe, "Step All");
10201169 //            Return();
1021
-        slowerButton = AddButton(commandsPanel, "Slow");
1170
+        slowerButton = AddButton(objectCommandsPanel, "Slow");
10221171         slowerButton.setToolTipText("Decrease animation speed");
1023
-        fasterButton = AddButton(commandsPanel, "Fast");
1172
+        fasterButton = AddButton(objectCommandsPanel, "Fast");
10241173         fasterButton.setToolTipText("Increase animation speed");
1025
-        remarkButton = AddButton(commandsPanel, "Remark");
1174
+        remarkButton = AddButton(objectCommandsPanel, "Remark");
10261175         remarkButton.setToolTipText("Set the current transform as the target");
10271176 
1028
-        oe.ctrlPanel.add(commandsPanel);
1177
+        oe.ctrlPanel.add(objectCommandsPanel);
10291178         oe.ctrlPanel.Return();
10301179 
1031
-    pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
1180
+    pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
10321181     normalpushField = (cNumberSlider)pushPanel.getComponent(1);
10331182     //Return();
10341183 
....@@ -1231,8 +1380,11 @@
12311380         //worldPanel.setName("World");
12321381 	centralPanel = new cGridBag();
12331382         centralPanel.preferredWidth = 20;
1234
-	timelinePanel = new JPanel(new BorderLayout());
1235
-        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1383
+        
1384
+        if (Globals.ADVANCED)
1385
+        {
1386
+            timelinePanel = new JPanel(new BorderLayout());
1387
+            timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
12361388 
12371389         cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
12381390         cameraPanel.setContinuousLayout(true);
....@@ -1241,7 +1393,10 @@
12411393 //        cameraPanel.setDividerSize(9);
12421394         cameraPanel.setResizeWeight(1.0);
12431395         
1396
+        }
1397
+        
12441398         centralPanel.add(cameraView);
1399
+        centralPanel.setFocusable(true);
12451400         //frame.setJMenuBar(timelineMenubar);
12461401         //centralPanel.add(timelinePanel);
12471402         
....@@ -1308,8 +1463,9 @@
13081463 //        north.setName("Edit");
13091464 //        north.add(ctrlPanel, BorderLayout.NORTH);
13101465 //        objectPanel.add(north);
1311
-        objectPanel.add(ctrlPanel);
1466
+        objectPanel.add(editPanel);
13121467         objectPanel.add(infoPanel);
1468
+        objectPanel.add(toolboxPanel);
13131469 
13141470         /*
13151471         aConstraints.gridx = 0;
....@@ -1318,7 +1474,7 @@
13181474         aConstraints.gridy += 1;
13191475         aConstraints.gridwidth = 1;
13201476         mainPanel.add(objectPanel, aConstraints);
1321
-         */
1477
+        */
13221478 
13231479         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
13241480                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1335,9 +1491,7 @@
13351491         JTabbedPane tabbedPane = new JTabbedPane();
13361492         tabbedPane.add(scrollpane);
13371493 
1338
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1339
-
1340
-        optionsPanel = new cGridBag().setVertical(true);
1494
+        optionsPanel = new cGridBag().setVertical(false);
13411495 
13421496         optionsPanel.setName("Options");
13431497         
....@@ -1345,6 +1499,8 @@
13451499         
13461500         tabbedPane.add(optionsPanel);
13471501         
1502
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1503
+
13481504         scenePanel.add(tabbedPane);
13491505 
13501506         /*
....@@ -1437,8 +1593,12 @@
14371593 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14381594 
14391595         frame.setSize(1280, 860);
1596
+        
1597
+        frame.validate();
14401598         frame.setVisible(true);
14411599 
1600
+                    cameraView.requestFocusInWindow();
1601
+                    
14421602         gridPanel.setDividerLocation(1.0);
14431603 
14441604         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
....@@ -1988,6 +2148,7 @@
19882148             e2.printStackTrace();
19892149         }
19902150     }
2151
+    
19912152     LoadJMEThread loadThread;
19922153 
19932154     class LoadJMEThread extends Thread
....@@ -2045,6 +2206,7 @@
20452206             //LoadFile0(filename, converter);
20462207         }
20472208     }
2209
+    
20482210     LoadOBJThread loadObjThread;
20492211 
20502212     class LoadOBJThread extends Thread
....@@ -2123,19 +2285,19 @@
21232285 
21242286     void LoadObjFile(String fullname)
21252287     {
2126
-        /*
2288
+        System.out.println("Loading " + fullname);
2289
+        /**/
21272290         //lastFilename = fullname;
21282291         if(loadObjThread == null)
21292292         {
2130
-        loadObjThread = new LoadOBJThread();
2131
-        loadObjThread.start();
2293
+            loadObjThread = new LoadOBJThread();
2294
+            loadObjThread.start();
21322295         }
21332296         
21342297         loadObjThread.add(fullname);
2135
-         */
2298
+        /**/
21362299 
2137
-        System.out.println("Loading " + fullname);
2138
-        makeSomething(new FileObject(fullname, true), true);
2300
+        //makeSomething(new FileObject(fullname, true), true);
21392301     }
21402302 
21412303     void LoadGFDFile(String fullname)
....@@ -2752,6 +2914,8 @@
27522914 
27532915     void SetMaterial(Object3D object)
27542916     {
2917
+        latestObject = object;
2918
+        
27552919         cMaterial mat = object.material;
27562920 
27572921         if (mat == null)
....@@ -2863,12 +3027,17 @@
28633027 //                }
28643028 
28653029         /**/
2866
-        if (deselect)
3030
+        if (deselect || child == null)
28673031         {
28683032             //group.deselectAll();
28693033             //freeze = true;
28703034             GetTree().clearSelection();
28713035             //freeze = false;
3036
+            
3037
+            if (child == null)
3038
+            {
3039
+                return;
3040
+            }
28723041         }
28733042 
28743043         //group.addSelectee(child);
....@@ -2937,7 +3106,7 @@
29373106             cameraView.ToggleDL();
29383107             cameraView.repaint();
29393108             return;
2940
-        } else if (event.getSource() == toggleTextureItem)
3109
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
29413110         {
29423111             cameraView.ToggleTexture();
29433112             // june 2013           copy.HardTouch();
....@@ -2976,9 +3145,9 @@
29763145             frame.validate();
29773146 
29783147             return;
2979
-        } else if (event.getSource() == toggleSwitchItem)
3148
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
29803149         {
2981
-            cameraView.ToggleRandom();
3150
+            cameraView.ToggleSwitch();
29823151             cameraView.repaint();
29833152             return;
29843153         } else if (event.getSource() == toggleHandleItem)
....@@ -3006,6 +3175,10 @@
30063175         } else if (event.getSource() == liveCB)
30073176         {
30083177             copy.live ^= true;
3178
+            return;
3179
+        } else if (event.getSource() == selectCB)
3180
+        {
3181
+            copy.dontselect ^= true;
30093182             return;
30103183         } else if (event.getSource() == hideCB)
30113184         {
....@@ -3045,8 +3218,9 @@
30453218 
30463219     public void actionPerformed(ActionEvent event)
30473220     {
3221
+        Object source = event.getSource();
30483222         // SCRIPT DIALOG
3049
-        if (event.getSource() == okbutton)
3223
+        if (source == okbutton)
30503224         {
30513225             textpanel.setVisible(false);
30523226             textpanel.remove(textarea);
....@@ -3058,7 +3232,7 @@
30583232             textarea = null;
30593233             textpanel = null;
30603234         }
3061
-        if (event.getSource() == cancelbutton)
3235
+        if (source == cancelbutton)
30623236         {
30633237             textpanel.setVisible(false);
30643238             textpanel.remove(textarea);
....@@ -3070,50 +3244,50 @@
30703244         //applySelf();
30713245         //client.refreshEditWindow();
30723246         //refreshContents();
3073
-        if (event.getSource() == nameField)
3247
+        if (source == nameField)
30743248         {
30753249             //System.out.println("ObjEditor " + event);
30763250             applySelf0(true);
30773251             //parent.applySelf();
30783252             objEditor.refreshContents();
3079
-        } else if (event.getSource() == resetButton)
3253
+        } else if (source == resetButton)
30803254         {
30813255             CameraPane.fullreset = true;
30823256             copy.Reset(); // ResetMeshes();
30833257             copy.Touch();
30843258             objEditor.refreshContents();
3085
-        } else if (event.getSource() == stepItem)
3259
+        } else if (source == stepItem)
30863260         {
30873261             //cameraView.ONESTEP = true;
30883262             Globals.ONESTEP = true;
30893263             cameraView.repaint();
30903264             return;
3091
-        } else if (event.getSource() == stepButton)
3265
+        } else if (source == stepButton)
30923266         {
30933267             copy.Step();
30943268             copy.Touch();
30953269             objEditor.refreshContents();
3096
-        } else if (event.getSource() == slowerButton)
3270
+        } else if (source == slowerButton)
30973271         {
30983272             copy.Slower();
30993273             copy.Touch();
31003274             objEditor.refreshContents();
3101
-        } else if (event.getSource() == fasterButton)
3275
+        } else if (source == fasterButton)
31023276         {
31033277             copy.Faster();
31043278             copy.Touch();
31053279             objEditor.refreshContents();
3106
-        } else if (event.getSource() == remarkButton)
3280
+        } else if (source == remarkButton)
31073281         {
31083282             copy.Remark();
31093283             copy.Touch();
31103284             objEditor.refreshContents();
3111
-        } else if (event.getSource() == stepAllButton)
3285
+        } else if (source == stepAllButton)
31123286         {
31133287             copy.StepAll();
31143288             copy.Touch();
31153289             objEditor.refreshContents();
3116
-        } else if (event.getSource() == resetAllButton)
3290
+        } else if (source == resetAllButton)
31173291         {
31183292             //CameraPane.fullreset = true;
31193293             copy.ResetAll(); // ResetMeshes();
....@@ -3146,53 +3320,75 @@
31463320         //			Close();
31473321         //		}
31483322         //                else
3149
-        if (event.getSource() == resetSlidersButton)
3323
+        if (source == resetSlidersButton)
31503324         {
31513325             ResetSliders();
3152
-        } else if (event.getSource() == clearMaterialButton)
3326
+        } else if (source == clearMaterialButton)
31533327         {
31543328             ClearMaterial();
3155
-        } else if (event.getSource() == createMaterialButton)
3329
+        } else if (source == createMaterialButton)
31563330         {
31573331             CreateMaterial();
3158
-        } else if (event.getSource() == clearPanelButton)
3332
+        } else if (source == clearPanelButton)
31593333         {
31603334             copy.ClearUI();
31613335             refreshContents(true);
3162
-        } /*
3163
-        }
3164
-        
3165
-        public boolean action(Event event, Object arg)
3166
-        {
3167
-         */ else if (event.getSource() == closeItem)
3336
+        } else if (source == importGFDItem)
3337
+		{
3338
+			ImportGFD();
3339
+		} else
3340
+		if (source == importVRMLX3DItem)
3341
+		{
3342
+			ImportVRMLX3D();
3343
+		} else
3344
+		if (source == import3DSItem)
3345
+		{
3346
+			objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
3347
+		} else
3348
+		if (source == importOBJItem)
3349
+		{
3350
+			//objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
3351
+                            FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
3352
+                            browser.setVisible(true);
3353
+                            String filename = browser.getFile();
3354
+                            if (filename != null && filename.length() > 0)
3355
+                            {
3356
+                                String fullname = browser.getDirectory() + filename;
3357
+                                makeSomething(ReadOBJ(fullname), true);
3358
+                            }
3359
+		} else
3360
+        if (source == closeItem)
31683361         {
31693362             Close();
31703363             //return true;
3171
-        } else if (event.getSource() == loadItem)
3364
+        } else if (source == loadItem)
31723365         {
31733366             load();
31743367             //return true;
3175
-        } else if (event.getSource() == saveItem)
3368
+        } else if (source == newItem)
3369
+        {
3370
+            New();
3371
+        } else if (source == saveItem)
31763372         {
31773373             save();
31783374             //return true;
3179
-        } else if (event.getSource() == saveAsItem)
3375
+        } else if (source == saveAsItem)
31803376         {
31813377             saveAs();
31823378             //return true;
3183
-        } else if (event.getSource() == reexportItem)
3379
+        } else if (source == reexportItem)
31843380         {
31853381             reexport();
31863382             //return true;
3187
-        } else if (event.getSource() == exportAsItem)
3383
+        } else if (source == exportAsItem)
31883384         {
31893385             export();
31903386             //return true;
3191
-        } else if (event.getSource() == povItem)
3387
+        } else if (source == povItem)
31923388         {
31933389             generatePOV();
31943390             //return true;
3195
-        } else if (event.getSource() == zBufferItem)
3391
+        } else if (source == zBufferItem)
31963392         {
31973393             try
31983394             {
....@@ -3214,21 +3410,8 @@
32143410         cameraView.repaint();
32153411         //return true;
32163412         }
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)
3413
+         */ else // combos...
3414
+        if (source == texresMenu)
32323415         {
32333416             System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
32343417             copy.texres = texresMenu.getSelectedIndex();
....@@ -3240,6 +3423,281 @@
32403423         }
32413424     }
32423425 
3426
+    void New()
3427
+    {
3428
+        while (copy.Size() > 1)
3429
+        {
3430
+            copy.remove(1);
3431
+        }
3432
+        
3433
+        ResetModel();
3434
+        objEditor.refreshContents();
3435
+    }
3436
+    
3437
+    static public byte[] Compress(Object3D o)
3438
+    {
3439
+        try
3440
+        {
3441
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
3442
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3443
+            ObjectOutputStream out = new ObjectOutputStream(zstream);
3444
+
3445
+        Object3D parent = o.parent;
3446
+        o.parent = null;
3447
+        
3448
+            out.writeObject(o);
3449
+            
3450
+        o.parent = parent;
3451
+        
3452
+            out.flush();
3453
+
3454
+            zstream.close();
3455
+            out.close();
3456
+            
3457
+            return baos.toByteArray();
3458
+        } catch (Exception e)
3459
+        {
3460
+            System.err.println(e);
3461
+            return null;
3462
+        }
3463
+    }
3464
+
3465
+    static public Object Uncompress(byte[] bytes)
3466
+    {
3467
+        System.out.println("#bytes = " + bytes.length);
3468
+        try
3469
+        {
3470
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3471
+            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3472
+            ObjectInputStream in = new ObjectInputStream(istream);
3473
+            Object obj = in.readObject();
3474
+            in.close();
3475
+            
3476
+            return obj;
3477
+        } catch (Exception e)
3478
+        {
3479
+            System.err.println(e);
3480
+            return null;
3481
+        }
3482
+    }
3483
+
3484
+    static public Object clone(Object o)
3485
+    {
3486
+        try
3487
+        {
3488
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
3489
+            ObjectOutputStream out = new ObjectOutputStream(baos);
3490
+
3491
+            out.writeObject(o);
3492
+            
3493
+            out.flush();
3494
+            out.close();
3495
+            
3496
+            byte[] bytes = baos.toByteArray();
3497
+            
3498
+            System.out.println("clone = " + bytes.length);
3499
+
3500
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3501
+            ObjectInputStream in = new ObjectInputStream(bais);
3502
+            Object obj = in.readObject();
3503
+            in.close();
3504
+            
3505
+            return obj;
3506
+        } catch (Exception e)
3507
+        {
3508
+            System.err.println(e);
3509
+            return null;
3510
+        }
3511
+    }
3512
+
3513
+    cRadio GetCurrentTab()
3514
+    {
3515
+        cRadio ab;
3516
+        for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3517
+        {
3518
+            ab = (cRadio)e.nextElement();
3519
+            if(ab.GetObject() == copy)
3520
+            {
3521
+                return ab;
3522
+            }
3523
+        }
3524
+        
3525
+        return null;
3526
+    }
3527
+    
3528
+    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3529
+    
3530
+    public void Save()
3531
+    {
3532
+        System.err.println("Save");
3533
+        
3534
+        cRadio tab = GetCurrentTab();
3535
+        
3536
+        boolean temp = CameraPane.SWITCH;
3537
+        CameraPane.SWITCH = false;
3538
+        
3539
+        copy.ExtractBigData(hashtable);
3540
+        
3541
+        //EditorFrame.m_MainFrame.requestFocusInWindow();
3542
+        tab.graphs[tab.undoindex++] = Compress(copy);
3543
+
3544
+        copy.RestoreBigData(hashtable);
3545
+
3546
+        CameraPane.SWITCH = temp;
3547
+        
3548
+        //assert(hashtable.isEmpty());
3549
+        
3550
+        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3551
+        {
3552
+            tab.graphs[i] = null;
3553
+        }
3554
+
3555
+        SetUndoStates();
3556
+        
3557
+        // test save
3558
+        if (false)
3559
+        {
3560
+            try
3561
+            {
3562
+                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3563
+                ObjectOutputStream p = new ObjectOutputStream(ostream);
3564
+
3565
+                p.writeObject(copy);
3566
+                
3567
+                p.flush();
3568
+
3569
+                ostream.close();
3570
+            } catch (Exception e)
3571
+            {
3572
+                e.printStackTrace();
3573
+            }
3574
+        }
3575
+    }
3576
+
3577
+    void CopyChanged(Object3D obj)
3578
+    {
3579
+        SetUndoStates();
3580
+        
3581
+        boolean temp = CameraPane.SWITCH;
3582
+        CameraPane.SWITCH = false;
3583
+        
3584
+        copy.ExtractBigData(hashtable);
3585
+        
3586
+        copy.clear();
3587
+        
3588
+        for (int i=0; i<obj.Size(); i++)
3589
+        {
3590
+            copy.add(obj.get(i));
3591
+        }
3592
+        
3593
+        copy.RestoreBigData(hashtable);
3594
+        
3595
+        CameraPane.SWITCH = temp;
3596
+        
3597
+        //assert(hashtable.isEmpty());
3598
+        
3599
+        copy.Touch();
3600
+        
3601
+        ResetModel();
3602
+        copy.HardTouch(); // recompile?
3603
+        
3604
+        cRadio ab;
3605
+        for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3606
+        {
3607
+            ab = (cRadio)e.nextElement();
3608
+            Object3D test = copy.GetObject(ab.object.GetUUID());
3609
+            //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3610
+            if (test != null)
3611
+            {
3612
+                test.editWindow = ab.object.editWindow;
3613
+                ab.object = test;
3614
+            }
3615
+        }
3616
+        
3617
+        refreshContents();
3618
+    }
3619
+    
3620
+    cButton undoButton;
3621
+    cButton redoButton;
3622
+        
3623
+    void SetUndoStates()
3624
+    {
3625
+        cRadio tab = GetCurrentTab();
3626
+        
3627
+        undoButton.setEnabled(tab.undoindex > 0);
3628
+        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
3629
+    }
3630
+    
3631
+    public void Undo()
3632
+    {
3633
+        System.err.println("Undo");
3634
+        
3635
+        cRadio tab = GetCurrentTab();
3636
+        
3637
+        if (tab.undoindex == 0)
3638
+        {
3639
+            java.awt.Toolkit.getDefaultToolkit().beep();
3640
+            return;
3641
+        }
3642
+
3643
+        if (tab.graphs[tab.undoindex] == null)
3644
+        {
3645
+            Save();
3646
+            tab.undoindex -= 1;
3647
+        }
3648
+
3649
+        tab.undoindex -= 1;
3650
+
3651
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3652
+    }
3653
+
3654
+    public void Redo()
3655
+    {
3656
+        cRadio tab = GetCurrentTab();
3657
+        
3658
+        if (tab.graphs[tab.undoindex + 1] == null)
3659
+        {
3660
+            java.awt.Toolkit.getDefaultToolkit().beep();
3661
+            return;
3662
+        }
3663
+
3664
+        tab.undoindex += 1;
3665
+
3666
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3667
+    }
3668
+
3669
+        void ImportGFD()
3670
+        {
3671
+            FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3672
+            browser.show();
3673
+            String filename = browser.getFile();
3674
+            if (filename != null && filename.length() > 0)
3675
+            {
3676
+                String fullname = browser.getDirectory() + filename;
3677
+
3678
+                //Object3D readobj =
3679
+                        objEditor.ReadGFD(fullname, objEditor);
3680
+                //makeSomething(readobj);
3681
+            }
3682
+        }
3683
+        
3684
+	void ImportVRMLX3D()
3685
+	{
3686
+		if (Grafreed.standAlone)
3687
+		{
3688
+                    /**/
3689
+			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
3690
+			browser.show();
3691
+			String filename = browser.getFile();
3692
+			if (filename != null && filename.length() > 0)
3693
+			{
3694
+				String fullname = browser.getDirectory() + filename;
3695
+                                LoadVRMLX3D(fullname);
3696
+			}
3697
+                     /**/
3698
+		}
3699
+	}
3700
+				
32433701     void ToggleAnimation()
32443702     {
32453703         if (!Globals.ANIMATION)
....@@ -3357,7 +3815,7 @@
33573815         assert false;
33583816     }
33593817 
3360
-    void EditSelection()
3818
+    void EditSelection(boolean newWindow)
33613819     {
33623820     }
33633821 
....@@ -3588,7 +4046,7 @@
35884046         }
35894047         
35904048         if (normalpushField != null)
3591
-                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
4049
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35924050     }
35934051 
35944052         void SnapObject()
....@@ -3852,6 +4310,8 @@
38524310 
38534311     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
38544312     {
4313
+        if (Globals.SAVEONMAKE) // && resetmodel)
4314
+            Save();
38554315         //Tween.set(thing, 0).target(1).start(tweenManager);
38564316         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
38574317 //            if (thing instanceof GenericJointDemo)
....@@ -3938,6 +4398,12 @@
39384398         {
39394399             ResetModel();
39404400             Select(thing.GetTreePath(), true, false); // unselect... false);
4401
+            
4402
+        if (thing.Size() == 0)
4403
+        {
4404
+            //EditSelection(false);
4405
+        }
4406
+        
39414407             refreshContents();
39424408         }
39434409 
....@@ -4055,6 +4521,7 @@
40554521             }
40564522         }
40574523     }
4524
+    
40584525     LoadGFDThread loadGFDThread;
40594526 
40604527     void ReadGFD(String fullname, iCallBack cb)
....@@ -4074,8 +4541,10 @@
40744541 
40754542         try
40764543         {
4544
+            // Try compressed version first.
40774545             java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4078
-            java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4546
+            java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4547
+            java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
40794548 
40804549             readobj = (Object3D) p.readObject();
40814550             istream.close();
....@@ -4083,7 +4552,20 @@
40834552             readobj.ResetDisplayList();
40844553         } catch (Exception e)
40854554         {
4086
-            e.printStackTrace();
4555
+            //e.printStackTrace();
4556
+            try
4557
+            {
4558
+                java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4559
+                java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4560
+
4561
+                readobj = (Object3D) p.readObject();
4562
+                istream.close();
4563
+
4564
+                readobj.ResetDisplayList();
4565
+            } catch (Exception e2)
4566
+            {
4567
+                e2.printStackTrace();
4568
+            }
40874569         }
40884570 //            catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
40894571 //            catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4129,6 +4611,12 @@
41294611 
41304612     void LoadIt(Object obj)
41314613     {
4614
+        if (obj == null)
4615
+        {
4616
+            // Invalid file
4617
+            return;
4618
+        }
4619
+        
41324620         System.out.println("Loaded " + obj);
41334621         //new Exception().printStackTrace();
41344622         Object3D readobj = (Object3D) obj;
....@@ -4138,6 +4626,8 @@
41384626         
41394627         if (readobj != null)
41404628         {
4629
+        if (Globals.SAVEONMAKE)
4630
+            Save();
41414631             try
41424632             {
41434633                 //readobj.deepCopySelf(copy);
....@@ -4287,11 +4777,13 @@
42874777         try
42884778         {
42894779             FileOutputStream ostream = new FileOutputStream(lastname);
4290
-            ObjectOutputStream p = new ObjectOutputStream(ostream);
4780
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4781
+            ObjectOutputStream p = new ObjectOutputStream(zstream);
42914782 
42924783             p.writeObject(copy);
42934784             p.flush();
42944785 
4786
+            zstream.close();
42954787             ostream.close();
42964788 
42974789             //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4301,6 +4793,7 @@
43014793         {
43024794         }
43034795     }
4796
+    
43044797     String lastname;
43054798 
43064799     void saveAs()
....@@ -4312,6 +4805,8 @@
43124805             String filename = browser.getFile();
43134806             if (filename != null && filename.length() > 0)
43144807             {
4808
+                if (!filename.endsWith(".gfd"))
4809
+                    filename += ".gfd";
43154810                 lastname = browser.getDirectory() + filename;
43164811                 save();
43174812             }
....@@ -4410,8 +4905,8 @@
44104905         try
44114906         {
44124907             FileOutputStream ostream = new FileOutputStream(filename);
4413
-            // ??        java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4414
-            ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
4908
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4909
+            ObjectOutputStream p = new ObjectOutputStream(zstream);
44154910 
44164911             Object3D objectparent = obj.parent;
44174912             obj.parent = null;
....@@ -4428,8 +4923,8 @@
44284923             p.writeObject(object);
44294924             p.flush();
44304925 
4926
+            zstream.close();
44314927             ostream.close();
4432
-            //       zstream.close();
44334928 
44344929 //                                    group.selection.get(0).parent = parent;
44354930             //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4476,7 +4971,8 @@
44764971     Object3D client;
44774972     Object3D copy;
44784973     MenuBar menuBar;
4479
-    Menu windowMenu;
4974
+    Menu fileMenu;
4975
+    MenuItem newItem;
44804976     MenuItem loadItem;
44814977     MenuItem saveItem;
44824978     MenuItem saveAsItem;
....@@ -4484,11 +4980,9 @@
44844980     MenuItem reexportItem;
44854981     MenuItem povItem;
44864982     MenuItem closeItem;
4487
-    Menu cameraMenu;
4983
+    
44884984     CheckboxMenuItem zBufferItem;
44894985     //MenuItem normalLensItem;
4490
-    MenuItem editCameraItem;
4491
-    MenuItem revertCameraItem;
44924986     MenuItem stepItem;
44934987     CheckboxMenuItem toggleLiveItem;
44944988     CheckboxMenuItem toggleFullScreenItem;
....@@ -4506,18 +5000,31 @@
45065000     CheckboxMenuItem togglePaintItem;
45075001     JSplitPane mainPanel;
45085002     JScrollPane scrollpane;
5003
+    
45095004     JPanel toolbarPanel;
5005
+    
45105006     cGridBag treePanel;
5007
+    
45115008     JPanel radioPanel;
45125009     ButtonGroup buttonGroup;
4513
-    cGridBag ctrlPanel;
5010
+    
5011
+    cGridBag toolboxPanel;
45145012     cGridBag materialPanel;
5013
+    cGridBag ctrlPanel;
5014
+    
45155015     JScrollPane infoPanel;
5016
+    
45165017     cGridBag optionsPanel;
5018
+    
45175019     JTabbedPane objectPanel;
5020
+    boolean materialFlushed;
5021
+    Object3D latestObject;
5022
+    
45185023     cGridBag XYZPanel;
5024
+    
45195025     JSplitPane gridPanel;
45205026     JSplitPane bigPanel;
5027
+    
45215028     cGridBag bigThree;
45225029     cGridBag scenePanel;
45235030     cGridBag centralPanel;
....@@ -4632,8 +5139,13 @@
46325139     cNumberSlider fogField;
46335140     JLabel opacityPowerLabel;
46345141     cNumberSlider opacityPowerField;
4635
-    JTree jTree;
5142
+    cTree jTree;
46365143     //ObjectUI parent;
46375144     
46385145     cNumberSlider normalpushField;
5146
+    
5147
+	private MenuItem importGFDItem;
5148
+	private MenuItem importVRMLX3DItem;
5149
+	private MenuItem import3DSItem;
5150
+	private MenuItem importOBJItem;
46395151 }