Normand Briere
2019-06-24 914255f70cf047897212839cbf3a6722703f4457
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,54 @@
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
+ cCheckBox GetCheckBox(String name, boolean border)
56
+ {
57
+ try
58
+ {
59
+ ImageIcon icon = GetIcon(name);
60
+ return new cCheckBox(icon, border);
61
+ }
62
+ catch (Exception e)
63
+ {
64
+ return new cCheckBox(name, border);
65
+ }
66
+ }
67
+
68
+ private ImageIcon GetIcon(String name) throws IOException
69
+ {
70
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
71
+
72
+ if (image.getWidth() != 24 && image.getHeight() != 24)
73
+ {
74
+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
75
+ Graphics2D g = resized.createGraphics();
76
+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
77
+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
78
+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
79
+ g.dispose();
80
+
81
+ image = resized;
82
+ }
83
+
84
+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
85
+ return icon;
86
+ }
3887
3988 // SCRIPT
4089
....@@ -168,7 +217,8 @@
168217 // objEditor.ctrlPanel.remove(remarkButton);
169218
170219 objEditor.ctrlPanel.remove(setupPanel);
171
- objEditor.ctrlPanel.remove(commandsPanel);
220
+ objEditor.ctrlPanel.remove(setupPanel2);
221
+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172222 objEditor.ctrlPanel.remove(pushPanel);
173223 //objEditor.ctrlPanel.remove(fillPanel);
174224
....@@ -243,6 +293,7 @@
243293 //localCopy.parent = null;
244294
245295 frame = new JFrame();
296
+ frame.setUndecorated(true);
246297 objEditor = this;
247298 this.callee = callee;
248299
....@@ -276,24 +327,40 @@
276327 void SetupMenu()
277328 {
278329 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..."));
330
+ menuBar.add(fileMenu = new Menu("File"));
331
+ fileMenu.add(newItem = new MenuItem("New"));
332
+ fileMenu.add(loadItem = new MenuItem("Open..."));
333
+
334
+ //oe.menuBar.add(menu = new Menu("Include"));
335
+ Menu menu = new Menu("Import");
336
+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
337
+ importOBJItem.addActionListener(this);
338
+ import3DSItem = menu.add(new MenuItem("3DS file..."));
339
+ import3DSItem.addActionListener(this);
340
+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
341
+ importVRMLX3DItem.addActionListener(this);
342
+ menu.add("-");
343
+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
344
+ importGFDItem.addActionListener(this);
345
+ fileMenu.add(menu);
346
+ fileMenu.add("-");
347
+
348
+ fileMenu.add(saveItem = new MenuItem("Save"));
349
+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284350 //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("-");
351
+ fileMenu.add("-");
352
+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
353
+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
354
+ fileMenu.add("-");
289355 if (client.parent != null)
290356 {
291
- windowMenu.add(closeItem = new MenuItem("Close"));
357
+ fileMenu.add(closeItem = new MenuItem("Close"));
292358 } else
293359 {
294
- windowMenu.add(closeItem = new MenuItem("Exit"));
360
+ fileMenu.add(closeItem = new MenuItem("Exit"));
295361 }
296362
363
+ newItem.addActionListener(this);
297364 loadItem.addActionListener(this);
298365 saveItem.addActionListener(this);
299366 saveAsItem.addActionListener(this);
....@@ -302,86 +369,23 @@
302369 //povItem.addActionListener(this);
303370 closeItem.addActionListener(this);
304371
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
-
377372 objectPanel = new JTabbedPane();
378373 toolbarPanel = new JPanel();
379374 toolbarPanel.setName("Toolbar");
380375 treePanel = new cGridBag();
381376 treePanel.setName("Tree");
377
+
378
+ editPanel = new cGridBag().setVertical(true);
379
+ editPanel.setName("Edit");
380
+
382381 ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
383
- ctrlPanel.setName("Edit");
382
+
383
+ editCommandsPanel = new cGridBag();
384
+ editPanel.add(editCommandsPanel);
385
+ editPanel.add(ctrlPanel);
386
+
384387 materialPanel = new cGridBag().setVertical(true);
388
+
385389 materialPanel.setName("Material");
386390 /*JTextPane*/
387391 infoarea = createTextPane();
....@@ -475,10 +479,10 @@
475479 e.printStackTrace();
476480 }
477481
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();
482
+// String selection = infoarea.getText();
483
+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
484
+// java.awt.datatransfer.Clipboard clipboard =
485
+// Toolkit.getDefaultToolkit().getSystemClipboard();
482486 //clipboard.setContents(data, data);
483487 }
484488
....@@ -501,13 +505,13 @@
501505 //SendInfo("Name:", "bold");
502506 if (sel.GetTextures() != null || debug)
503507 {
504
- si.SendInfo(sel.toString(), "bold");
508
+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
505509 //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
506510 if (sel.Size() > 0)
507511 {
508512 si.SendInfo("#children = " + sel.Size(), "regular");
509513 }
510
- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
514
+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
511515 if (debug)
512516 {
513517 try
....@@ -549,7 +553,7 @@
549553 }
550554 if (sel.support != null)
551555 {
552
- si.SendInfo(" support: " + sel.support, "regular");
556
+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
553557 }
554558 if (sel.scriptnode != null)
555559 {
....@@ -638,19 +642,89 @@
638642 }
639643 }
640644
645
+static GraphicsDevice device = GraphicsEnvironment
646
+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
647
+
648
+ Rectangle keeprect;
649
+ cRadio radio;
650
+
651
+cButton keepButton;
652
+ cButton twoButton; // Full 3D
653
+ cButton sixButton;
654
+ cButton threeButton;
655
+ cButton sevenButton;
656
+ cButton fourButton; // full panel
657
+ cButton oneButton; // full XYZ
658
+ //cButton currentLayout;
659
+
660
+ boolean maximized;
661
+
662
+ void Minimize()
663
+ {
664
+ frame.setState(Frame.ICONIFIED);
665
+ }
666
+
667
+ void Maximize()
668
+ {
669
+ if (maximized)
670
+ {
671
+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
672
+ }
673
+ else
674
+ {
675
+ keeprect = frame.getBounds();
676
+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
677
+ Dimension rect2 = frame.getToolkit().getScreenSize();
678
+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
679
+// frame.setState(Frame.MAXIMIZED_BOTH);
680
+ }
681
+
682
+ maximized ^= true;
683
+ }
684
+
641685 void ToggleFullScreen()
642686 {
643687 if (CameraPane.FULLSCREEN)
644688 {
645
- frame.getContentPane().remove(/*"Center",*/bigThree);
646
- framePanel.add(bigThree);
647
- frame.getContentPane().add(/*"Center",*/framePanel);
689
+ device.setFullScreenWindow(null);
690
+ //frame.setVisible(false);
691
+// frame.removeNotify();
692
+// frame.setUndecorated(false);
693
+// frame.addNotify();
694
+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
695
+
696
+// X frame.getContentPane().remove(/*"Center",*/bigThree);
697
+// X framePanel.add(bigThree);
698
+// X frame.getContentPane().add(/*"Center",*/framePanel);
699
+ framePanel.setDividerLocation(1);
700
+
701
+ //frame.setVisible(true);
702
+ radio.layout = keepButton;
703
+ //theFrame = null;
704
+ keepButton = null;
705
+ radio.layout.doClick();
706
+
648707 } else
649708 {
650
- frame.getContentPane().remove(/*"Center",*/framePanel);
651
- framePanel.remove(bigThree);
652
- frame.getContentPane().add(/*"Center",*/bigThree);
709
+ keepButton = radio.layout;
710
+ //keeprect = frame.getBounds();
711
+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
712
+// frame.getToolkit().getScreenSize().height);
713
+ //frame.setVisible(false);
714
+ device.setFullScreenWindow(frame);
715
+// frame.removeNotify();
716
+// frame.setUndecorated(true);
717
+// frame.addNotify();
718
+// X frame.getContentPane().remove(/*"Center",*/framePanel);
719
+// X framePanel.remove(bigThree);
720
+// X frame.getContentPane().add(/*"Center",*/bigThree);
721
+ framePanel.setDividerLocation(0);
722
+
723
+ radio.layout = twoButton;
724
+ radio.layout.doClick();
725
+ //frame.setVisible(true);
653726 }
727
+
654728 cameraView.ToggleFullScreen();
655729 }
656730
....@@ -752,7 +826,7 @@
752826 protected static ImageIcon createImageIcon(String path,
753827 String description)
754828 {
755
- java.net.URL imgURL = GrafreeD.class.getResource(path);
829
+ java.net.URL imgURL = Grafreed.class.getResource(path);
756830 if (imgURL != null)
757831 {
758832 return new ImageIcon(imgURL, description);
....@@ -784,6 +858,7 @@
784858 // NumberSlider vDivsField;
785859 // JCheckBox endcaps;
786860 JCheckBox liveCB;
861
+ JCheckBox selectCB;
787862 JCheckBox hideCB;
788863 JCheckBox link2masterCB;
789864 JCheckBox markCB;
....@@ -800,9 +875,13 @@
800875 JButton fasterButton;
801876 JButton remarkButton;
802877
878
+ cGridBag editPanel;
879
+ cGridBag editCommandsPanel;
880
+
803881 cGridBag namePanel;
804882 cGridBag setupPanel;
805
- cGridBag commandsPanel;
883
+ cGridBag setupPanel2;
884
+ cGridBag objectCommandsPanel;
806885 cGridBag pushPanel;
807886 cGridBag fillPanel;
808887
....@@ -986,49 +1065,55 @@
9861065
9871066 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
9881067 liveCB.setToolTipText("Animate object");
1068
+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1069
+ selectCB.setToolTipText("Make object selectable");
1070
+// Return();
9891071 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
9901072 hideCB.setToolTipText("Hide object");
991
-// Return();
9921073 markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
9931074 markCB.setToolTipText("Set the animation target transform");
9941075
995
- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
1076
+ setupPanel2 = new cGridBag().setVertical(false);
1077
+
1078
+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
9961079 rewindCB.setToolTipText("Rewind animation");
9971080
998
- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
999
- randomCB.setToolTipText("Option for switch node");
1081
+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1082
+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
10001083
10011084 if (Globals.ADVANCED)
10021085 {
1003
- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1086
+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
10041087 link2masterCB.setToolTipText("Attach to support");
1005
- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
1088
+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
10061089 speedupCB.setToolTipText("Option motion capture");
10071090 }
10081091
10091092 oe.ctrlPanel.add(setupPanel);
10101093 oe.ctrlPanel.Return();
1094
+ oe.ctrlPanel.add(setupPanel2);
1095
+ oe.ctrlPanel.Return();
10111096
1012
- commandsPanel = new cGridBag().setVertical(false);
1097
+ objectCommandsPanel = new cGridBag().setVertical(false);
10131098
1014
- resetButton = AddButton(commandsPanel, "Reset");
1099
+ resetButton = AddButton(objectCommandsPanel, "Reset");
10151100 resetButton.setToolTipText("Jump to frame zero");
1016
- stepButton = AddButton(commandsPanel, "Step");
1101
+ stepButton = AddButton(objectCommandsPanel, "Step");
10171102 stepButton.setToolTipText("Step one frame");
10181103 // resetAllButton = AddButton(oe, "Reset All");
10191104 // stepAllButton = AddButton(oe, "Step All");
10201105 // Return();
1021
- slowerButton = AddButton(commandsPanel, "Slow");
1106
+ slowerButton = AddButton(objectCommandsPanel, "Slow");
10221107 slowerButton.setToolTipText("Decrease animation speed");
1023
- fasterButton = AddButton(commandsPanel, "Fast");
1108
+ fasterButton = AddButton(objectCommandsPanel, "Fast");
10241109 fasterButton.setToolTipText("Increase animation speed");
1025
- remarkButton = AddButton(commandsPanel, "Remark");
1110
+ remarkButton = AddButton(objectCommandsPanel, "Remark");
10261111 remarkButton.setToolTipText("Set the current transform as the target");
10271112
1028
- oe.ctrlPanel.add(commandsPanel);
1113
+ oe.ctrlPanel.add(objectCommandsPanel);
10291114 oe.ctrlPanel.Return();
10301115
1031
- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
1116
+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
10321117 normalpushField = (cNumberSlider)pushPanel.getComponent(1);
10331118 //Return();
10341119
....@@ -1231,8 +1316,11 @@
12311316 //worldPanel.setName("World");
12321317 centralPanel = new cGridBag();
12331318 centralPanel.preferredWidth = 20;
1234
- timelinePanel = new JPanel(new BorderLayout());
1235
- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1319
+
1320
+ if (Globals.ADVANCED)
1321
+ {
1322
+ timelinePanel = new JPanel(new BorderLayout());
1323
+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
12361324
12371325 cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
12381326 cameraPanel.setContinuousLayout(true);
....@@ -1241,7 +1329,10 @@
12411329 // cameraPanel.setDividerSize(9);
12421330 cameraPanel.setResizeWeight(1.0);
12431331
1332
+ }
1333
+
12441334 centralPanel.add(cameraView);
1335
+ centralPanel.setFocusable(true);
12451336 //frame.setJMenuBar(timelineMenubar);
12461337 //centralPanel.add(timelinePanel);
12471338
....@@ -1308,7 +1399,7 @@
13081399 // north.setName("Edit");
13091400 // north.add(ctrlPanel, BorderLayout.NORTH);
13101401 // objectPanel.add(north);
1311
- objectPanel.add(ctrlPanel);
1402
+ objectPanel.add(editPanel);
13121403 objectPanel.add(infoPanel);
13131404
13141405 /*
....@@ -1439,6 +1530,8 @@
14391530 frame.setSize(1280, 860);
14401531 frame.setVisible(true);
14411532
1533
+ cameraView.requestFocusInWindow();
1534
+
14421535 gridPanel.setDividerLocation(1.0);
14431536
14441537 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
....@@ -1476,19 +1569,19 @@
14761569
14771570 cGridBag editBar = new cGridBag().setVertical(false);
14781571
1479
- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1572
+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
14801573 createMaterialButton.setToolTipText("Create material");
14811574
14821575 /*
14831576 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
14841577 */
14851578
1486
- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1579
+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
14871580 clearMaterialButton.setToolTipText("Clear material");
14881581
14891582 if (Globals.ADVANCED)
14901583 {
1491
- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1584
+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
14921585 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
14931586 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
14941587 }
....@@ -1988,6 +2081,7 @@
19882081 e2.printStackTrace();
19892082 }
19902083 }
2084
+
19912085 LoadJMEThread loadThread;
19922086
19932087 class LoadJMEThread extends Thread
....@@ -2045,6 +2139,7 @@
20452139 //LoadFile0(filename, converter);
20462140 }
20472141 }
2142
+
20482143 LoadOBJThread loadObjThread;
20492144
20502145 class LoadOBJThread extends Thread
....@@ -2123,19 +2218,19 @@
21232218
21242219 void LoadObjFile(String fullname)
21252220 {
2126
- /*
2221
+ System.out.println("Loading " + fullname);
2222
+ /**/
21272223 //lastFilename = fullname;
21282224 if(loadObjThread == null)
21292225 {
2130
- loadObjThread = new LoadOBJThread();
2131
- loadObjThread.start();
2226
+ loadObjThread = new LoadOBJThread();
2227
+ loadObjThread.start();
21322228 }
21332229
21342230 loadObjThread.add(fullname);
2135
- */
2231
+ /**/
21362232
2137
- System.out.println("Loading " + fullname);
2138
- makeSomething(new FileObject(fullname, true), true);
2233
+ //makeSomething(new FileObject(fullname, true), true);
21392234 }
21402235
21412236 void LoadGFDFile(String fullname)
....@@ -2396,7 +2491,7 @@
23962491
23972492 void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
23982493 {
2399
- if (GrafreeD.standAlone)
2494
+ if (Grafreed.standAlone)
24002495 {
24012496 /**/
24022497 FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
....@@ -2978,7 +3073,7 @@
29783073 return;
29793074 } else if (event.getSource() == toggleSwitchItem)
29803075 {
2981
- cameraView.ToggleRandom();
3076
+ cameraView.ToggleSwitch();
29823077 cameraView.repaint();
29833078 return;
29843079 } else if (event.getSource() == toggleHandleItem)
....@@ -3006,6 +3101,10 @@
30063101 } else if (event.getSource() == liveCB)
30073102 {
30083103 copy.live ^= true;
3104
+ return;
3105
+ } else if (event.getSource() == selectCB)
3106
+ {
3107
+ copy.dontselect ^= true;
30093108 return;
30103109 } else if (event.getSource() == hideCB)
30113110 {
....@@ -3045,8 +3144,9 @@
30453144
30463145 public void actionPerformed(ActionEvent event)
30473146 {
3147
+ Object source = event.getSource();
30483148 // SCRIPT DIALOG
3049
- if (event.getSource() == okbutton)
3149
+ if (source == okbutton)
30503150 {
30513151 textpanel.setVisible(false);
30523152 textpanel.remove(textarea);
....@@ -3058,7 +3158,7 @@
30583158 textarea = null;
30593159 textpanel = null;
30603160 }
3061
- if (event.getSource() == cancelbutton)
3161
+ if (source == cancelbutton)
30623162 {
30633163 textpanel.setVisible(false);
30643164 textpanel.remove(textarea);
....@@ -3070,50 +3170,50 @@
30703170 //applySelf();
30713171 //client.refreshEditWindow();
30723172 //refreshContents();
3073
- if (event.getSource() == nameField)
3173
+ if (source == nameField)
30743174 {
30753175 //System.out.println("ObjEditor " + event);
30763176 applySelf0(true);
30773177 //parent.applySelf();
30783178 objEditor.refreshContents();
3079
- } else if (event.getSource() == resetButton)
3179
+ } else if (source == resetButton)
30803180 {
30813181 CameraPane.fullreset = true;
30823182 copy.Reset(); // ResetMeshes();
30833183 copy.Touch();
30843184 objEditor.refreshContents();
3085
- } else if (event.getSource() == stepItem)
3185
+ } else if (source == stepItem)
30863186 {
30873187 //cameraView.ONESTEP = true;
30883188 Globals.ONESTEP = true;
30893189 cameraView.repaint();
30903190 return;
3091
- } else if (event.getSource() == stepButton)
3191
+ } else if (source == stepButton)
30923192 {
30933193 copy.Step();
30943194 copy.Touch();
30953195 objEditor.refreshContents();
3096
- } else if (event.getSource() == slowerButton)
3196
+ } else if (source == slowerButton)
30973197 {
30983198 copy.Slower();
30993199 copy.Touch();
31003200 objEditor.refreshContents();
3101
- } else if (event.getSource() == fasterButton)
3201
+ } else if (source == fasterButton)
31023202 {
31033203 copy.Faster();
31043204 copy.Touch();
31053205 objEditor.refreshContents();
3106
- } else if (event.getSource() == remarkButton)
3206
+ } else if (source == remarkButton)
31073207 {
31083208 copy.Remark();
31093209 copy.Touch();
31103210 objEditor.refreshContents();
3111
- } else if (event.getSource() == stepAllButton)
3211
+ } else if (source == stepAllButton)
31123212 {
31133213 copy.StepAll();
31143214 copy.Touch();
31153215 objEditor.refreshContents();
3116
- } else if (event.getSource() == resetAllButton)
3216
+ } else if (source == resetAllButton)
31173217 {
31183218 //CameraPane.fullreset = true;
31193219 copy.ResetAll(); // ResetMeshes();
....@@ -3146,53 +3246,75 @@
31463246 // Close();
31473247 // }
31483248 // else
3149
- if (event.getSource() == resetSlidersButton)
3249
+ if (source == resetSlidersButton)
31503250 {
31513251 ResetSliders();
3152
- } else if (event.getSource() == clearMaterialButton)
3252
+ } else if (source == clearMaterialButton)
31533253 {
31543254 ClearMaterial();
3155
- } else if (event.getSource() == createMaterialButton)
3255
+ } else if (source == createMaterialButton)
31563256 {
31573257 CreateMaterial();
3158
- } else if (event.getSource() == clearPanelButton)
3258
+ } else if (source == clearPanelButton)
31593259 {
31603260 copy.ClearUI();
31613261 refreshContents(true);
3162
- } /*
3163
- }
3164
-
3165
- public boolean action(Event event, Object arg)
3166
- {
3167
- */ else if (event.getSource() == closeItem)
3262
+ } else if (source == importGFDItem)
3263
+ {
3264
+ ImportGFD();
3265
+ } else
3266
+ if (source == importVRMLX3DItem)
3267
+ {
3268
+ ImportVRMLX3D();
3269
+ } else
3270
+ if (source == import3DSItem)
3271
+ {
3272
+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
3273
+ } else
3274
+ if (source == importOBJItem)
3275
+ {
3276
+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
3277
+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
3278
+ browser.setVisible(true);
3279
+ String filename = browser.getFile();
3280
+ if (filename != null && filename.length() > 0)
3281
+ {
3282
+ String fullname = browser.getDirectory() + filename;
3283
+ makeSomething(ReadOBJ(fullname), true);
3284
+ }
3285
+ } else
3286
+ if (source == closeItem)
31683287 {
31693288 Close();
31703289 //return true;
3171
- } else if (event.getSource() == loadItem)
3290
+ } else if (source == loadItem)
31723291 {
31733292 load();
31743293 //return true;
3175
- } else if (event.getSource() == saveItem)
3294
+ } else if (source == newItem)
3295
+ {
3296
+ New();
3297
+ } else if (source == saveItem)
31763298 {
31773299 save();
31783300 //return true;
3179
- } else if (event.getSource() == saveAsItem)
3301
+ } else if (source == saveAsItem)
31803302 {
31813303 saveAs();
31823304 //return true;
3183
- } else if (event.getSource() == reexportItem)
3305
+ } else if (source == reexportItem)
31843306 {
31853307 reexport();
31863308 //return true;
3187
- } else if (event.getSource() == exportAsItem)
3309
+ } else if (source == exportAsItem)
31883310 {
31893311 export();
31903312 //return true;
3191
- } else if (event.getSource() == povItem)
3313
+ } else if (source == povItem)
31923314 {
31933315 generatePOV();
31943316 //return true;
3195
- } else if (event.getSource() == zBufferItem)
3317
+ } else if (source == zBufferItem)
31963318 {
31973319 try
31983320 {
....@@ -3214,21 +3336,8 @@
32143336 cameraView.repaint();
32153337 //return true;
32163338 }
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)
3339
+ */ else // combos...
3340
+ if (source == texresMenu)
32323341 {
32333342 System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
32343343 copy.texres = texresMenu.getSelectedIndex();
....@@ -3240,6 +3349,266 @@
32403349 }
32413350 }
32423351
3352
+ void New()
3353
+ {
3354
+ while (copy.Size() > 1)
3355
+ {
3356
+ copy.remove(1);
3357
+ }
3358
+
3359
+ ResetModel();
3360
+ objEditor.refreshContents();
3361
+ }
3362
+
3363
+ static public byte[] Compress(Object3D o)
3364
+ {
3365
+ try
3366
+ {
3367
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
3368
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3369
+ ObjectOutputStream out = new ObjectOutputStream(zstream);
3370
+
3371
+ Object3D parent = o.parent;
3372
+ o.parent = null;
3373
+
3374
+ out.writeObject(o);
3375
+
3376
+ o.parent = parent;
3377
+
3378
+ out.flush();
3379
+
3380
+ zstream.close();
3381
+ out.close();
3382
+
3383
+ return baos.toByteArray();
3384
+ } catch (Exception e)
3385
+ {
3386
+ System.err.println(e);
3387
+ return null;
3388
+ }
3389
+ }
3390
+
3391
+ static public Object Uncompress(byte[] bytes)
3392
+ {
3393
+ System.out.println("#bytes = " + bytes.length);
3394
+ try
3395
+ {
3396
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3397
+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3398
+ ObjectInputStream in = new ObjectInputStream(istream);
3399
+ Object obj = in.readObject();
3400
+ in.close();
3401
+
3402
+ return obj;
3403
+ } catch (Exception e)
3404
+ {
3405
+ System.err.println(e);
3406
+ return null;
3407
+ }
3408
+ }
3409
+
3410
+ static public Object clone(Object o)
3411
+ {
3412
+ try
3413
+ {
3414
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
3415
+ ObjectOutputStream out = new ObjectOutputStream(baos);
3416
+
3417
+ out.writeObject(o);
3418
+
3419
+ out.flush();
3420
+ out.close();
3421
+
3422
+ byte[] bytes = baos.toByteArray();
3423
+
3424
+ System.out.println("clone = " + bytes.length);
3425
+
3426
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3427
+ ObjectInputStream in = new ObjectInputStream(bais);
3428
+ Object obj = in.readObject();
3429
+ in.close();
3430
+
3431
+ return obj;
3432
+ } catch (Exception e)
3433
+ {
3434
+ System.err.println(e);
3435
+ return null;
3436
+ }
3437
+ }
3438
+
3439
+ cRadio GetCurrentTab()
3440
+ {
3441
+ cRadio ab;
3442
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3443
+ {
3444
+ ab = (cRadio)e.nextElement();
3445
+ if(ab.GetObject() == copy)
3446
+ {
3447
+ return ab;
3448
+ }
3449
+ }
3450
+
3451
+ return null;
3452
+ }
3453
+
3454
+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3455
+
3456
+ public void Save()
3457
+ {
3458
+ System.err.println("Save");
3459
+
3460
+ cRadio tab = GetCurrentTab();
3461
+
3462
+ boolean temp = CameraPane.SWITCH;
3463
+ CameraPane.SWITCH = false;
3464
+
3465
+ copy.ExtractBigData(hashtable);
3466
+
3467
+ //EditorFrame.m_MainFrame.requestFocusInWindow();
3468
+ tab.graphs[tab.undoindex++] = Compress(copy);
3469
+
3470
+ copy.RestoreBigData(hashtable);
3471
+
3472
+ CameraPane.SWITCH = temp;
3473
+
3474
+ //assert(hashtable.isEmpty());
3475
+
3476
+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
3477
+ {
3478
+ tab.graphs[i] = null;
3479
+ }
3480
+
3481
+ // test save
3482
+ if (false)
3483
+ {
3484
+ try
3485
+ {
3486
+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3487
+ ObjectOutputStream p = new ObjectOutputStream(ostream);
3488
+
3489
+ p.writeObject(copy);
3490
+
3491
+ p.flush();
3492
+
3493
+ ostream.close();
3494
+ } catch (Exception e)
3495
+ {
3496
+ e.printStackTrace();
3497
+ }
3498
+ }
3499
+ }
3500
+
3501
+ void CopyChanged(Object3D obj)
3502
+ {
3503
+ boolean temp = CameraPane.SWITCH;
3504
+ CameraPane.SWITCH = false;
3505
+
3506
+ copy.ExtractBigData(hashtable);
3507
+
3508
+ copy.clear();
3509
+
3510
+ for (int i=0; i<obj.Size(); i++)
3511
+ {
3512
+ copy.add(obj.get(i));
3513
+ }
3514
+
3515
+ copy.RestoreBigData(hashtable);
3516
+
3517
+ CameraPane.SWITCH = temp;
3518
+
3519
+ //assert(hashtable.isEmpty());
3520
+
3521
+ copy.Touch();
3522
+
3523
+ ResetModel();
3524
+ copy.HardTouch(); // recompile?
3525
+
3526
+ cRadio ab;
3527
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3528
+ {
3529
+ ab = (cRadio)e.nextElement();
3530
+ Object3D test = copy.GetObject(ab.object.GetUUID());
3531
+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3532
+ if (test != null)
3533
+ {
3534
+ test.editWindow = ab.object.editWindow;
3535
+ ab.object = test;
3536
+ }
3537
+ }
3538
+
3539
+ refreshContents();
3540
+ }
3541
+
3542
+ public void Undo()
3543
+ {
3544
+ System.err.println("Undo");
3545
+
3546
+ cRadio tab = GetCurrentTab();
3547
+
3548
+ if (tab.undoindex == 0)
3549
+ {
3550
+ java.awt.Toolkit.getDefaultToolkit().beep();
3551
+ return;
3552
+ }
3553
+
3554
+ if (tab.graphs[tab.undoindex] == null)
3555
+ {
3556
+ Save();
3557
+ tab.undoindex -= 1;
3558
+ }
3559
+
3560
+ tab.undoindex -= 1;
3561
+
3562
+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3563
+ }
3564
+
3565
+ public void Redo()
3566
+ {
3567
+ cRadio tab = GetCurrentTab();
3568
+
3569
+ if (tab.graphs[tab.undoindex + 1] == null)
3570
+ {
3571
+ java.awt.Toolkit.getDefaultToolkit().beep();
3572
+ return;
3573
+ }
3574
+
3575
+ tab.undoindex += 1;
3576
+
3577
+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3578
+ }
3579
+
3580
+ void ImportGFD()
3581
+ {
3582
+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3583
+ browser.show();
3584
+ String filename = browser.getFile();
3585
+ if (filename != null && filename.length() > 0)
3586
+ {
3587
+ String fullname = browser.getDirectory() + filename;
3588
+
3589
+ //Object3D readobj =
3590
+ objEditor.ReadGFD(fullname, objEditor);
3591
+ //makeSomething(readobj);
3592
+ }
3593
+ }
3594
+
3595
+ void ImportVRMLX3D()
3596
+ {
3597
+ if (Grafreed.standAlone)
3598
+ {
3599
+ /**/
3600
+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
3601
+ browser.show();
3602
+ String filename = browser.getFile();
3603
+ if (filename != null && filename.length() > 0)
3604
+ {
3605
+ String fullname = browser.getDirectory() + filename;
3606
+ LoadVRMLX3D(fullname);
3607
+ }
3608
+ /**/
3609
+ }
3610
+ }
3611
+
32433612 void ToggleAnimation()
32443613 {
32453614 if (!Globals.ANIMATION)
....@@ -3255,8 +3624,8 @@
32553624
32563625 Globals.ANIMATION ^= true;
32573626
3258
- GrafreeD.wav.cursor = 0;
3259
- GrafreeD.wav.loop = 0;
3627
+ Grafreed.wav.cursor = 0;
3628
+ Grafreed.wav.loop = 0;
32603629 }
32613630 } else
32623631 {
....@@ -3588,7 +3957,7 @@
35883957 }
35893958
35903959 if (normalpushField != null)
3591
- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3960
+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35923961 }
35933962
35943963 void SnapObject()
....@@ -3852,6 +4221,8 @@
38524221
38534222 void makeSomething(Object3D thing, boolean resetmodel) // deselect)
38544223 {
4224
+ if (Globals.SAVEONMAKE)
4225
+ Save();
38554226 //Tween.set(thing, 0).target(1).start(tweenManager);
38564227 //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
38574228 // if (thing instanceof GenericJointDemo)
....@@ -4055,6 +4426,7 @@
40554426 }
40564427 }
40574428 }
4429
+
40584430 LoadGFDThread loadGFDThread;
40594431
40604432 void ReadGFD(String fullname, iCallBack cb)
....@@ -4074,8 +4446,10 @@
40744446
40754447 try
40764448 {
4449
+ // Try compressed version first.
40774450 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4078
- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4451
+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4452
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
40794453
40804454 readobj = (Object3D) p.readObject();
40814455 istream.close();
....@@ -4083,7 +4457,20 @@
40834457 readobj.ResetDisplayList();
40844458 } catch (Exception e)
40854459 {
4086
- e.printStackTrace();
4460
+ //e.printStackTrace();
4461
+ try
4462
+ {
4463
+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4464
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4465
+
4466
+ readobj = (Object3D) p.readObject();
4467
+ istream.close();
4468
+
4469
+ readobj.ResetDisplayList();
4470
+ } catch (Exception e2)
4471
+ {
4472
+ e2.printStackTrace();
4473
+ }
40874474 }
40884475 // catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
40894476 // catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4129,6 +4516,12 @@
41294516
41304517 void LoadIt(Object obj)
41314518 {
4519
+ if (obj == null)
4520
+ {
4521
+ // Invalid file
4522
+ return;
4523
+ }
4524
+
41324525 System.out.println("Loaded " + obj);
41334526 //new Exception().printStackTrace();
41344527 Object3D readobj = (Object3D) obj;
....@@ -4138,6 +4531,8 @@
41384531
41394532 if (readobj != null)
41404533 {
4534
+ if (Globals.SAVEONMAKE)
4535
+ Save();
41414536 try
41424537 {
41434538 //readobj.deepCopySelf(copy);
....@@ -4200,7 +4595,7 @@
42004595
42014596 void load() // throws ClassNotFoundException
42024597 {
4203
- if (GrafreeD.standAlone)
4598
+ if (Grafreed.standAlone)
42044599 {
42054600 FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
42064601 browser.show();
....@@ -4287,11 +4682,13 @@
42874682 try
42884683 {
42894684 FileOutputStream ostream = new FileOutputStream(lastname);
4290
- ObjectOutputStream p = new ObjectOutputStream(ostream);
4685
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4686
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
42914687
42924688 p.writeObject(copy);
42934689 p.flush();
42944690
4691
+ zstream.close();
42954692 ostream.close();
42964693
42974694 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4301,11 +4698,12 @@
43014698 {
43024699 }
43034700 }
4701
+
43044702 String lastname;
43054703
43064704 void saveAs()
43074705 {
4308
- if (GrafreeD.standAlone)
4706
+ if (Grafreed.standAlone)
43094707 {
43104708 FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
43114709 browser.setVisible(true);
....@@ -4410,13 +4808,13 @@
44104808 try
44114809 {
44124810 FileOutputStream ostream = new FileOutputStream(filename);
4413
- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4414
- ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
4811
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4812
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
44154813
44164814 Object3D objectparent = obj.parent;
44174815 obj.parent = null;
44184816
4419
- Object3D object = (Object3D) GrafreeD.clone(obj);
4817
+ Object3D object = (Object3D) Grafreed.clone(obj);
44204818
44214819 obj.parent = objectparent;
44224820
....@@ -4428,8 +4826,8 @@
44284826 p.writeObject(object);
44294827 p.flush();
44304828
4829
+ zstream.close();
44314830 ostream.close();
4432
- // zstream.close();
44334831
44344832 // group.selection.get(0).parent = parent;
44354833 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4450,7 +4848,7 @@
44504848 buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
44514849 cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
44524850 copy.generatePOV(buffer);
4453
- if (GrafreeD.standAlone)
4851
+ if (Grafreed.standAlone)
44544852 {
44554853 FileDialog browser = new FileDialog(frame, "Export POV", 1);
44564854 browser.show();
....@@ -4476,7 +4874,8 @@
44764874 Object3D client;
44774875 Object3D copy;
44784876 MenuBar menuBar;
4479
- Menu windowMenu;
4877
+ Menu fileMenu;
4878
+ MenuItem newItem;
44804879 MenuItem loadItem;
44814880 MenuItem saveItem;
44824881 MenuItem saveAsItem;
....@@ -4484,11 +4883,9 @@
44844883 MenuItem reexportItem;
44854884 MenuItem povItem;
44864885 MenuItem closeItem;
4487
- Menu cameraMenu;
4886
+
44884887 CheckboxMenuItem zBufferItem;
44894888 //MenuItem normalLensItem;
4490
- MenuItem editCameraItem;
4491
- MenuItem revertCameraItem;
44924889 MenuItem stepItem;
44934890 CheckboxMenuItem toggleLiveItem;
44944891 CheckboxMenuItem toggleFullScreenItem;
....@@ -4636,4 +5033,9 @@
46365033 //ObjectUI parent;
46375034
46385035 cNumberSlider normalpushField;
5036
+
5037
+ private MenuItem importGFDItem;
5038
+ private MenuItem importVRMLX3DItem;
5039
+ private MenuItem import3DSItem;
5040
+ private MenuItem importOBJItem;
46395041 }