blame | history | patch | commit | commitdiff
Normand Briere
2019-06-24 c67da2e5d8655704601d6d06e8bc60aabe212253 
 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,7 +170,8 @@
168170 //        objEditor.ctrlPanel.remove(remarkButton);
169171         
170172         objEditor.ctrlPanel.remove(setupPanel);
171
-        objEditor.ctrlPanel.remove(commandsPanel);
173
+        objEditor.ctrlPanel.remove(setupPanel2);
174
+        objEditor.ctrlPanel.remove(objectCommandsPanel);
172175         objEditor.ctrlPanel.remove(pushPanel);
173176         //objEditor.ctrlPanel.remove(fillPanel);
174177         
....@@ -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);
....@@ -302,86 +322,23 @@
302322         //povItem.addActionListener(this);
303323         closeItem.addActionListener(this);
304324 
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
-
377325         objectPanel = new JTabbedPane();
378326         toolbarPanel = new JPanel();
379327         toolbarPanel.setName("Toolbar");
380328         treePanel = new cGridBag();
381329         treePanel.setName("Tree");
330
+        
331
+        editPanel = new cGridBag().setVertical(true);
332
+        editPanel.setName("Edit");
333
+        
382334         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
383
-        ctrlPanel.setName("Edit");
335
+        
336
+        editCommandsPanel = new cGridBag();
337
+        editPanel.add(editCommandsPanel);
338
+        editPanel.add(ctrlPanel);
339
+                
384340         materialPanel = new cGridBag().setVertical(true);
341
+        
385342         materialPanel.setName("Material");
386343         /*JTextPane*/
387344         infoarea = createTextPane();
....@@ -475,10 +432,10 @@
475432             e.printStackTrace();
476433         }
477434         
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();
435
+//        String selection = infoarea.getText();
436
+//        java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
437
+//        java.awt.datatransfer.Clipboard clipboard = 
438
+//                Toolkit.getDefaultToolkit().getSystemClipboard();
482439         //clipboard.setContents(data, data);
483440     }
484441     
....@@ -501,13 +458,13 @@
501458         //SendInfo("Name:", "bold");
502459         if (sel.GetTextures() != null || debug)
503460         {
504
-            si.SendInfo(sel.toString(), "bold");
461
+            si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
505462             //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
506463             if (sel.Size() > 0)
507464             {
508465                 si.SendInfo("#children = " + sel.Size(), "regular");
509466             }
510
-            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent, "regular");
467
+            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
511468             if (debug)
512469             {
513470                 try
....@@ -549,7 +506,7 @@
549506                 }
550507                 if (sel.support != null)
551508                 {
552
-                    si.SendInfo("    support: " + sel.support, "regular");
509
+                    si.SendInfo("    support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
553510                 }
554511                 if (sel.scriptnode != null)
555512                 {
....@@ -638,19 +595,89 @@
638595         }
639596     }
640597 
598
+static GraphicsDevice device = GraphicsEnvironment
599
+        .getLocalGraphicsEnvironment().getScreenDevices()[0];
600
+
601
+    Rectangle keeprect;
602
+        cRadio radio;
603
+        
604
+cButton keepButton;
605
+	cButton twoButton; // Full 3D
606
+	cButton sixButton;
607
+	cButton threeButton;
608
+	cButton sevenButton;
609
+	cButton fourButton; // full panel
610
+	cButton oneButton; // full XYZ
611
+        //cButton currentLayout;
612
+        
613
+        boolean maximized;
614
+    
615
+        void Minimize()
616
+        {
617
+            frame.setState(Frame.ICONIFIED);
618
+        }
619
+        
620
+        void Maximize()
621
+        {
622
+            if (maximized)
623
+            {
624
+                frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
625
+            }
626
+            else
627
+            {
628
+                keeprect = frame.getBounds();
629
+                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
630
+                Dimension rect2 = frame.getToolkit().getScreenSize();
631
+                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
632
+//                frame.setState(Frame.MAXIMIZED_BOTH);
633
+            }
634
+            
635
+            maximized ^= true;
636
+        }
637
+        
641638         void ToggleFullScreen()
642639         {
643640                 if (CameraPane.FULLSCREEN)
644641                 {
645
-                    frame.getContentPane().remove(/*"Center",*/bigThree);
646
-                    framePanel.add(bigThree);
647
-                    frame.getContentPane().add(/*"Center",*/framePanel);
642
+                    device.setFullScreenWindow(null);
643
+                    //frame.setVisible(false);
644
+//                frame.removeNotify();
645
+//                frame.setUndecorated(false);
646
+//                frame.addNotify();
647
+                //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
648
+                    
649
+// X                   frame.getContentPane().remove(/*"Center",*/bigThree);
650
+// X                   framePanel.add(bigThree);
651
+// X                   frame.getContentPane().add(/*"Center",*/framePanel);
652
+                    framePanel.setDividerLocation(1);
653
+                    
654
+                    //frame.setVisible(true);
655
+                    radio.layout = keepButton;
656
+                    //theFrame = null;
657
+                    keepButton = null;
658
+                    radio.layout.doClick();
659
+                    
648660                 } else
649661                 {
650
-                    frame.getContentPane().remove(/*"Center",*/framePanel);
651
-                    framePanel.remove(bigThree);
652
-                    frame.getContentPane().add(/*"Center",*/bigThree);
662
+                    keepButton = radio.layout;
663
+                    //keeprect = frame.getBounds();
664
+//                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
665
+//                        frame.getToolkit().getScreenSize().height);
666
+                    //frame.setVisible(false);
667
+                    device.setFullScreenWindow(frame);
668
+//                frame.removeNotify();
669
+//                frame.setUndecorated(true);
670
+//                frame.addNotify();
671
+// X                   frame.getContentPane().remove(/*"Center",*/framePanel);
672
+// X                   framePanel.remove(bigThree);
673
+// X                   frame.getContentPane().add(/*"Center",*/bigThree);
674
+                    framePanel.setDividerLocation(0);
675
+
676
+                    radio.layout = twoButton;
677
+                    radio.layout.doClick();
678
+                    //frame.setVisible(true);
653679                 }
680
+                
654681                 cameraView.ToggleFullScreen();
655682         }
656683 
....@@ -752,7 +779,7 @@
752779     protected static ImageIcon createImageIcon(String path,
753780             String description)
754781     {
755
-        java.net.URL imgURL = GrafreeD.class.getResource(path);
782
+        java.net.URL imgURL = Grafreed.class.getResource(path);
756783         if (imgURL != null)
757784         {
758785             return new ImageIcon(imgURL, description);
....@@ -784,6 +811,7 @@
784811 //    NumberSlider vDivsField;
785812 //    JCheckBox endcaps;
786813     JCheckBox liveCB;
814
+    JCheckBox selectCB;
787815     JCheckBox hideCB;
788816     JCheckBox link2masterCB;
789817     JCheckBox markCB;
....@@ -800,9 +828,13 @@
800828     JButton fasterButton;
801829     JButton remarkButton;
802830     
831
+    cGridBag editPanel;
832
+    cGridBag editCommandsPanel;
833
+    
803834     cGridBag namePanel;
804835     cGridBag setupPanel;
805
-    cGridBag commandsPanel;
836
+    cGridBag setupPanel2;
837
+    cGridBag objectCommandsPanel;
806838     cGridBag pushPanel;
807839     cGridBag fillPanel;
808840 
....@@ -986,49 +1018,55 @@
9861018             
9871019         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
9881020                 liveCB.setToolTipText("Animate object");
1021
+        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1022
+                selectCB.setToolTipText("Make object selectable");
1023
+//            Return();
9891024         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
9901025                 hideCB.setToolTipText("Hide object");
991
-//            Return();
9921026         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
9931027         markCB.setToolTipText("Set the animation target transform");
9941028         
995
-        rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
1029
+            setupPanel2 = new cGridBag().setVertical(false);
1030
+            
1031
+        rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
9961032         rewindCB.setToolTipText("Rewind animation");
9971033         
998
-        randomCB = AddCheckBox(setupPanel, "Random", copy.random);
999
-        randomCB.setToolTipText("Option for switch node");
1034
+        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1035
+        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
10001036 
10011037         if (Globals.ADVANCED)
10021038         {
1003
-                link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1039
+                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
10041040                 link2masterCB.setToolTipText("Attach to support");
1005
-                speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
1041
+                speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
10061042                 speedupCB.setToolTipText("Option motion capture");
10071043         }
10081044         
10091045         oe.ctrlPanel.add(setupPanel);
10101046         oe.ctrlPanel.Return();
1047
+        oe.ctrlPanel.add(setupPanel2);
1048
+        oe.ctrlPanel.Return();
10111049         
1012
-            commandsPanel = new cGridBag().setVertical(false);
1050
+            objectCommandsPanel = new cGridBag().setVertical(false);
10131051         
1014
-        resetButton = AddButton(commandsPanel, "Reset");
1052
+        resetButton = AddButton(objectCommandsPanel, "Reset");
10151053         resetButton.setToolTipText("Jump to frame zero");
1016
-        stepButton = AddButton(commandsPanel, "Step");
1054
+        stepButton = AddButton(objectCommandsPanel, "Step");
10171055         stepButton.setToolTipText("Step one frame");
10181056 //            resetAllButton = AddButton(oe, "Reset All");
10191057 //            stepAllButton = AddButton(oe, "Step All");
10201058 //            Return();
1021
-        slowerButton = AddButton(commandsPanel, "Slow");
1059
+        slowerButton = AddButton(objectCommandsPanel, "Slow");
10221060         slowerButton.setToolTipText("Decrease animation speed");
1023
-        fasterButton = AddButton(commandsPanel, "Fast");
1061
+        fasterButton = AddButton(objectCommandsPanel, "Fast");
10241062         fasterButton.setToolTipText("Increase animation speed");
1025
-        remarkButton = AddButton(commandsPanel, "Remark");
1063
+        remarkButton = AddButton(objectCommandsPanel, "Remark");
10261064         remarkButton.setToolTipText("Set the current transform as the target");
10271065 
1028
-        oe.ctrlPanel.add(commandsPanel);
1066
+        oe.ctrlPanel.add(objectCommandsPanel);
10291067         oe.ctrlPanel.Return();
10301068 
1031
-    pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
1069
+    pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
10321070     normalpushField = (cNumberSlider)pushPanel.getComponent(1);
10331071     //Return();
10341072 
....@@ -1231,8 +1269,11 @@
12311269         //worldPanel.setName("World");
12321270 	centralPanel = new cGridBag();
12331271         centralPanel.preferredWidth = 20;
1234
-	timelinePanel = new JPanel(new BorderLayout());
1235
-        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1272
+        
1273
+        if (Globals.ADVANCED)
1274
+        {
1275
+            timelinePanel = new JPanel(new BorderLayout());
1276
+            timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
12361277 
12371278         cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
12381279         cameraPanel.setContinuousLayout(true);
....@@ -1241,7 +1282,10 @@
12411282 //        cameraPanel.setDividerSize(9);
12421283         cameraPanel.setResizeWeight(1.0);
12431284         
1285
+        }
1286
+        
12441287         centralPanel.add(cameraView);
1288
+        centralPanel.setFocusable(true);
12451289         //frame.setJMenuBar(timelineMenubar);
12461290         //centralPanel.add(timelinePanel);
12471291         
....@@ -1308,7 +1352,7 @@
13081352 //        north.setName("Edit");
13091353 //        north.add(ctrlPanel, BorderLayout.NORTH);
13101354 //        objectPanel.add(north);
1311
-        objectPanel.add(ctrlPanel);
1355
+        objectPanel.add(editPanel);
13121356         objectPanel.add(infoPanel);
13131357 
13141358         /*
....@@ -1439,6 +1483,8 @@
14391483         frame.setSize(1280, 860);
14401484         frame.setVisible(true);
14411485 
1486
+                    cameraView.requestFocusInWindow();
1487
+                    
14421488         gridPanel.setDividerLocation(1.0);
14431489 
14441490         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
....@@ -1476,19 +1522,19 @@
14761522 
14771523         cGridBag editBar = new cGridBag().setVertical(false);
14781524             
1479
-        editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1525
+        editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
14801526                 createMaterialButton.setToolTipText("Create material");
14811527 
14821528         /*
14831529         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
14841530          */
14851531 
1486
-        editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1532
+        editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
14871533                 clearMaterialButton.setToolTipText("Clear material");
14881534         
14891535         if (Globals.ADVANCED)
14901536         {
1491
-                editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1537
+                editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
14921538                 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
14931539                 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
14941540         }
....@@ -1988,6 +2034,7 @@
19882034             e2.printStackTrace();
19892035         }
19902036     }
2037
+    
19912038     LoadJMEThread loadThread;
19922039 
19932040     class LoadJMEThread extends Thread
....@@ -2045,6 +2092,7 @@
20452092             //LoadFile0(filename, converter);
20462093         }
20472094     }
2095
+    
20482096     LoadOBJThread loadObjThread;
20492097 
20502098     class LoadOBJThread extends Thread
....@@ -2123,19 +2171,19 @@
21232171 
21242172     void LoadObjFile(String fullname)
21252173     {
2126
-        /*
2174
+        System.out.println("Loading " + fullname);
2175
+        /**/
21272176         //lastFilename = fullname;
21282177         if(loadObjThread == null)
21292178         {
2130
-        loadObjThread = new LoadOBJThread();
2131
-        loadObjThread.start();
2179
+            loadObjThread = new LoadOBJThread();
2180
+            loadObjThread.start();
21322181         }
21332182         
21342183         loadObjThread.add(fullname);
2135
-         */
2184
+        /**/
21362185 
2137
-        System.out.println("Loading " + fullname);
2138
-        makeSomething(new FileObject(fullname, true), true);
2186
+        //makeSomething(new FileObject(fullname, true), true);
21392187     }
21402188 
21412189     void LoadGFDFile(String fullname)
....@@ -2396,7 +2444,7 @@
23962444 
23972445     void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
23982446     {
2399
-        if (GrafreeD.standAlone)
2447
+        if (Grafreed.standAlone)
24002448         {
24012449             /**/
24022450             FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
....@@ -2978,7 +3026,7 @@
29783026             return;
29793027         } else if (event.getSource() == toggleSwitchItem)
29803028         {
2981
-            cameraView.ToggleRandom();
3029
+            cameraView.ToggleSwitch();
29823030             cameraView.repaint();
29833031             return;
29843032         } else if (event.getSource() == toggleHandleItem)
....@@ -3006,6 +3054,10 @@
30063054         } else if (event.getSource() == liveCB)
30073055         {
30083056             copy.live ^= true;
3057
+            return;
3058
+        } else if (event.getSource() == selectCB)
3059
+        {
3060
+            copy.dontselect ^= true;
30093061             return;
30103062         } else if (event.getSource() == hideCB)
30113063         {
....@@ -3045,8 +3097,9 @@
30453097 
30463098     public void actionPerformed(ActionEvent event)
30473099     {
3100
+        Object source = event.getSource();
30483101         // SCRIPT DIALOG
3049
-        if (event.getSource() == okbutton)
3102
+        if (source == okbutton)
30503103         {
30513104             textpanel.setVisible(false);
30523105             textpanel.remove(textarea);
....@@ -3058,7 +3111,7 @@
30583111             textarea = null;
30593112             textpanel = null;
30603113         }
3061
-        if (event.getSource() == cancelbutton)
3114
+        if (source == cancelbutton)
30623115         {
30633116             textpanel.setVisible(false);
30643117             textpanel.remove(textarea);
....@@ -3070,50 +3123,50 @@
30703123         //applySelf();
30713124         //client.refreshEditWindow();
30723125         //refreshContents();
3073
-        if (event.getSource() == nameField)
3126
+        if (source == nameField)
30743127         {
30753128             //System.out.println("ObjEditor " + event);
30763129             applySelf0(true);
30773130             //parent.applySelf();
30783131             objEditor.refreshContents();
3079
-        } else if (event.getSource() == resetButton)
3132
+        } else if (source == resetButton)
30803133         {
30813134             CameraPane.fullreset = true;
30823135             copy.Reset(); // ResetMeshes();
30833136             copy.Touch();
30843137             objEditor.refreshContents();
3085
-        } else if (event.getSource() == stepItem)
3138
+        } else if (source == stepItem)
30863139         {
30873140             //cameraView.ONESTEP = true;
30883141             Globals.ONESTEP = true;
30893142             cameraView.repaint();
30903143             return;
3091
-        } else if (event.getSource() == stepButton)
3144
+        } else if (source == stepButton)
30923145         {
30933146             copy.Step();
30943147             copy.Touch();
30953148             objEditor.refreshContents();
3096
-        } else if (event.getSource() == slowerButton)
3149
+        } else if (source == slowerButton)
30973150         {
30983151             copy.Slower();
30993152             copy.Touch();
31003153             objEditor.refreshContents();
3101
-        } else if (event.getSource() == fasterButton)
3154
+        } else if (source == fasterButton)
31023155         {
31033156             copy.Faster();
31043157             copy.Touch();
31053158             objEditor.refreshContents();
3106
-        } else if (event.getSource() == remarkButton)
3159
+        } else if (source == remarkButton)
31073160         {
31083161             copy.Remark();
31093162             copy.Touch();
31103163             objEditor.refreshContents();
3111
-        } else if (event.getSource() == stepAllButton)
3164
+        } else if (source == stepAllButton)
31123165         {
31133166             copy.StepAll();
31143167             copy.Touch();
31153168             objEditor.refreshContents();
3116
-        } else if (event.getSource() == resetAllButton)
3169
+        } else if (source == resetAllButton)
31173170         {
31183171             //CameraPane.fullreset = true;
31193172             copy.ResetAll(); // ResetMeshes();
....@@ -3146,53 +3199,75 @@
31463199         //			Close();
31473200         //		}
31483201         //                else
3149
-        if (event.getSource() == resetSlidersButton)
3202
+        if (source == resetSlidersButton)
31503203         {
31513204             ResetSliders();
3152
-        } else if (event.getSource() == clearMaterialButton)
3205
+        } else if (source == clearMaterialButton)
31533206         {
31543207             ClearMaterial();
3155
-        } else if (event.getSource() == createMaterialButton)
3208
+        } else if (source == createMaterialButton)
31563209         {
31573210             CreateMaterial();
3158
-        } else if (event.getSource() == clearPanelButton)
3211
+        } else if (source == clearPanelButton)
31593212         {
31603213             copy.ClearUI();
31613214             refreshContents(true);
3162
-        } /*
3163
-        }
3164
-        
3165
-        public boolean action(Event event, Object arg)
3166
-        {
3167
-         */ else if (event.getSource() == closeItem)
3215
+        } else if (source == importGFDItem)
3216
+		{
3217
+			ImportGFD();
3218
+		} else
3219
+		if (source == importVRMLX3DItem)
3220
+		{
3221
+			ImportVRMLX3D();
3222
+		} else
3223
+		if (source == import3DSItem)
3224
+		{
3225
+			objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
3226
+		} else
3227
+		if (source == importOBJItem)
3228
+		{
3229
+			//objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
3230
+                            FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
3231
+                            browser.setVisible(true);
3232
+                            String filename = browser.getFile();
3233
+                            if (filename != null && filename.length() > 0)
3234
+                            {
3235
+                                String fullname = browser.getDirectory() + filename;
3236
+                                makeSomething(ReadOBJ(fullname), true);
3237
+                            }
3238
+		} else
3239
+        if (source == closeItem)
31683240         {
31693241             Close();
31703242             //return true;
3171
-        } else if (event.getSource() == loadItem)
3243
+        } else if (source == loadItem)
31723244         {
31733245             load();
31743246             //return true;
3175
-        } else if (event.getSource() == saveItem)
3247
+        } else if (source == newItem)
3248
+        {
3249
+            New();
3250
+        } else if (source == saveItem)
31763251         {
31773252             save();
31783253             //return true;
3179
-        } else if (event.getSource() == saveAsItem)
3254
+        } else if (source == saveAsItem)
31803255         {
31813256             saveAs();
31823257             //return true;
3183
-        } else if (event.getSource() == reexportItem)
3258
+        } else if (source == reexportItem)
31843259         {
31853260             reexport();
31863261             //return true;
3187
-        } else if (event.getSource() == exportAsItem)
3262
+        } else if (source == exportAsItem)
31883263         {
31893264             export();
31903265             //return true;
3191
-        } else if (event.getSource() == povItem)
3266
+        } else if (source == povItem)
31923267         {
31933268             generatePOV();
31943269             //return true;
3195
-        } else if (event.getSource() == zBufferItem)
3270
+        } else if (source == zBufferItem)
31963271         {
31973272             try
31983273             {
....@@ -3214,21 +3289,8 @@
32143289         cameraView.repaint();
32153290         //return true;
32163291         }
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)
3292
+         */ else // combos...
3293
+        if (source == texresMenu)
32323294         {
32333295             System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
32343296             copy.texres = texresMenu.getSelectedIndex();
....@@ -3240,6 +3302,262 @@
32403302         }
32413303     }
32423304 
3305
+    void New()
3306
+    {
3307
+        while (copy.Size() > 1)
3308
+        {
3309
+            copy.remove(1);
3310
+        }
3311
+        
3312
+        ResetModel();
3313
+        objEditor.refreshContents();
3314
+    }
3315
+    
3316
+    static public byte[] Compress(Object3D o)
3317
+    {
3318
+        try
3319
+        {
3320
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
3321
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3322
+            ObjectOutputStream out = new ObjectOutputStream(zstream);
3323
+
3324
+        Object3D parent = o.parent;
3325
+        o.parent = null;
3326
+        
3327
+            out.writeObject(o);
3328
+            
3329
+        o.parent = parent;
3330
+        
3331
+            out.flush();
3332
+
3333
+            zstream.close();
3334
+            out.close();
3335
+            
3336
+            return baos.toByteArray();
3337
+        } catch (Exception e)
3338
+        {
3339
+            System.err.println(e);
3340
+            return null;
3341
+        }
3342
+    }
3343
+
3344
+    static public Object Uncompress(byte[] bytes)
3345
+    {
3346
+        System.out.println("#bytes = " + bytes.length);
3347
+        try
3348
+        {
3349
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3350
+            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3351
+            ObjectInputStream in = new ObjectInputStream(istream);
3352
+            Object obj = in.readObject();
3353
+            in.close();
3354
+            
3355
+            return obj;
3356
+        } catch (Exception e)
3357
+        {
3358
+            System.err.println(e);
3359
+            return null;
3360
+        }
3361
+    }
3362
+
3363
+    static public Object clone(Object o)
3364
+    {
3365
+        try
3366
+        {
3367
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
3368
+            ObjectOutputStream out = new ObjectOutputStream(baos);
3369
+
3370
+            out.writeObject(o);
3371
+            
3372
+            out.flush();
3373
+            out.close();
3374
+            
3375
+            byte[] bytes = baos.toByteArray();
3376
+            
3377
+            System.out.println("clone = " + bytes.length);
3378
+
3379
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3380
+            ObjectInputStream in = new ObjectInputStream(bais);
3381
+            Object obj = in.readObject();
3382
+            in.close();
3383
+            
3384
+            return obj;
3385
+        } catch (Exception e)
3386
+        {
3387
+            System.err.println(e);
3388
+            return null;
3389
+        }
3390
+    }
3391
+
3392
+    cRadio GetCurrentTab()
3393
+    {
3394
+        cRadio ab;
3395
+        for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3396
+        {
3397
+            ab = (cRadio)e.nextElement();
3398
+            if(ab.GetObject() == copy)
3399
+            {
3400
+                return ab;
3401
+            }
3402
+        }
3403
+        
3404
+        return null;
3405
+    }
3406
+    
3407
+    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3408
+    
3409
+    public void Save()
3410
+    {
3411
+        cRadio tab = GetCurrentTab();
3412
+        
3413
+        boolean temp = CameraPane.SWITCH;
3414
+        CameraPane.SWITCH = false;
3415
+        
3416
+        copy.ExtractBigData(hashtable);
3417
+        
3418
+        //EditorFrame.m_MainFrame.requestFocusInWindow();
3419
+        tab.graphs[tab.undoindex++] = Compress(copy);
3420
+
3421
+        copy.RestoreBigData(hashtable);
3422
+
3423
+        CameraPane.SWITCH = temp;
3424
+        
3425
+        //assert(hashtable.isEmpty());
3426
+        
3427
+        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3428
+        {
3429
+            tab.graphs[i] = null;
3430
+        }
3431
+
3432
+        // test save
3433
+        if (false)
3434
+        {
3435
+            try
3436
+            {
3437
+                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3438
+                ObjectOutputStream p = new ObjectOutputStream(ostream);
3439
+
3440
+                p.writeObject(copy);
3441
+                
3442
+                p.flush();
3443
+
3444
+                ostream.close();
3445
+            } catch (Exception e)
3446
+            {
3447
+                e.printStackTrace();
3448
+            }
3449
+        }
3450
+    }
3451
+
3452
+    void CopyChanged(Object3D obj)
3453
+    {
3454
+        boolean temp = CameraPane.SWITCH;
3455
+        CameraPane.SWITCH = false;
3456
+        
3457
+        copy.ExtractBigData(hashtable);
3458
+        
3459
+        copy.clear();
3460
+        
3461
+        for (int i=0; i<obj.Size(); i++)
3462
+        {
3463
+            copy.add(obj.get(i));
3464
+        }
3465
+        
3466
+        copy.RestoreBigData(hashtable);
3467
+        
3468
+        CameraPane.SWITCH = temp;
3469
+        
3470
+        //assert(hashtable.isEmpty());
3471
+        
3472
+        copy.Touch();
3473
+        
3474
+        ResetModel();
3475
+        copy.HardTouch(); // recompile?
3476
+        
3477
+        cRadio ab;
3478
+        for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3479
+        {
3480
+            ab = (cRadio)e.nextElement();
3481
+            Object3D test = copy.GetObject(ab.object.GetUUID());
3482
+            //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3483
+            if (test != null)
3484
+            {
3485
+                test.editWindow = ab.object.editWindow;
3486
+                ab.object = test;
3487
+            }
3488
+        }
3489
+        
3490
+        refreshContents();
3491
+    }
3492
+    
3493
+    public void Undo()
3494
+    {
3495
+        cRadio tab = GetCurrentTab();
3496
+        
3497
+        if (tab.undoindex == 0)
3498
+        {
3499
+            java.awt.Toolkit.getDefaultToolkit().beep();
3500
+            return;
3501
+        }
3502
+
3503
+        if (tab.graphs[tab.undoindex] == null)
3504
+        {
3505
+            Save();
3506
+            tab.undoindex -= 1;
3507
+        }
3508
+
3509
+        tab.undoindex -= 1;
3510
+
3511
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3512
+    }
3513
+
3514
+    public void Redo()
3515
+    {
3516
+        cRadio tab = GetCurrentTab();
3517
+        
3518
+        if (tab.graphs[tab.undoindex + 1] == null)
3519
+        {
3520
+            java.awt.Toolkit.getDefaultToolkit().beep();
3521
+            return;
3522
+        }
3523
+
3524
+        tab.undoindex += 1;
3525
+
3526
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3527
+    }
3528
+
3529
+        void ImportGFD()
3530
+        {
3531
+            FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3532
+            browser.show();
3533
+            String filename = browser.getFile();
3534
+            if (filename != null && filename.length() > 0)
3535
+            {
3536
+                String fullname = browser.getDirectory() + filename;
3537
+
3538
+                //Object3D readobj =
3539
+                        objEditor.ReadGFD(fullname, objEditor);
3540
+                //makeSomething(readobj);
3541
+            }
3542
+        }
3543
+        
3544
+	void ImportVRMLX3D()
3545
+	{
3546
+		if (Grafreed.standAlone)
3547
+		{
3548
+                    /**/
3549
+			FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
3550
+			browser.show();
3551
+			String filename = browser.getFile();
3552
+			if (filename != null && filename.length() > 0)
3553
+			{
3554
+				String fullname = browser.getDirectory() + filename;
3555
+                                LoadVRMLX3D(fullname);
3556
+			}
3557
+                     /**/
3558
+		}
3559
+	}
3560
+				
32433561     void ToggleAnimation()
32443562     {
32453563         if (!Globals.ANIMATION)
....@@ -3255,8 +3573,8 @@
32553573 
32563574                 Globals.ANIMATION ^= true;
32573575 
3258
-                GrafreeD.wav.cursor = 0;
3259
-                GrafreeD.wav.loop = 0;
3576
+                Grafreed.wav.cursor = 0;
3577
+                Grafreed.wav.loop = 0;
32603578             }
32613579         } else
32623580         {
....@@ -3588,7 +3906,7 @@
35883906         }
35893907         
35903908         if (normalpushField != null)
3591
-                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3909
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35923910     }
35933911 
35943912         void SnapObject()
....@@ -3852,6 +4170,7 @@
38524170 
38534171     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
38544172     {
4173
+        Save();
38554174         //Tween.set(thing, 0).target(1).start(tweenManager);
38564175         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
38574176 //            if (thing instanceof GenericJointDemo)
....@@ -4055,6 +4374,7 @@
40554374             }
40564375         }
40574376     }
4377
+    
40584378     LoadGFDThread loadGFDThread;
40594379 
40604380     void ReadGFD(String fullname, iCallBack cb)
....@@ -4074,8 +4394,10 @@
40744394 
40754395         try
40764396         {
4397
+            // Try compressed version first.
40774398             java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4078
-            java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4399
+            java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4400
+            java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
40794401 
40804402             readobj = (Object3D) p.readObject();
40814403             istream.close();
....@@ -4083,7 +4405,20 @@
40834405             readobj.ResetDisplayList();
40844406         } catch (Exception e)
40854407         {
4086
-            e.printStackTrace();
4408
+            //e.printStackTrace();
4409
+            try
4410
+            {
4411
+                java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4412
+                java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4413
+
4414
+                readobj = (Object3D) p.readObject();
4415
+                istream.close();
4416
+
4417
+                readobj.ResetDisplayList();
4418
+            } catch (Exception e2)
4419
+            {
4420
+                e2.printStackTrace();
4421
+            }
40874422         }
40884423 //            catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
40894424 //            catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4129,6 +4464,12 @@
41294464 
41304465     void LoadIt(Object obj)
41314466     {
4467
+        if (obj == null)
4468
+        {
4469
+            // Invalid file
4470
+            return;
4471
+        }
4472
+        
41324473         System.out.println("Loaded " + obj);
41334474         //new Exception().printStackTrace();
41344475         Object3D readobj = (Object3D) obj;
....@@ -4138,6 +4479,7 @@
41384479         
41394480         if (readobj != null)
41404481         {
4482
+            Save();
41414483             try
41424484             {
41434485                 //readobj.deepCopySelf(copy);
....@@ -4200,7 +4542,7 @@
42004542 
42014543     void load() // throws ClassNotFoundException
42024544     {
4203
-        if (GrafreeD.standAlone)
4545
+        if (Grafreed.standAlone)
42044546         {
42054547             FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
42064548             browser.show();
....@@ -4287,11 +4629,13 @@
42874629         try
42884630         {
42894631             FileOutputStream ostream = new FileOutputStream(lastname);
4290
-            ObjectOutputStream p = new ObjectOutputStream(ostream);
4632
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4633
+            ObjectOutputStream p = new ObjectOutputStream(zstream);
42914634 
42924635             p.writeObject(copy);
42934636             p.flush();
42944637 
4638
+            zstream.close();
42954639             ostream.close();
42964640 
42974641             //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4301,11 +4645,12 @@
43014645         {
43024646         }
43034647     }
4648
+    
43044649     String lastname;
43054650 
43064651     void saveAs()
43074652     {
4308
-        if (GrafreeD.standAlone)
4653
+        if (Grafreed.standAlone)
43094654         {
43104655             FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
43114656             browser.setVisible(true);
....@@ -4410,13 +4755,13 @@
44104755         try
44114756         {
44124757             FileOutputStream ostream = new FileOutputStream(filename);
4413
-            // ??        java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4414
-            ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
4758
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4759
+            ObjectOutputStream p = new ObjectOutputStream(zstream);
44154760 
44164761             Object3D objectparent = obj.parent;
44174762             obj.parent = null;
44184763 
4419
-            Object3D object = (Object3D) GrafreeD.clone(obj);
4764
+            Object3D object = (Object3D) Grafreed.clone(obj);
44204765 
44214766             obj.parent = objectparent;
44224767 
....@@ -4428,8 +4773,8 @@
44284773             p.writeObject(object);
44294774             p.flush();
44304775 
4776
+            zstream.close();
44314777             ostream.close();
4432
-            //       zstream.close();
44334778 
44344779 //                                    group.selection.get(0).parent = parent;
44354780             //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4450,7 +4795,7 @@
44504795         buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
44514796         cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
44524797         copy.generatePOV(buffer);
4453
-        if (GrafreeD.standAlone)
4798
+        if (Grafreed.standAlone)
44544799         {
44554800             FileDialog browser = new FileDialog(frame, "Export POV", 1);
44564801             browser.show();
....@@ -4476,7 +4821,8 @@
44764821     Object3D client;
44774822     Object3D copy;
44784823     MenuBar menuBar;
4479
-    Menu windowMenu;
4824
+    Menu fileMenu;
4825
+    MenuItem newItem;
44804826     MenuItem loadItem;
44814827     MenuItem saveItem;
44824828     MenuItem saveAsItem;
....@@ -4484,11 +4830,9 @@
44844830     MenuItem reexportItem;
44854831     MenuItem povItem;
44864832     MenuItem closeItem;
4487
-    Menu cameraMenu;
4833
+    
44884834     CheckboxMenuItem zBufferItem;
44894835     //MenuItem normalLensItem;
4490
-    MenuItem editCameraItem;
4491
-    MenuItem revertCameraItem;
44924836     MenuItem stepItem;
44934837     CheckboxMenuItem toggleLiveItem;
44944838     CheckboxMenuItem toggleFullScreenItem;
....@@ -4636,4 +4980,9 @@
46364980     //ObjectUI parent;
46374981     
46384982     cNumberSlider normalpushField;
4983
+    
4984
+	private MenuItem importGFDItem;
4985
+	private MenuItem importVRMLX3DItem;
4986
+	private MenuItem import3DSItem;
4987
+	private MenuItem importOBJItem;
46394988 }