blame | history | patch | commit | commitdiff
Normand Briere
2019-06-26 89b25e7cc97f6fe221dfd41c4d463500f8a31bc1 
 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.*;
....@@ -35,6 +36,67 @@
3536 
3637     GroupEditor callee;
3738     JFrame frame;
39
+    
40
+    static ObjEditor theFrame;
41
+    
42
+    cButton GetButton(String name, boolean border)
43
+    {
44
+        try
45
+        {
46
+            ImageIcon icon = GetIcon(name);
47
+            return new cButton(icon, border);
48
+        }
49
+        catch (Exception e)
50
+        {
51
+            return new cButton(name, border);
52
+        }
53
+    }
54
+
55
+    cToggleButton GetToggleButton(String name, boolean border)
56
+    {
57
+        try
58
+        {
59
+            ImageIcon icon = GetIcon(name);
60
+            return new cToggleButton(icon, border);
61
+        }
62
+        catch (Exception e)
63
+        {
64
+            return new cToggleButton(name, border);
65
+        }
66
+    }
67
+
68
+    cCheckBox GetCheckBox(String name, boolean border)
69
+    {
70
+        try
71
+        {
72
+            ImageIcon icon = GetIcon(name);
73
+            return new cCheckBox(icon, border);
74
+        }
75
+        catch (Exception e)
76
+        {
77
+            return new cCheckBox(name, border);
78
+        }
79
+    }
80
+
81
+    private ImageIcon GetIcon(String name) throws IOException
82
+    {
83
+        BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84
+        
85
+        if (image.getWidth() != 24 && image.getHeight() != 24)
86
+        {
87
+            BufferedImage resized = new BufferedImage(24, 24, image.getType());
88
+            Graphics2D g = resized.createGraphics();
89
+            g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
90
+            //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
91
+            g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
92
+            g.dispose();
93
+            
94
+            image = resized;
95
+        }
96
+        
97
+        javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98
+        return icon;
99
+    }
38100     
39101     // SCRIPT
40102     
....@@ -145,7 +207,7 @@
145207         
146208         objEditor.ctrlPanel.remove(namePanel);
147209         
148
-        if (!GroupEditor.allparams)
210
+        if (!allparams)
149211             return;
150212         
151213 //        objEditor.ctrlPanel.remove(liveCB);
....@@ -168,7 +230,8 @@
168230 //        objEditor.ctrlPanel.remove(remarkButton);
169231         
170232         objEditor.ctrlPanel.remove(setupPanel);
171
-        objEditor.ctrlPanel.remove(commandsPanel);
233
+        objEditor.ctrlPanel.remove(setupPanel2);
234
+        objEditor.ctrlPanel.remove(objectCommandsPanel);
172235         objEditor.ctrlPanel.remove(pushPanel);
173236         //objEditor.ctrlPanel.remove(fillPanel);
174237         
....@@ -243,6 +306,7 @@
243306         //localCopy.parent = null;
244307 
245308         frame = new JFrame();
309
+                frame.setUndecorated(true);
246310         objEditor = this;
247311         this.callee = callee;
248312 
....@@ -273,27 +337,48 @@
273337         return frame.action(event, obj);
274338     }
275339 
340
+    // Cannot work without static
341
+    static boolean allparams = true;
342
+
343
+    static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
344
+
276345     void SetupMenu()
277346     {
278347         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..."));
348
+        menuBar.add(fileMenu = new Menu("File"));
349
+        fileMenu.add(newItem = new MenuItem("New"));
350
+        fileMenu.add(loadItem = new MenuItem("Open..."));
351
+        
352
+                //oe.menuBar.add(menu = new Menu("Include"));
353
+        Menu menu = new Menu("Import");
354
+		importOBJItem = menu.add(new MenuItem("OBJ file..."));
355
+		importOBJItem.addActionListener(this);
356
+		import3DSItem = menu.add(new MenuItem("3DS file..."));
357
+		import3DSItem.addActionListener(this);
358
+		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
359
+		importVRMLX3DItem.addActionListener(this);
360
+		menu.add("-");
361
+		importGFDItem = menu.add(new MenuItem("Grafreed file..."));
362
+		importGFDItem.addActionListener(this);
363
+        fileMenu.add(menu);
364
+        fileMenu.add("-");
365
+
366
+        fileMenu.add(saveItem = new MenuItem("Save"));
367
+        fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284368         //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("-");
369
+        fileMenu.add("-");
370
+        fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
371
+        fileMenu.add(reexportItem = new MenuItem("Re-export"));
372
+        fileMenu.add("-");
289373         if (client.parent != null)
290374         {
291
-            windowMenu.add(closeItem = new MenuItem("Close"));
375
+            fileMenu.add(closeItem = new MenuItem("Close"));
292376         } else
293377         {
294
-            windowMenu.add(closeItem = new MenuItem("Exit"));
378
+            fileMenu.add(closeItem = new MenuItem("Exit"));
295379         }
296380 
381
+        newItem.addActionListener(this);
297382         loadItem.addActionListener(this);
298383         saveItem.addActionListener(this);
299384         saveAsItem.addActionListener(this);
....@@ -302,87 +387,53 @@
302387         //povItem.addActionListener(this);
303388         closeItem.addActionListener(this);
304389 
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
-
377390         objectPanel = new JTabbedPane();
391
+        
392
+        ChangeListener changeListener = new ChangeListener()
393
+        {
394
+            public void stateChanged(ChangeEvent changeEvent)
395
+            {
396
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
397
+//                {
398
+//                    if (latestObject != null)
399
+//                    {
400
+//                        refreshContents(true);
401
+//                        SetMaterial(latestObject);
402
+//                    }
403
+//                    
404
+//                    materialFlushed = true;
405
+//                }
406
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
407
+//                {
408
+//                    if (listUI.size() == 0)
409
+//                        EditSelection(false);
410
+//                }
411
+
412
+                refreshContents(false); // To refresh Info tab
413
+            }
414
+        };
415
+        objectPanel.addChangeListener(changeListener);
416
+    
378417         toolbarPanel = new JPanel();
379418         toolbarPanel.setName("Toolbar");
380419         treePanel = new cGridBag();
381420         treePanel.setName("Tree");
421
+        
422
+        editPanel = new cGridBag().setVertical(true);
423
+        editPanel.setName("Edit");
424
+        
382425         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
383
-        ctrlPanel.setName("Edit");
426
+        
427
+        editCommandsPanel = new cGridBag();
428
+        editPanel.add(editCommandsPanel);
429
+        editPanel.add(ctrlPanel);
430
+                
431
+        toolboxPanel = new cGridBag().setVertical(false);
432
+        toolboxPanel.setName("Toolbox");
433
+        
384434         materialPanel = new cGridBag().setVertical(true);
385435         materialPanel.setName("Material");
436
+        
386437         /*JTextPane*/
387438         infoarea = createTextPane();
388439         doc = infoarea.getStyledDocument();
....@@ -475,10 +526,10 @@
475526             e.printStackTrace();
476527         }
477528         
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();
529
+//        String selection = infoarea.getText();
530
+//        java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
531
+//        java.awt.datatransfer.Clipboard clipboard = 
532
+//                Toolkit.getDefaultToolkit().getSystemClipboard();
482533         //clipboard.setContents(data, data);
483534     }
484535     
....@@ -501,13 +552,13 @@
501552         //SendInfo("Name:", "bold");
502553         if (sel.GetTextures() != null || debug)
503554         {
504
-            si.SendInfo(sel.toString(), "bold");
555
+            si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
505556             //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
506557             if (sel.Size() > 0)
507558             {
508559                 si.SendInfo("#children = " + sel.Size(), "regular");
509560             }
510
-            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent, "regular");
561
+            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
511562             if (debug)
512563             {
513564                 try
....@@ -549,7 +600,7 @@
549600                 }
550601                 if (sel.support != null)
551602                 {
552
-                    si.SendInfo("    support: " + sel.support, "regular");
603
+                    si.SendInfo("    support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
553604                 }
554605                 if (sel.scriptnode != null)
555606                 {
....@@ -638,20 +689,92 @@
638689         }
639690     }
640691 
692
+static GraphicsDevice device = GraphicsEnvironment
693
+        .getLocalGraphicsEnvironment().getScreenDevices()[0];
694
+
695
+    Rectangle keeprect;
696
+        cRadio radio;
697
+        
698
+cButton keepButton;
699
+	cButton twoButton; // Full 3D
700
+	cButton sixButton;
701
+	cButton threeButton;
702
+	cButton sevenButton;
703
+	cButton fourButton; // full panel
704
+	cButton oneButton; // full XYZ
705
+        //cButton currentLayout;
706
+        
707
+        boolean maximized;
708
+    
709
+        cButton fullscreenLayout;
710
+
711
+        void Minimize()
712
+        {
713
+            frame.setState(Frame.ICONIFIED);
714
+        }
715
+        
716
+        void Maximize()
717
+        {
718
+            if (maximized)
719
+            {
720
+                frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
721
+            }
722
+            else
723
+            {
724
+                keeprect = frame.getBounds();
725
+                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
726
+                Dimension rect2 = frame.getToolkit().getScreenSize();
727
+                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
728
+//                frame.setState(Frame.MAXIMIZED_BOTH);
729
+            }
730
+            
731
+            maximized ^= true;
732
+        }
733
+        
641734         void ToggleFullScreen()
642735         {
643
-                if (CameraPane.FULLSCREEN)
736
+                cameraView.ToggleFullScreen();
737
+                
738
+                if (!CameraPane.FULLSCREEN)
644739                 {
645
-                    frame.getContentPane().remove(/*"Center",*/bigThree);
646
-                    framePanel.add(bigThree);
647
-                    frame.getContentPane().add(/*"Center",*/framePanel);
740
+                    device.setFullScreenWindow(null);
741
+                    //frame.setVisible(false);
742
+//                frame.removeNotify();
743
+//                frame.setUndecorated(false);
744
+//                frame.addNotify();
745
+                //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
746
+                    
747
+// X                   frame.getContentPane().remove(/*"Center",*/bigThree);
748
+// X                   framePanel.add(bigThree);
749
+// X                   frame.getContentPane().add(/*"Center",*/framePanel);
750
+                    framePanel.setDividerLocation(1);
751
+                    
752
+                    //frame.setVisible(true);
753
+                    radio.layout = keepButton;
754
+                    //theFrame = null;
755
+                    keepButton = null;
756
+                    radio.layout.doClick();
757
+                    
648758                 } else
649759                 {
650
-                    frame.getContentPane().remove(/*"Center",*/framePanel);
651
-                    framePanel.remove(bigThree);
652
-                    frame.getContentPane().add(/*"Center",*/bigThree);
760
+                    keepButton = radio.layout;
761
+                    //keeprect = frame.getBounds();
762
+//                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
763
+//                        frame.getToolkit().getScreenSize().height);
764
+                    //frame.setVisible(false);
765
+                    device.setFullScreenWindow(frame);
766
+//                frame.removeNotify();
767
+//                frame.setUndecorated(true);
768
+//                frame.addNotify();
769
+// X                   frame.getContentPane().remove(/*"Center",*/framePanel);
770
+// X                   framePanel.remove(bigThree);
771
+// X                   frame.getContentPane().add(/*"Center",*/bigThree);
772
+                    framePanel.setDividerLocation(0);
773
+
774
+                    radio.layout = fullscreenLayout;
775
+                    radio.layout.doClick();
776
+                    //frame.setVisible(true);
653777                 }
654
-                cameraView.ToggleFullScreen();
655778         }
656779 
657780     private JTextPane createTextPane()
....@@ -784,6 +907,7 @@
784907 //    NumberSlider vDivsField;
785908 //    JCheckBox endcaps;
786909     JCheckBox liveCB;
910
+    JCheckBox selectCB;
787911     JCheckBox hideCB;
788912     JCheckBox link2masterCB;
789913     JCheckBox markCB;
....@@ -791,7 +915,12 @@
791915     JCheckBox speedupCB;
792916     JCheckBox rewindCB;
793917     JCheckBox flipVCB;
918
+    
919
+    cCheckBox toggleTextureCB;
920
+    cCheckBox toggleSwitchCB;
921
+        
794922     JComboBox texresMenu;
923
+    
795924     JButton resetButton;
796925     JButton stepButton;
797926     JButton stepAllButton;
....@@ -800,9 +929,13 @@
800929     JButton fasterButton;
801930     JButton remarkButton;
802931     
932
+    cGridBag editPanel;
933
+    cGridBag editCommandsPanel;
934
+    
803935     cGridBag namePanel;
804936     cGridBag setupPanel;
805
-    cGridBag commandsPanel;
937
+    cGridBag setupPanel2;
938
+    cGridBag objectCommandsPanel;
806939     cGridBag pushPanel;
807940     cGridBag fillPanel;
808941 
....@@ -979,56 +1112,62 @@
9791112         
9801113         oe.ctrlPanel.Return();
9811114         
982
-        if (!GroupEditor.allparams)
1115
+        if (!allparams)
9831116             return;
9841117 
9851118             setupPanel = new cGridBag().setVertical(false);
9861119             
9871120         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
9881121                 liveCB.setToolTipText("Animate object");
1122
+        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1123
+                selectCB.setToolTipText("Make object selectable");
1124
+//            Return();
9891125         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
9901126                 hideCB.setToolTipText("Hide object");
991
-//            Return();
9921127         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
9931128         markCB.setToolTipText("Set the animation target transform");
9941129         
995
-        rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
1130
+            setupPanel2 = new cGridBag().setVertical(false);
1131
+            
1132
+        rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
9961133         rewindCB.setToolTipText("Rewind animation");
9971134         
998
-        randomCB = AddCheckBox(setupPanel, "Random", copy.random);
999
-        randomCB.setToolTipText("Option for switch node");
1135
+        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1136
+        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
10001137 
10011138         if (Globals.ADVANCED)
10021139         {
1003
-                link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1140
+                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
10041141                 link2masterCB.setToolTipText("Attach to support");
1005
-                speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
1142
+                speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
10061143                 speedupCB.setToolTipText("Option motion capture");
10071144         }
10081145         
10091146         oe.ctrlPanel.add(setupPanel);
10101147         oe.ctrlPanel.Return();
1148
+        oe.ctrlPanel.add(setupPanel2);
1149
+        oe.ctrlPanel.Return();
10111150         
1012
-            commandsPanel = new cGridBag().setVertical(false);
1151
+            objectCommandsPanel = new cGridBag().setVertical(false);
10131152         
1014
-        resetButton = AddButton(commandsPanel, "Reset");
1153
+        resetButton = AddButton(objectCommandsPanel, "Reset");
10151154         resetButton.setToolTipText("Jump to frame zero");
1016
-        stepButton = AddButton(commandsPanel, "Step");
1155
+        stepButton = AddButton(objectCommandsPanel, "Step");
10171156         stepButton.setToolTipText("Step one frame");
10181157 //            resetAllButton = AddButton(oe, "Reset All");
10191158 //            stepAllButton = AddButton(oe, "Step All");
10201159 //            Return();
1021
-        slowerButton = AddButton(commandsPanel, "Slow");
1160
+        slowerButton = AddButton(objectCommandsPanel, "Slow");
10221161         slowerButton.setToolTipText("Decrease animation speed");
1023
-        fasterButton = AddButton(commandsPanel, "Fast");
1162
+        fasterButton = AddButton(objectCommandsPanel, "Fast");
10241163         fasterButton.setToolTipText("Increase animation speed");
1025
-        remarkButton = AddButton(commandsPanel, "Remark");
1164
+        remarkButton = AddButton(objectCommandsPanel, "Remark");
10261165         remarkButton.setToolTipText("Set the current transform as the target");
10271166 
1028
-        oe.ctrlPanel.add(commandsPanel);
1167
+        oe.ctrlPanel.add(objectCommandsPanel);
10291168         oe.ctrlPanel.Return();
10301169 
1031
-    pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
1170
+    pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
10321171     normalpushField = (cNumberSlider)pushPanel.getComponent(1);
10331172     //Return();
10341173 
....@@ -1231,8 +1370,11 @@
12311370         //worldPanel.setName("World");
12321371 	centralPanel = new cGridBag();
12331372         centralPanel.preferredWidth = 20;
1234
-	timelinePanel = new JPanel(new BorderLayout());
1235
-        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1373
+        
1374
+        if (Globals.ADVANCED)
1375
+        {
1376
+            timelinePanel = new JPanel(new BorderLayout());
1377
+            timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
12361378 
12371379         cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
12381380         cameraPanel.setContinuousLayout(true);
....@@ -1241,7 +1383,10 @@
12411383 //        cameraPanel.setDividerSize(9);
12421384         cameraPanel.setResizeWeight(1.0);
12431385         
1386
+        }
1387
+        
12441388         centralPanel.add(cameraView);
1389
+        centralPanel.setFocusable(true);
12451390         //frame.setJMenuBar(timelineMenubar);
12461391         //centralPanel.add(timelinePanel);
12471392         
....@@ -1308,8 +1453,9 @@
13081453 //        north.setName("Edit");
13091454 //        north.add(ctrlPanel, BorderLayout.NORTH);
13101455 //        objectPanel.add(north);
1311
-        objectPanel.add(ctrlPanel);
1456
+        objectPanel.add(editPanel);
13121457         objectPanel.add(infoPanel);
1458
+        objectPanel.add(toolboxPanel);
13131459 
13141460         /*
13151461         aConstraints.gridx = 0;
....@@ -1318,7 +1464,7 @@
13181464         aConstraints.gridy += 1;
13191465         aConstraints.gridwidth = 1;
13201466         mainPanel.add(objectPanel, aConstraints);
1321
-         */
1467
+        */
13221468 
13231469         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
13241470                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1335,9 +1481,7 @@
13351481         JTabbedPane tabbedPane = new JTabbedPane();
13361482         tabbedPane.add(scrollpane);
13371483 
1338
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1339
-
1340
-        optionsPanel = new cGridBag().setVertical(true);
1484
+        optionsPanel = new cGridBag().setVertical(false);
13411485 
13421486         optionsPanel.setName("Options");
13431487         
....@@ -1345,6 +1489,8 @@
13451489         
13461490         tabbedPane.add(optionsPanel);
13471491         
1492
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1493
+
13481494         scenePanel.add(tabbedPane);
13491495 
13501496         /*
....@@ -1437,8 +1583,12 @@
14371583 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14381584 
14391585         frame.setSize(1280, 860);
1586
+        
1587
+        frame.validate();
14401588         frame.setVisible(true);
14411589 
1590
+                    cameraView.requestFocusInWindow();
1591
+                    
14421592         gridPanel.setDividerLocation(1.0);
14431593 
14441594         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
....@@ -1988,6 +2138,7 @@
19882138             e2.printStackTrace();
19892139         }
19902140     }
2141
+    
19912142     LoadJMEThread loadThread;
19922143 
19932144     class LoadJMEThread extends Thread
....@@ -2045,6 +2196,7 @@
20452196             //LoadFile0(filename, converter);
20462197         }
20472198     }
2199
+    
20482200     LoadOBJThread loadObjThread;
20492201 
20502202     class LoadOBJThread extends Thread
....@@ -2123,19 +2275,19 @@
21232275 
21242276     void LoadObjFile(String fullname)
21252277     {
2126
-        /*
2278
+        System.out.println("Loading " + fullname);
2279
+        /**/
21272280         //lastFilename = fullname;
21282281         if(loadObjThread == null)
21292282         {
2130
-        loadObjThread = new LoadOBJThread();
2131
-        loadObjThread.start();
2283
+            loadObjThread = new LoadOBJThread();
2284
+            loadObjThread.start();
21322285         }
21332286         
21342287         loadObjThread.add(fullname);
2135
-         */
2288
+        /**/
21362289 
2137
-        System.out.println("Loading " + fullname);
2138
-        makeSomething(new FileObject(fullname, true), true);
2290
+        //makeSomething(new FileObject(fullname, true), true);
21392291     }
21402292 
21412293     void LoadGFDFile(String fullname)
....@@ -2752,6 +2904,8 @@
27522904 
27532905     void SetMaterial(Object3D object)
27542906     {
2907
+        latestObject = object;
2908
+        
27552909         cMaterial mat = object.material;
27562910 
27572911         if (mat == null)
....@@ -2937,7 +3091,7 @@
29373091             cameraView.ToggleDL();
29383092             cameraView.repaint();
29393093             return;
2940
-        } else if (event.getSource() == toggleTextureItem)
3094
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
29413095         {
29423096             cameraView.ToggleTexture();
29433097             // june 2013           copy.HardTouch();
....@@ -2976,9 +3130,9 @@
29763130             frame.validate();
29773131 
29783132             return;
2979
-        } else if (event.getSource() == toggleSwitchItem)
3133
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
29803134         {
2981
-            cameraView.ToggleRandom();
3135
+            cameraView.ToggleSwitch();
29823136             cameraView.repaint();
29833137             return;
29843138         } else if (event.getSource() == toggleHandleItem)
....@@ -3006,6 +3160,10 @@
30063160         } else if (event.getSource() == liveCB)
30073161         {
30083162             copy.live ^= true;
3163
+            return;
3164
+        } else if (event.getSource() == selectCB)
3165
+        {
3166
+            copy.dontselect ^= true;
30093167             return;
30103168         } else if (event.getSource() == hideCB)
30113169         {
....@@ -3045,8 +3203,9 @@
30453203 
30463204     public void actionPerformed(ActionEvent event)
30473205     {
3206
+        Object source = event.getSource();
30483207         // SCRIPT DIALOG
3049
-        if (event.getSource() == okbutton)
3208
+        if (source == okbutton)
30503209         {
30513210             textpanel.setVisible(false);
30523211             textpanel.remove(textarea);
....@@ -3058,7 +3217,7 @@
30583217             textarea = null;
30593218             textpanel = null;
30603219         }
3061
-        if (event.getSource() == cancelbutton)
3220
+        if (source == cancelbutton)
30623221         {
30633222             textpanel.setVisible(false);
30643223             textpanel.remove(textarea);
....@@ -3070,50 +3229,50 @@
30703229         //applySelf();
30713230         //client.refreshEditWindow();
30723231         //refreshContents();
3073
-        if (event.getSource() == nameField)
3232
+        if (source == nameField)
30743233         {
30753234             //System.out.println("ObjEditor " + event);
30763235             applySelf0(true);
30773236             //parent.applySelf();
30783237             objEditor.refreshContents();
3079
-        } else if (event.getSource() == resetButton)
3238
+        } else if (source == resetButton)
30803239         {
30813240             CameraPane.fullreset = true;
30823241             copy.Reset(); // ResetMeshes();
30833242             copy.Touch();
30843243             objEditor.refreshContents();
3085
-        } else if (event.getSource() == stepItem)
3244
+        } else if (source == stepItem)
30863245         {
30873246             //cameraView.ONESTEP = true;
30883247             Globals.ONESTEP = true;
30893248             cameraView.repaint();
30903249             return;
3091
-        } else if (event.getSource() == stepButton)
3250
+        } else if (source == stepButton)
30923251         {
30933252             copy.Step();
30943253             copy.Touch();
30953254             objEditor.refreshContents();
3096
-        } else if (event.getSource() == slowerButton)
3255
+        } else if (source == slowerButton)
30973256         {
30983257             copy.Slower();
30993258             copy.Touch();
31003259             objEditor.refreshContents();
3101
-        } else if (event.getSource() == fasterButton)
3260
+        } else if (source == fasterButton)
31023261         {
31033262             copy.Faster();
31043263             copy.Touch();
31053264             objEditor.refreshContents();
3106
-        } else if (event.getSource() == remarkButton)
3265
+        } else if (source == remarkButton)
31073266         {
31083267             copy.Remark();
31093268             copy.Touch();
31103269             objEditor.refreshContents();
3111
-        } else if (event.getSource() == stepAllButton)
3270
+        } else if (source == stepAllButton)
31123271         {
31133272             copy.StepAll();
31143273             copy.Touch();
31153274             objEditor.refreshContents();
3116
-        } else if (event.getSource() == resetAllButton)
3275
+        } else if (source == resetAllButton)
31173276         {
31183277             //CameraPane.fullreset = true;
31193278             copy.ResetAll(); // ResetMeshes();
....@@ -3146,53 +3305,75 @@
31463305         //			Close();
31473306         //		}
31483307         //                else
3149
-        if (event.getSource() == resetSlidersButton)
3308
+        if (source == resetSlidersButton)
31503309         {
31513310             ResetSliders();
3152
-        } else if (event.getSource() == clearMaterialButton)
3311
+        } else if (source == clearMaterialButton)
31533312         {
31543313             ClearMaterial();
3155
-        } else if (event.getSource() == createMaterialButton)
3314
+        } else if (source == createMaterialButton)
31563315         {
31573316             CreateMaterial();
3158
-        } else if (event.getSource() == clearPanelButton)
3317
+        } else if (source == clearPanelButton)
31593318         {
31603319             copy.ClearUI();
31613320             refreshContents(true);
3162
-        } /*
3163
-        }
3164
-        
3165
-        public boolean action(Event event, Object arg)
3166
-        {
3167
-         */ else if (event.getSource() == closeItem)
3321
+        } else if (source == importGFDItem)
3322
+		{
3323
+			ImportGFD();
3324
+		} else
3325
+		if (source == importVRMLX3DItem)
3326
+		{
3327
+			ImportVRMLX3D();
3328
+		} else
3329
+		if (source == import3DSItem)
3330
+		{
3331
+			objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
3332
+		} else
3333
+		if (source == importOBJItem)
3334
+		{
3335
+			//objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
3336
+                            FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
3337
+                            browser.setVisible(true);
3338
+                            String filename = browser.getFile();
3339
+                            if (filename != null && filename.length() > 0)
3340
+                            {
3341
+                                String fullname = browser.getDirectory() + filename;
3342
+                                makeSomething(ReadOBJ(fullname), true);
3343
+                            }
3344
+		} else
3345
+        if (source == closeItem)
31683346         {
31693347             Close();
31703348             //return true;
3171
-        } else if (event.getSource() == loadItem)
3349
+        } else if (source == loadItem)
31723350         {
31733351             load();
31743352             //return true;
3175
-        } else if (event.getSource() == saveItem)
3353
+        } else if (source == newItem)
3354
+        {
3355
+            New();
3356
+        } else if (source == saveItem)
31763357         {
31773358             save();
31783359             //return true;
3179
-        } else if (event.getSource() == saveAsItem)
3360
+        } else if (source == saveAsItem)
31803361         {
31813362             saveAs();
31823363             //return true;
3183
-        } else if (event.getSource() == reexportItem)
3364
+        } else if (source == reexportItem)
31843365         {
31853366             reexport();
31863367             //return true;
3187
-        } else if (event.getSource() == exportAsItem)
3368
+        } else if (source == exportAsItem)
31883369         {
31893370             export();
31903371             //return true;
3191
-        } else if (event.getSource() == povItem)
3372
+        } else if (source == povItem)
31923373         {
31933374             generatePOV();
31943375             //return true;
3195
-        } else if (event.getSource() == zBufferItem)
3376
+        } else if (source == zBufferItem)
31963377         {
31973378             try
31983379             {
....@@ -3214,21 +3395,8 @@
32143395         cameraView.repaint();
32153396         //return true;
32163397         }
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)
3398
+         */ else // combos...
3399
+        if (source == texresMenu)
32323400         {
32333401             System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
32343402             copy.texres = texresMenu.getSelectedIndex();
....@@ -3240,6 +3408,281 @@
32403408         }
32413409     }
32423410 
3411
+    void New()
3412
+    {
3413
+        while (copy.Size() > 1)
3414
+        {
3415
+            copy.remove(1);
3416
+        }
3417
+        
3418
+        ResetModel();
3419
+        objEditor.refreshContents();
3420
+    }
3421
+    
3422
+    static public byte[] Compress(Object3D o)
3423
+    {
3424
+        try
3425
+        {
3426
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
3427
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3428
+            ObjectOutputStream out = new ObjectOutputStream(zstream);
3429
+
3430
+        Object3D parent = o.parent;
3431
+        o.parent = null;
3432
+        
3433
+            out.writeObject(o);
3434
+            
3435
+        o.parent = parent;
3436
+        
3437
+            out.flush();
3438
+
3439
+            zstream.close();
3440
+            out.close();
3441
+            
3442
+            return baos.toByteArray();
3443
+        } catch (Exception e)
3444
+        {
3445
+            System.err.println(e);
3446
+            return null;
3447
+        }
3448
+    }
3449
+
3450
+    static public Object Uncompress(byte[] bytes)
3451
+    {
3452
+        System.out.println("#bytes = " + bytes.length);
3453
+        try
3454
+        {
3455
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3456
+            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3457
+            ObjectInputStream in = new ObjectInputStream(istream);
3458
+            Object obj = in.readObject();
3459
+            in.close();
3460
+            
3461
+            return obj;
3462
+        } catch (Exception e)
3463
+        {
3464
+            System.err.println(e);
3465
+            return null;
3466
+        }
3467
+    }
3468
+
3469
+    static public Object clone(Object o)
3470
+    {
3471
+        try
3472
+        {
3473
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
3474
+            ObjectOutputStream out = new ObjectOutputStream(baos);
3475
+
3476
+            out.writeObject(o);
3477
+            
3478
+            out.flush();
3479
+            out.close();
3480
+            
3481
+            byte[] bytes = baos.toByteArray();
3482
+            
3483
+            System.out.println("clone = " + bytes.length);
3484
+
3485
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3486
+            ObjectInputStream in = new ObjectInputStream(bais);
3487
+            Object obj = in.readObject();
3488
+            in.close();
3489
+            
3490
+            return obj;
3491
+        } catch (Exception e)
3492
+        {
3493
+            System.err.println(e);
3494
+            return null;
3495
+        }
3496
+    }
3497
+
3498
+    cRadio GetCurrentTab()
3499
+    {
3500
+        cRadio ab;
3501
+        for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3502
+        {
3503
+            ab = (cRadio)e.nextElement();
3504
+            if(ab.GetObject() == copy)
3505
+            {
3506
+                return ab;
3507
+            }
3508
+        }
3509
+        
3510
+        return null;
3511
+    }
3512
+    
3513
+    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3514
+    
3515
+    public void Save()
3516
+    {
3517
+        System.err.println("Save");
3518
+        
3519
+        cRadio tab = GetCurrentTab();
3520
+        
3521
+        boolean temp = CameraPane.SWITCH;
3522
+        CameraPane.SWITCH = false;
3523
+        
3524
+        copy.ExtractBigData(hashtable);
3525
+        
3526
+        //EditorFrame.m_MainFrame.requestFocusInWindow();
3527
+        tab.graphs[tab.undoindex++] = Compress(copy);
3528
+
3529
+        copy.RestoreBigData(hashtable);
3530
+
3531
+        CameraPane.SWITCH = temp;
3532
+        
3533
+        //assert(hashtable.isEmpty());
3534
+        
3535
+        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3536
+        {
3537
+            tab.graphs[i] = null;
3538
+        }
3539
+
3540
+        SetUndoStates();
3541
+        
3542
+        // test save
3543
+        if (false)
3544
+        {
3545
+            try
3546
+            {
3547
+                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3548
+                ObjectOutputStream p = new ObjectOutputStream(ostream);
3549
+
3550
+                p.writeObject(copy);
3551
+                
3552
+                p.flush();
3553
+
3554
+                ostream.close();
3555
+            } catch (Exception e)
3556
+            {
3557
+                e.printStackTrace();
3558
+            }
3559
+        }
3560
+    }
3561
+
3562
+    void CopyChanged(Object3D obj)
3563
+    {
3564
+        SetUndoStates();
3565
+        
3566
+        boolean temp = CameraPane.SWITCH;
3567
+        CameraPane.SWITCH = false;
3568
+        
3569
+        copy.ExtractBigData(hashtable);
3570
+        
3571
+        copy.clear();
3572
+        
3573
+        for (int i=0; i<obj.Size(); i++)
3574
+        {
3575
+            copy.add(obj.get(i));
3576
+        }
3577
+        
3578
+        copy.RestoreBigData(hashtable);
3579
+        
3580
+        CameraPane.SWITCH = temp;
3581
+        
3582
+        //assert(hashtable.isEmpty());
3583
+        
3584
+        copy.Touch();
3585
+        
3586
+        ResetModel();
3587
+        copy.HardTouch(); // recompile?
3588
+        
3589
+        cRadio ab;
3590
+        for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3591
+        {
3592
+            ab = (cRadio)e.nextElement();
3593
+            Object3D test = copy.GetObject(ab.object.GetUUID());
3594
+            //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3595
+            if (test != null)
3596
+            {
3597
+                test.editWindow = ab.object.editWindow;
3598
+                ab.object = test;
3599
+            }
3600
+        }
3601
+        
3602
+        refreshContents();
3603
+    }
3604
+    
3605
+    cButton undoButton;
3606
+    cButton redoButton;
3607
+        
3608
+    void SetUndoStates()
3609
+    {
3610
+        cRadio tab = GetCurrentTab();
3611
+        
3612
+        undoButton.setEnabled(tab.undoindex > 0);
3613
+        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
3614
+    }
3615
+    
3616
+    public void Undo()
3617
+    {
3618
+        System.err.println("Undo");
3619
+        
3620
+        cRadio tab = GetCurrentTab();
3621
+        
3622
+        if (tab.undoindex == 0)
3623
+        {
3624
+            java.awt.Toolkit.getDefaultToolkit().beep();
3625
+            return;
3626
+        }
3627
+
3628
+        if (tab.graphs[tab.undoindex] == null)
3629
+        {
3630
+            Save();
3631
+            tab.undoindex -= 1;
3632
+        }
3633
+
3634
+        tab.undoindex -= 1;
3635
+
3636
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3637
+    }
3638
+
3639
+    public void Redo()
3640
+    {
3641
+        cRadio tab = GetCurrentTab();
3642
+        
3643
+        if (tab.graphs[tab.undoindex + 1] == null)
3644
+        {
3645
+            java.awt.Toolkit.getDefaultToolkit().beep();
3646
+            return;
3647
+        }
3648
+
3649
+        tab.undoindex += 1;
3650
+
3651
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3652
+    }
3653
+
3654
+        void ImportGFD()
3655
+        {
3656
+            FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3657
+            browser.show();
3658
+            String filename = browser.getFile();
3659
+            if (filename != null && filename.length() > 0)
3660
+            {
3661
+                String fullname = browser.getDirectory() + filename;
3662
+
3663
+                //Object3D readobj =
3664
+                        objEditor.ReadGFD(fullname, objEditor);
3665
+                //makeSomething(readobj);
3666
+            }
3667
+        }
3668
+        
3669
+	void ImportVRMLX3D()
3670
+	{
3671
+		if (Grafreed.standAlone)
3672
+		{
3673
+                    /**/
3674
+			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
3675
+			browser.show();
3676
+			String filename = browser.getFile();
3677
+			if (filename != null && filename.length() > 0)
3678
+			{
3679
+				String fullname = browser.getDirectory() + filename;
3680
+                                LoadVRMLX3D(fullname);
3681
+			}
3682
+                     /**/
3683
+		}
3684
+	}
3685
+				
32433686     void ToggleAnimation()
32443687     {
32453688         if (!Globals.ANIMATION)
....@@ -3357,7 +3800,7 @@
33573800         assert false;
33583801     }
33593802 
3360
-    void EditSelection()
3803
+    void EditSelection(boolean newWindow)
33613804     {
33623805     }
33633806 
....@@ -3588,7 +4031,7 @@
35884031         }
35894032         
35904033         if (normalpushField != null)
3591
-                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
4034
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35924035     }
35934036 
35944037         void SnapObject()
....@@ -3852,6 +4295,8 @@
38524295 
38534296     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
38544297     {
4298
+        if (Globals.SAVEONMAKE) // && resetmodel)
4299
+            Save();
38554300         //Tween.set(thing, 0).target(1).start(tweenManager);
38564301         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
38574302 //            if (thing instanceof GenericJointDemo)
....@@ -3938,6 +4383,12 @@
39384383         {
39394384             ResetModel();
39404385             Select(thing.GetTreePath(), true, false); // unselect... false);
4386
+            
4387
+        if (thing.Size() == 0)
4388
+        {
4389
+            //EditSelection(false);
4390
+        }
4391
+        
39414392             refreshContents();
39424393         }
39434394 
....@@ -4055,6 +4506,7 @@
40554506             }
40564507         }
40574508     }
4509
+    
40584510     LoadGFDThread loadGFDThread;
40594511 
40604512     void ReadGFD(String fullname, iCallBack cb)
....@@ -4074,8 +4526,10 @@
40744526 
40754527         try
40764528         {
4529
+            // Try compressed version first.
40774530             java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4078
-            java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4531
+            java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4532
+            java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
40794533 
40804534             readobj = (Object3D) p.readObject();
40814535             istream.close();
....@@ -4083,7 +4537,20 @@
40834537             readobj.ResetDisplayList();
40844538         } catch (Exception e)
40854539         {
4086
-            e.printStackTrace();
4540
+            //e.printStackTrace();
4541
+            try
4542
+            {
4543
+                java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4544
+                java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4545
+
4546
+                readobj = (Object3D) p.readObject();
4547
+                istream.close();
4548
+
4549
+                readobj.ResetDisplayList();
4550
+            } catch (Exception e2)
4551
+            {
4552
+                e2.printStackTrace();
4553
+            }
40874554         }
40884555 //            catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
40894556 //            catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4129,6 +4596,12 @@
41294596 
41304597     void LoadIt(Object obj)
41314598     {
4599
+        if (obj == null)
4600
+        {
4601
+            // Invalid file
4602
+            return;
4603
+        }
4604
+        
41324605         System.out.println("Loaded " + obj);
41334606         //new Exception().printStackTrace();
41344607         Object3D readobj = (Object3D) obj;
....@@ -4138,6 +4611,8 @@
41384611         
41394612         if (readobj != null)
41404613         {
4614
+        if (Globals.SAVEONMAKE)
4615
+            Save();
41414616             try
41424617             {
41434618                 //readobj.deepCopySelf(copy);
....@@ -4287,11 +4762,13 @@
42874762         try
42884763         {
42894764             FileOutputStream ostream = new FileOutputStream(lastname);
4290
-            ObjectOutputStream p = new ObjectOutputStream(ostream);
4765
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4766
+            ObjectOutputStream p = new ObjectOutputStream(zstream);
42914767 
42924768             p.writeObject(copy);
42934769             p.flush();
42944770 
4771
+            zstream.close();
42954772             ostream.close();
42964773 
42974774             //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4301,6 +4778,7 @@
43014778         {
43024779         }
43034780     }
4781
+    
43044782     String lastname;
43054783 
43064784     void saveAs()
....@@ -4312,6 +4790,8 @@
43124790             String filename = browser.getFile();
43134791             if (filename != null && filename.length() > 0)
43144792             {
4793
+                if (!filename.endsWith(".gfd"))
4794
+                    filename += ".gfd";
43154795                 lastname = browser.getDirectory() + filename;
43164796                 save();
43174797             }
....@@ -4410,8 +4890,8 @@
44104890         try
44114891         {
44124892             FileOutputStream ostream = new FileOutputStream(filename);
4413
-            // ??        java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4414
-            ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
4893
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4894
+            ObjectOutputStream p = new ObjectOutputStream(zstream);
44154895 
44164896             Object3D objectparent = obj.parent;
44174897             obj.parent = null;
....@@ -4428,8 +4908,8 @@
44284908             p.writeObject(object);
44294909             p.flush();
44304910 
4911
+            zstream.close();
44314912             ostream.close();
4432
-            //       zstream.close();
44334913 
44344914 //                                    group.selection.get(0).parent = parent;
44354915             //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4476,7 +4956,8 @@
44764956     Object3D client;
44774957     Object3D copy;
44784958     MenuBar menuBar;
4479
-    Menu windowMenu;
4959
+    Menu fileMenu;
4960
+    MenuItem newItem;
44804961     MenuItem loadItem;
44814962     MenuItem saveItem;
44824963     MenuItem saveAsItem;
....@@ -4484,11 +4965,9 @@
44844965     MenuItem reexportItem;
44854966     MenuItem povItem;
44864967     MenuItem closeItem;
4487
-    Menu cameraMenu;
4968
+    
44884969     CheckboxMenuItem zBufferItem;
44894970     //MenuItem normalLensItem;
4490
-    MenuItem editCameraItem;
4491
-    MenuItem revertCameraItem;
44924971     MenuItem stepItem;
44934972     CheckboxMenuItem toggleLiveItem;
44944973     CheckboxMenuItem toggleFullScreenItem;
....@@ -4506,18 +4985,31 @@
45064985     CheckboxMenuItem togglePaintItem;
45074986     JSplitPane mainPanel;
45084987     JScrollPane scrollpane;
4988
+    
45094989     JPanel toolbarPanel;
4990
+    
45104991     cGridBag treePanel;
4992
+    
45114993     JPanel radioPanel;
45124994     ButtonGroup buttonGroup;
4513
-    cGridBag ctrlPanel;
4995
+    
4996
+    cGridBag toolboxPanel;
45144997     cGridBag materialPanel;
4998
+    cGridBag ctrlPanel;
4999
+    
45155000     JScrollPane infoPanel;
5001
+    
45165002     cGridBag optionsPanel;
5003
+    
45175004     JTabbedPane objectPanel;
5005
+    boolean materialFlushed;
5006
+    Object3D latestObject;
5007
+    
45185008     cGridBag XYZPanel;
5009
+    
45195010     JSplitPane gridPanel;
45205011     JSplitPane bigPanel;
5012
+    
45215013     cGridBag bigThree;
45225014     cGridBag scenePanel;
45235015     cGridBag centralPanel;
....@@ -4632,8 +5124,13 @@
46325124     cNumberSlider fogField;
46335125     JLabel opacityPowerLabel;
46345126     cNumberSlider opacityPowerField;
4635
-    JTree jTree;
5127
+    cTree jTree;
46365128     //ObjectUI parent;
46375129     
46385130     cNumberSlider normalpushField;
5131
+    
5132
+	private MenuItem importGFDItem;
5133
+	private MenuItem importVRMLX3DItem;
5134
+	private MenuItem import3DSItem;
5135
+	private MenuItem importOBJItem;
46395136 }