blame | history | patch | commit | commitdiff
Normand Briere
2019-06-23 8088590686a45e71278f9a52bb9cc37943dc0c37 
 ObjEditor.java
....@@ -36,6 +36,8 @@
3636     GroupEditor callee;
3737     JFrame frame;
3838     
39
+    static ObjEditor theFrame;
40
+    
3941     // SCRIPT
4042     
4143     transient JFrame textpanel = null;
....@@ -168,6 +170,7 @@
168170 //        objEditor.ctrlPanel.remove(remarkButton);
169171         
170172         objEditor.ctrlPanel.remove(setupPanel);
173
+        objEditor.ctrlPanel.remove(setupPanel2);
171174         objEditor.ctrlPanel.remove(commandsPanel);
172175         objEditor.ctrlPanel.remove(pushPanel);
173176         //objEditor.ctrlPanel.remove(fillPanel);
....@@ -243,6 +246,7 @@
243246         //localCopy.parent = null;
244247 
245248         frame = new JFrame();
249
+                frame.setUndecorated(true);
246250         objEditor = this;
247251         this.callee = callee;
248252 
....@@ -276,24 +280,40 @@
276280     void SetupMenu()
277281     {
278282         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..."));
283
+        menuBar.add(fileMenu = new Menu("File"));
284
+        fileMenu.add(newItem = new MenuItem("New"));
285
+        fileMenu.add(loadItem = new MenuItem("Open..."));
286
+        
287
+                //oe.menuBar.add(menu = new Menu("Include"));
288
+        Menu menu = new Menu("Import");
289
+		importOBJItem = menu.add(new MenuItem("OBJ file..."));
290
+		importOBJItem.addActionListener(this);
291
+		import3DSItem = menu.add(new MenuItem("3DS file..."));
292
+		import3DSItem.addActionListener(this);
293
+		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
294
+		importVRMLX3DItem.addActionListener(this);
295
+		menu.add("-");
296
+		importGFDItem = menu.add(new MenuItem("Grafreed file..."));
297
+		importGFDItem.addActionListener(this);
298
+        fileMenu.add(menu);
299
+        fileMenu.add("-");
300
+
301
+        fileMenu.add(saveItem = new MenuItem("Save"));
302
+        fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284303         //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("-");
304
+        fileMenu.add("-");
305
+        fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
306
+        fileMenu.add(reexportItem = new MenuItem("Re-export"));
307
+        fileMenu.add("-");
289308         if (client.parent != null)
290309         {
291
-            windowMenu.add(closeItem = new MenuItem("Close"));
310
+            fileMenu.add(closeItem = new MenuItem("Close"));
292311         } else
293312         {
294
-            windowMenu.add(closeItem = new MenuItem("Exit"));
313
+            fileMenu.add(closeItem = new MenuItem("Exit"));
295314         }
296315 
316
+        newItem.addActionListener(this);
297317         loadItem.addActionListener(this);
298318         saveItem.addActionListener(this);
299319         saveAsItem.addActionListener(this);
....@@ -301,78 +321,6 @@
301321         reexportItem.addActionListener(this);
302322         //povItem.addActionListener(this);
303323         closeItem.addActionListener(this);
304
-
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);
376324 
377325         objectPanel = new JTabbedPane();
378326         toolbarPanel = new JPanel();
....@@ -475,10 +423,10 @@
475423             e.printStackTrace();
476424         }
477425         
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();
426
+//        String selection = infoarea.getText();
427
+//        java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
428
+//        java.awt.datatransfer.Clipboard clipboard = 
429
+//                Toolkit.getDefaultToolkit().getSystemClipboard();
482430         //clipboard.setContents(data, data);
483431     }
484432     
....@@ -501,13 +449,13 @@
501449         //SendInfo("Name:", "bold");
502450         if (sel.GetTextures() != null || debug)
503451         {
504
-            si.SendInfo(sel.toString(), "bold");
452
+            si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
505453             //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
506454             if (sel.Size() > 0)
507455             {
508456                 si.SendInfo("#children = " + sel.Size(), "regular");
509457             }
510
-            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent, "regular");
458
+            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
511459             if (debug)
512460             {
513461                 try
....@@ -549,7 +497,7 @@
549497                 }
550498                 if (sel.support != null)
551499                 {
552
-                    si.SendInfo("    support: " + sel.support, "regular");
500
+                    si.SendInfo("    support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
553501                 }
554502                 if (sel.scriptnode != null)
555503                 {
....@@ -638,19 +586,89 @@
638586         }
639587     }
640588 
589
+static GraphicsDevice device = GraphicsEnvironment
590
+        .getLocalGraphicsEnvironment().getScreenDevices()[0];
591
+
592
+    Rectangle keeprect;
593
+        cRadio radio;
594
+        
595
+cButton keepButton;
596
+	cButton twoButton; // Full 3D
597
+	cButton sixButton;
598
+	cButton threeButton;
599
+	cButton sevenButton;
600
+	cButton fourButton; // full panel
601
+	cButton oneButton; // full XYZ
602
+        //cButton currentLayout;
603
+        
604
+        boolean maximized;
605
+    
606
+        void Minimize()
607
+        {
608
+            frame.setState(Frame.ICONIFIED);
609
+        }
610
+        
611
+        void Maximize()
612
+        {
613
+            if (maximized)
614
+            {
615
+                frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
616
+            }
617
+            else
618
+            {
619
+                keeprect = frame.getBounds();
620
+                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
621
+                Dimension rect2 = frame.getToolkit().getScreenSize();
622
+                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
623
+//                frame.setState(Frame.MAXIMIZED_BOTH);
624
+            }
625
+            
626
+            maximized ^= true;
627
+        }
628
+        
641629         void ToggleFullScreen()
642630         {
643631                 if (CameraPane.FULLSCREEN)
644632                 {
645
-                    frame.getContentPane().remove(/*"Center",*/bigThree);
646
-                    framePanel.add(bigThree);
647
-                    frame.getContentPane().add(/*"Center",*/framePanel);
633
+                    device.setFullScreenWindow(null);
634
+                    //frame.setVisible(false);
635
+//                frame.removeNotify();
636
+//                frame.setUndecorated(false);
637
+//                frame.addNotify();
638
+                //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
639
+                    
640
+// X                   frame.getContentPane().remove(/*"Center",*/bigThree);
641
+// X                   framePanel.add(bigThree);
642
+// X                   frame.getContentPane().add(/*"Center",*/framePanel);
643
+                    framePanel.setDividerLocation(1);
644
+                    
645
+                    //frame.setVisible(true);
646
+                    radio.layout = keepButton;
647
+                    //theFrame = null;
648
+                    keepButton = null;
649
+                    radio.layout.doClick();
650
+                    
648651                 } else
649652                 {
650
-                    frame.getContentPane().remove(/*"Center",*/framePanel);
651
-                    framePanel.remove(bigThree);
652
-                    frame.getContentPane().add(/*"Center",*/bigThree);
653
+                    keepButton = radio.layout;
654
+                    //keeprect = frame.getBounds();
655
+//                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
656
+//                        frame.getToolkit().getScreenSize().height);
657
+                    //frame.setVisible(false);
658
+                    device.setFullScreenWindow(frame);
659
+//                frame.removeNotify();
660
+//                frame.setUndecorated(true);
661
+//                frame.addNotify();
662
+// X                   frame.getContentPane().remove(/*"Center",*/framePanel);
663
+// X                   framePanel.remove(bigThree);
664
+// X                   frame.getContentPane().add(/*"Center",*/bigThree);
665
+                    framePanel.setDividerLocation(0);
666
+
667
+                    radio.layout = twoButton;
668
+                    radio.layout.doClick();
669
+                    //frame.setVisible(true);
653670                 }
671
+                
654672                 cameraView.ToggleFullScreen();
655673         }
656674 
....@@ -784,6 +802,7 @@
784802 //    NumberSlider vDivsField;
785803 //    JCheckBox endcaps;
786804     JCheckBox liveCB;
805
+    JCheckBox selectCB;
787806     JCheckBox hideCB;
788807     JCheckBox link2masterCB;
789808     JCheckBox markCB;
....@@ -802,6 +821,7 @@
802821     
803822     cGridBag namePanel;
804823     cGridBag setupPanel;
824
+    cGridBag setupPanel2;
805825     cGridBag commandsPanel;
806826     cGridBag pushPanel;
807827     cGridBag fillPanel;
....@@ -986,27 +1006,33 @@
9861006             
9871007         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
9881008                 liveCB.setToolTipText("Animate object");
1009
+        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1010
+                selectCB.setToolTipText("Make object selectable");
1011
+//            Return();
9891012         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
9901013                 hideCB.setToolTipText("Hide object");
991
-//            Return();
9921014         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
9931015         markCB.setToolTipText("Set the animation target transform");
9941016         
995
-        rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
1017
+            setupPanel2 = new cGridBag().setVertical(false);
1018
+            
1019
+        rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
9961020         rewindCB.setToolTipText("Rewind animation");
9971021         
998
-        randomCB = AddCheckBox(setupPanel, "Random", copy.random);
999
-        randomCB.setToolTipText("Option for switch node");
1022
+        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1023
+        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
10001024 
10011025         if (Globals.ADVANCED)
10021026         {
1003
-                link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1027
+                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
10041028                 link2masterCB.setToolTipText("Attach to support");
1005
-                speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
1029
+                speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
10061030                 speedupCB.setToolTipText("Option motion capture");
10071031         }
10081032         
10091033         oe.ctrlPanel.add(setupPanel);
1034
+        oe.ctrlPanel.Return();
1035
+        oe.ctrlPanel.add(setupPanel2);
10101036         oe.ctrlPanel.Return();
10111037         
10121038             commandsPanel = new cGridBag().setVertical(false);
....@@ -1028,7 +1054,7 @@
10281054         oe.ctrlPanel.add(commandsPanel);
10291055         oe.ctrlPanel.Return();
10301056 
1031
-    pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
1057
+    pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
10321058     normalpushField = (cNumberSlider)pushPanel.getComponent(1);
10331059     //Return();
10341060 
....@@ -1231,8 +1257,11 @@
12311257         //worldPanel.setName("World");
12321258 	centralPanel = new cGridBag();
12331259         centralPanel.preferredWidth = 20;
1234
-	timelinePanel = new JPanel(new BorderLayout());
1235
-        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1260
+        
1261
+        if (Globals.ADVANCED)
1262
+        {
1263
+            timelinePanel = new JPanel(new BorderLayout());
1264
+            timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
12361265 
12371266         cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
12381267         cameraPanel.setContinuousLayout(true);
....@@ -1241,7 +1270,10 @@
12411270 //        cameraPanel.setDividerSize(9);
12421271         cameraPanel.setResizeWeight(1.0);
12431272         
1273
+        }
1274
+        
12441275         centralPanel.add(cameraView);
1276
+        centralPanel.setFocusable(true);
12451277         //frame.setJMenuBar(timelineMenubar);
12461278         //centralPanel.add(timelinePanel);
12471279         
....@@ -1439,6 +1471,8 @@
14391471         frame.setSize(1280, 860);
14401472         frame.setVisible(true);
14411473 
1474
+                    cameraView.requestFocusInWindow();
1475
+                    
14421476         gridPanel.setDividerLocation(1.0);
14431477 
14441478         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
....@@ -1988,6 +2022,7 @@
19882022             e2.printStackTrace();
19892023         }
19902024     }
2025
+    
19912026     LoadJMEThread loadThread;
19922027 
19932028     class LoadJMEThread extends Thread
....@@ -2045,6 +2080,7 @@
20452080             //LoadFile0(filename, converter);
20462081         }
20472082     }
2083
+    
20482084     LoadOBJThread loadObjThread;
20492085 
20502086     class LoadOBJThread extends Thread
....@@ -2123,19 +2159,19 @@
21232159 
21242160     void LoadObjFile(String fullname)
21252161     {
2126
-        /*
2162
+        System.out.println("Loading " + fullname);
2163
+        /**/
21272164         //lastFilename = fullname;
21282165         if(loadObjThread == null)
21292166         {
2130
-        loadObjThread = new LoadOBJThread();
2131
-        loadObjThread.start();
2167
+            loadObjThread = new LoadOBJThread();
2168
+            loadObjThread.start();
21322169         }
21332170         
21342171         loadObjThread.add(fullname);
2135
-         */
2172
+        /**/
21362173 
2137
-        System.out.println("Loading " + fullname);
2138
-        makeSomething(new FileObject(fullname, true), true);
2174
+        //makeSomething(new FileObject(fullname, true), true);
21392175     }
21402176 
21412177     void LoadGFDFile(String fullname)
....@@ -2978,7 +3014,7 @@
29783014             return;
29793015         } else if (event.getSource() == toggleSwitchItem)
29803016         {
2981
-            cameraView.ToggleRandom();
3017
+            cameraView.ToggleSwitch();
29823018             cameraView.repaint();
29833019             return;
29843020         } else if (event.getSource() == toggleHandleItem)
....@@ -3006,6 +3042,10 @@
30063042         } else if (event.getSource() == liveCB)
30073043         {
30083044             copy.live ^= true;
3045
+            return;
3046
+        } else if (event.getSource() == selectCB)
3047
+        {
3048
+            copy.dontselect ^= true;
30093049             return;
30103050         } else if (event.getSource() == hideCB)
30113051         {
....@@ -3045,8 +3085,9 @@
30453085 
30463086     public void actionPerformed(ActionEvent event)
30473087     {
3088
+        Object source = event.getSource();
30483089         // SCRIPT DIALOG
3049
-        if (event.getSource() == okbutton)
3090
+        if (source == okbutton)
30503091         {
30513092             textpanel.setVisible(false);
30523093             textpanel.remove(textarea);
....@@ -3058,7 +3099,7 @@
30583099             textarea = null;
30593100             textpanel = null;
30603101         }
3061
-        if (event.getSource() == cancelbutton)
3102
+        if (source == cancelbutton)
30623103         {
30633104             textpanel.setVisible(false);
30643105             textpanel.remove(textarea);
....@@ -3070,50 +3111,50 @@
30703111         //applySelf();
30713112         //client.refreshEditWindow();
30723113         //refreshContents();
3073
-        if (event.getSource() == nameField)
3114
+        if (source == nameField)
30743115         {
30753116             //System.out.println("ObjEditor " + event);
30763117             applySelf0(true);
30773118             //parent.applySelf();
30783119             objEditor.refreshContents();
3079
-        } else if (event.getSource() == resetButton)
3120
+        } else if (source == resetButton)
30803121         {
30813122             CameraPane.fullreset = true;
30823123             copy.Reset(); // ResetMeshes();
30833124             copy.Touch();
30843125             objEditor.refreshContents();
3085
-        } else if (event.getSource() == stepItem)
3126
+        } else if (source == stepItem)
30863127         {
30873128             //cameraView.ONESTEP = true;
30883129             Globals.ONESTEP = true;
30893130             cameraView.repaint();
30903131             return;
3091
-        } else if (event.getSource() == stepButton)
3132
+        } else if (source == stepButton)
30923133         {
30933134             copy.Step();
30943135             copy.Touch();
30953136             objEditor.refreshContents();
3096
-        } else if (event.getSource() == slowerButton)
3137
+        } else if (source == slowerButton)
30973138         {
30983139             copy.Slower();
30993140             copy.Touch();
31003141             objEditor.refreshContents();
3101
-        } else if (event.getSource() == fasterButton)
3142
+        } else if (source == fasterButton)
31023143         {
31033144             copy.Faster();
31043145             copy.Touch();
31053146             objEditor.refreshContents();
3106
-        } else if (event.getSource() == remarkButton)
3147
+        } else if (source == remarkButton)
31073148         {
31083149             copy.Remark();
31093150             copy.Touch();
31103151             objEditor.refreshContents();
3111
-        } else if (event.getSource() == stepAllButton)
3152
+        } else if (source == stepAllButton)
31123153         {
31133154             copy.StepAll();
31143155             copy.Touch();
31153156             objEditor.refreshContents();
3116
-        } else if (event.getSource() == resetAllButton)
3157
+        } else if (source == resetAllButton)
31173158         {
31183159             //CameraPane.fullreset = true;
31193160             copy.ResetAll(); // ResetMeshes();
....@@ -3146,53 +3187,75 @@
31463187         //			Close();
31473188         //		}
31483189         //                else
3149
-        if (event.getSource() == resetSlidersButton)
3190
+        if (source == resetSlidersButton)
31503191         {
31513192             ResetSliders();
3152
-        } else if (event.getSource() == clearMaterialButton)
3193
+        } else if (source == clearMaterialButton)
31533194         {
31543195             ClearMaterial();
3155
-        } else if (event.getSource() == createMaterialButton)
3196
+        } else if (source == createMaterialButton)
31563197         {
31573198             CreateMaterial();
3158
-        } else if (event.getSource() == clearPanelButton)
3199
+        } else if (source == clearPanelButton)
31593200         {
31603201             copy.ClearUI();
31613202             refreshContents(true);
3162
-        } /*
3163
-        }
3164
-        
3165
-        public boolean action(Event event, Object arg)
3166
-        {
3167
-         */ else if (event.getSource() == closeItem)
3203
+        } else if (source == importGFDItem)
3204
+		{
3205
+			ImportGFD();
3206
+		} else
3207
+		if (source == importVRMLX3DItem)
3208
+		{
3209
+			ImportVRMLX3D();
3210
+		} else
3211
+		if (source == import3DSItem)
3212
+		{
3213
+			objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
3214
+		} else
3215
+		if (source == importOBJItem)
3216
+		{
3217
+			//objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
3218
+                            FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
3219
+                            browser.setVisible(true);
3220
+                            String filename = browser.getFile();
3221
+                            if (filename != null && filename.length() > 0)
3222
+                            {
3223
+                                String fullname = browser.getDirectory() + filename;
3224
+                                makeSomething(ReadOBJ(fullname), true);
3225
+                            }
3226
+		} else
3227
+        if (source == closeItem)
31683228         {
31693229             Close();
31703230             //return true;
3171
-        } else if (event.getSource() == loadItem)
3231
+        } else if (source == loadItem)
31723232         {
31733233             load();
31743234             //return true;
3175
-        } else if (event.getSource() == saveItem)
3235
+        } else if (source == newItem)
3236
+        {
3237
+            New();
3238
+        } else if (source == saveItem)
31763239         {
31773240             save();
31783241             //return true;
3179
-        } else if (event.getSource() == saveAsItem)
3242
+        } else if (source == saveAsItem)
31803243         {
31813244             saveAs();
31823245             //return true;
3183
-        } else if (event.getSource() == reexportItem)
3246
+        } else if (source == reexportItem)
31843247         {
31853248             reexport();
31863249             //return true;
3187
-        } else if (event.getSource() == exportAsItem)
3250
+        } else if (source == exportAsItem)
31883251         {
31893252             export();
31903253             //return true;
3191
-        } else if (event.getSource() == povItem)
3254
+        } else if (source == povItem)
31923255         {
31933256             generatePOV();
31943257             //return true;
3195
-        } else if (event.getSource() == zBufferItem)
3258
+        } else if (source == zBufferItem)
31963259         {
31973260             try
31983261             {
....@@ -3214,21 +3277,8 @@
32143277         cameraView.repaint();
32153278         //return true;
32163279         }
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)
3280
+         */ else // combos...
3281
+        if (source == texresMenu)
32323282         {
32333283             System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
32343284             copy.texres = texresMenu.getSelectedIndex();
....@@ -3240,6 +3290,262 @@
32403290         }
32413291     }
32423292 
3293
+    void New()
3294
+    {
3295
+        while (copy.Size() > 1)
3296
+        {
3297
+            copy.remove(1);
3298
+        }
3299
+        
3300
+        ResetModel();
3301
+        objEditor.refreshContents();
3302
+    }
3303
+    
3304
+    static public byte[] Compress(Object3D o)
3305
+    {
3306
+        try
3307
+        {
3308
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
3309
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3310
+            ObjectOutputStream out = new ObjectOutputStream(zstream);
3311
+
3312
+        Object3D parent = o.parent;
3313
+        o.parent = null;
3314
+        
3315
+            out.writeObject(o);
3316
+            
3317
+        o.parent = parent;
3318
+        
3319
+            out.flush();
3320
+
3321
+            zstream.close();
3322
+            out.close();
3323
+            
3324
+            return baos.toByteArray();
3325
+        } catch (Exception e)
3326
+        {
3327
+            System.err.println(e);
3328
+            return null;
3329
+        }
3330
+    }
3331
+
3332
+    static public Object Uncompress(byte[] bytes)
3333
+    {
3334
+        System.out.println("#bytes = " + bytes.length);
3335
+        try
3336
+        {
3337
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3338
+            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3339
+            ObjectInputStream in = new ObjectInputStream(istream);
3340
+            Object obj = in.readObject();
3341
+            in.close();
3342
+            
3343
+            return obj;
3344
+        } catch (Exception e)
3345
+        {
3346
+            System.err.println(e);
3347
+            return null;
3348
+        }
3349
+    }
3350
+
3351
+    static public Object clone(Object o)
3352
+    {
3353
+        try
3354
+        {
3355
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
3356
+            ObjectOutputStream out = new ObjectOutputStream(baos);
3357
+
3358
+            out.writeObject(o);
3359
+            
3360
+            out.flush();
3361
+            out.close();
3362
+            
3363
+            byte[] bytes = baos.toByteArray();
3364
+            
3365
+            System.out.println("clone = " + bytes.length);
3366
+
3367
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3368
+            ObjectInputStream in = new ObjectInputStream(bais);
3369
+            Object obj = in.readObject();
3370
+            in.close();
3371
+            
3372
+            return obj;
3373
+        } catch (Exception e)
3374
+        {
3375
+            System.err.println(e);
3376
+            return null;
3377
+        }
3378
+    }
3379
+
3380
+    cRadio GetCurrentTab()
3381
+    {
3382
+        cRadio ab;
3383
+        for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3384
+        {
3385
+            ab = (cRadio)e.nextElement();
3386
+            if(ab.GetObject() == copy)
3387
+            {
3388
+                return ab;
3389
+            }
3390
+        }
3391
+        
3392
+        return null;
3393
+    }
3394
+    
3395
+    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3396
+    
3397
+    public void Save()
3398
+    {
3399
+        cRadio tab = GetCurrentTab();
3400
+        
3401
+        boolean temp = CameraPane.SWITCH;
3402
+        CameraPane.SWITCH = false;
3403
+        
3404
+        copy.ExtractBigData(hashtable);
3405
+        
3406
+        //EditorFrame.m_MainFrame.requestFocusInWindow();
3407
+        tab.graphs[tab.undoindex++] = Compress(copy);
3408
+
3409
+        copy.RestoreBigData(hashtable);
3410
+
3411
+        CameraPane.SWITCH = temp;
3412
+        
3413
+        //assert(hashtable.isEmpty());
3414
+        
3415
+        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3416
+        {
3417
+            tab.graphs[i] = null;
3418
+        }
3419
+
3420
+        // test save
3421
+        if (false)
3422
+        {
3423
+            try
3424
+            {
3425
+                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3426
+                ObjectOutputStream p = new ObjectOutputStream(ostream);
3427
+
3428
+                p.writeObject(copy);
3429
+                
3430
+                p.flush();
3431
+
3432
+                ostream.close();
3433
+            } catch (Exception e)
3434
+            {
3435
+                e.printStackTrace();
3436
+            }
3437
+        }
3438
+    }
3439
+
3440
+    void CopyChanged(Object3D obj)
3441
+    {
3442
+        boolean temp = CameraPane.SWITCH;
3443
+        CameraPane.SWITCH = false;
3444
+        
3445
+        copy.ExtractBigData(hashtable);
3446
+        
3447
+        copy.clear();
3448
+        
3449
+        for (int i=0; i<obj.Size(); i++)
3450
+        {
3451
+            copy.add(obj.get(i));
3452
+        }
3453
+        
3454
+        copy.RestoreBigData(hashtable);
3455
+        
3456
+        CameraPane.SWITCH = temp;
3457
+        
3458
+        //assert(hashtable.isEmpty());
3459
+        
3460
+        copy.Touch();
3461
+        
3462
+        ResetModel();
3463
+        copy.HardTouch(); // recompile?
3464
+        
3465
+        cRadio ab;
3466
+        for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3467
+        {
3468
+            ab = (cRadio)e.nextElement();
3469
+            Object3D test = copy.GetObject(ab.object.GetUUID());
3470
+            //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3471
+            if (test != null)
3472
+            {
3473
+                test.editWindow = ab.object.editWindow;
3474
+                ab.object = test;
3475
+            }
3476
+        }
3477
+        
3478
+        refreshContents();
3479
+    }
3480
+    
3481
+    public void Undo()
3482
+    {
3483
+        cRadio tab = GetCurrentTab();
3484
+        
3485
+        if (tab.undoindex == 0)
3486
+        {
3487
+            java.awt.Toolkit.getDefaultToolkit().beep();
3488
+            return;
3489
+        }
3490
+
3491
+        if (tab.graphs[tab.undoindex] == null)
3492
+        {
3493
+            Save();
3494
+            tab.undoindex -= 1;
3495
+        }
3496
+
3497
+        tab.undoindex -= 1;
3498
+
3499
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3500
+    }
3501
+
3502
+    public void Redo()
3503
+    {
3504
+        cRadio tab = GetCurrentTab();
3505
+        
3506
+        if (tab.graphs[tab.undoindex + 1] == null)
3507
+        {
3508
+            java.awt.Toolkit.getDefaultToolkit().beep();
3509
+            return;
3510
+        }
3511
+
3512
+        tab.undoindex += 1;
3513
+
3514
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3515
+    }
3516
+
3517
+        void ImportGFD()
3518
+        {
3519
+            FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3520
+            browser.show();
3521
+            String filename = browser.getFile();
3522
+            if (filename != null && filename.length() > 0)
3523
+            {
3524
+                String fullname = browser.getDirectory() + filename;
3525
+
3526
+                //Object3D readobj =
3527
+                        objEditor.ReadGFD(fullname, objEditor);
3528
+                //makeSomething(readobj);
3529
+            }
3530
+        }
3531
+        
3532
+	void ImportVRMLX3D()
3533
+	{
3534
+		if (Grafreed.standAlone)
3535
+		{
3536
+                    /**/
3537
+			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
3538
+			browser.show();
3539
+			String filename = browser.getFile();
3540
+			if (filename != null && filename.length() > 0)
3541
+			{
3542
+				String fullname = browser.getDirectory() + filename;
3543
+                                LoadVRMLX3D(fullname);
3544
+			}
3545
+                     /**/
3546
+		}
3547
+	}
3548
+				
32433549     void ToggleAnimation()
32443550     {
32453551         if (!Globals.ANIMATION)
....@@ -3588,7 +3894,7 @@
35883894         }
35893895         
35903896         if (normalpushField != null)
3591
-                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3897
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35923898     }
35933899 
35943900         void SnapObject()
....@@ -3852,6 +4158,7 @@
38524158 
38534159     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
38544160     {
4161
+        Save();
38554162         //Tween.set(thing, 0).target(1).start(tweenManager);
38564163         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
38574164 //            if (thing instanceof GenericJointDemo)
....@@ -4055,6 +4362,7 @@
40554362             }
40564363         }
40574364     }
4365
+    
40584366     LoadGFDThread loadGFDThread;
40594367 
40604368     void ReadGFD(String fullname, iCallBack cb)
....@@ -4074,8 +4382,10 @@
40744382 
40754383         try
40764384         {
4385
+            // Try compressed version first.
40774386             java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4078
-            java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4387
+            java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4388
+            java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
40794389 
40804390             readobj = (Object3D) p.readObject();
40814391             istream.close();
....@@ -4083,7 +4393,20 @@
40834393             readobj.ResetDisplayList();
40844394         } catch (Exception e)
40854395         {
4086
-            e.printStackTrace();
4396
+            //e.printStackTrace();
4397
+            try
4398
+            {
4399
+                java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4400
+                java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4401
+
4402
+                readobj = (Object3D) p.readObject();
4403
+                istream.close();
4404
+
4405
+                readobj.ResetDisplayList();
4406
+            } catch (Exception e2)
4407
+            {
4408
+                e2.printStackTrace();
4409
+            }
40874410         }
40884411 //            catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
40894412 //            catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4129,6 +4452,12 @@
41294452 
41304453     void LoadIt(Object obj)
41314454     {
4455
+        if (obj == null)
4456
+        {
4457
+            // Invalid file
4458
+            return;
4459
+        }
4460
+        
41324461         System.out.println("Loaded " + obj);
41334462         //new Exception().printStackTrace();
41344463         Object3D readobj = (Object3D) obj;
....@@ -4138,6 +4467,7 @@
41384467         
41394468         if (readobj != null)
41404469         {
4470
+            Save();
41414471             try
41424472             {
41434473                 //readobj.deepCopySelf(copy);
....@@ -4287,11 +4617,13 @@
42874617         try
42884618         {
42894619             FileOutputStream ostream = new FileOutputStream(lastname);
4290
-            ObjectOutputStream p = new ObjectOutputStream(ostream);
4620
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4621
+            ObjectOutputStream p = new ObjectOutputStream(zstream);
42914622 
42924623             p.writeObject(copy);
42934624             p.flush();
42944625 
4626
+            zstream.close();
42954627             ostream.close();
42964628 
42974629             //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4301,6 +4633,7 @@
43014633         {
43024634         }
43034635     }
4636
+    
43044637     String lastname;
43054638 
43064639     void saveAs()
....@@ -4410,8 +4743,8 @@
44104743         try
44114744         {
44124745             FileOutputStream ostream = new FileOutputStream(filename);
4413
-            // ??        java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4414
-            ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
4746
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4747
+            ObjectOutputStream p = new ObjectOutputStream(zstream);
44154748 
44164749             Object3D objectparent = obj.parent;
44174750             obj.parent = null;
....@@ -4428,8 +4761,8 @@
44284761             p.writeObject(object);
44294762             p.flush();
44304763 
4764
+            zstream.close();
44314765             ostream.close();
4432
-            //       zstream.close();
44334766 
44344767 //                                    group.selection.get(0).parent = parent;
44354768             //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4476,7 +4809,8 @@
44764809     Object3D client;
44774810     Object3D copy;
44784811     MenuBar menuBar;
4479
-    Menu windowMenu;
4812
+    Menu fileMenu;
4813
+    MenuItem newItem;
44804814     MenuItem loadItem;
44814815     MenuItem saveItem;
44824816     MenuItem saveAsItem;
....@@ -4484,11 +4818,9 @@
44844818     MenuItem reexportItem;
44854819     MenuItem povItem;
44864820     MenuItem closeItem;
4487
-    Menu cameraMenu;
4821
+    
44884822     CheckboxMenuItem zBufferItem;
44894823     //MenuItem normalLensItem;
4490
-    MenuItem editCameraItem;
4491
-    MenuItem revertCameraItem;
44924824     MenuItem stepItem;
44934825     CheckboxMenuItem toggleLiveItem;
44944826     CheckboxMenuItem toggleFullScreenItem;
....@@ -4636,4 +4968,9 @@
46364968     //ObjectUI parent;
46374969     
46384970     cNumberSlider normalpushField;
4971
+    
4972
+	private MenuItem importGFDItem;
4973
+	private MenuItem importVRMLX3DItem;
4974
+	private MenuItem import3DSItem;
4975
+	private MenuItem importOBJItem;
46394976 }