Normand Briere
2019-06-21 15123b19e7bc8da2869429b07f0fbaa0598e945e
ObjEditor.java
....@@ -168,6 +168,7 @@
168168 // objEditor.ctrlPanel.remove(remarkButton);
169169
170170 objEditor.ctrlPanel.remove(setupPanel);
171
+ objEditor.ctrlPanel.remove(setupPanel2);
171172 objEditor.ctrlPanel.remove(commandsPanel);
172173 objEditor.ctrlPanel.remove(pushPanel);
173174 //objEditor.ctrlPanel.remove(fillPanel);
....@@ -276,24 +277,40 @@
276277 void SetupMenu()
277278 {
278279 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..."));
280
+ menuBar.add(fileMenu = new Menu("File"));
281
+ fileMenu.add(newItem = new MenuItem("New"));
282
+ fileMenu.add(loadItem = new MenuItem("Open..."));
283
+
284
+ //oe.menuBar.add(menu = new Menu("Include"));
285
+ Menu menu = new Menu("Import");
286
+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
287
+ importOBJItem.addActionListener(this);
288
+ import3DSItem = menu.add(new MenuItem("3DS file..."));
289
+ import3DSItem.addActionListener(this);
290
+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
291
+ importVRMLX3DItem.addActionListener(this);
292
+ menu.add("-");
293
+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
294
+ importGFDItem.addActionListener(this);
295
+ fileMenu.add(menu);
296
+ fileMenu.add("-");
297
+
298
+ fileMenu.add(saveItem = new MenuItem("Save"));
299
+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284300 //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("-");
301
+ fileMenu.add("-");
302
+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
303
+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
304
+ fileMenu.add("-");
289305 if (client.parent != null)
290306 {
291
- windowMenu.add(closeItem = new MenuItem("Close"));
307
+ fileMenu.add(closeItem = new MenuItem("Close"));
292308 } else
293309 {
294
- windowMenu.add(closeItem = new MenuItem("Exit"));
310
+ fileMenu.add(closeItem = new MenuItem("Exit"));
295311 }
296312
313
+ newItem.addActionListener(this);
297314 loadItem.addActionListener(this);
298315 saveItem.addActionListener(this);
299316 saveAsItem.addActionListener(this);
....@@ -301,61 +318,6 @@
301318 reexportItem.addActionListener(this);
302319 //povItem.addActionListener(this);
303320 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
- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
313
- toggleTimelineItem.addItemListener(this);
314
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
315
- toggleFullScreenItem.addItemListener(this);
316
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
317
- cameraMenu.add("-");
318
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319
- toggleTextureItem.addItemListener(this);
320
- toggleTextureItem.setState(CameraPane.textureon);
321
- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
322
- toggleLiveItem.addItemListener(this);
323
- toggleLiveItem.setState(Globals.isLIVE());
324
- cameraMenu.add(stepItem = new MenuItem("Step"));
325
- stepItem.addActionListener(this);
326
-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
327
-// toggleDLItem.addItemListener(this);
328
-// toggleDLItem.setState(false);
329
- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
330
- toggleRenderItem.addItemListener(this);
331
- toggleRenderItem.setState(!CameraPane.frozen);
332
- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
333
- toggleDebugItem.addItemListener(this);
334
- toggleDebugItem.setState(CameraPane.DEBUG);
335
- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
336
- toggleFrustumItem.addItemListener(this);
337
- toggleFrustumItem.setState(CameraPane.FRUSTUM);
338
- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
339
- toggleFootContactItem.addItemListener(this);
340
- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
341
- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
342
- toggleRandomItem.addItemListener(this);
343
- toggleRandomItem.setState(CameraPane.RANDOM);
344
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
345
- toggleHandleItem.addItemListener(this);
346
- toggleHandleItem.setState(CameraPane.HANDLES);
347
- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
348
- togglePaintItem.addItemListener(this);
349
- togglePaintItem.setState(CameraPane.PAINTMODE);
350
-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
351
-// toggleRootItem.addItemListener(this);
352
-// toggleRootItem.setState(false);
353
-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
354
-// animationItem.addItemListener(this);
355
-// animationItem.setState(CameraPane.ANIMATION);
356
- cameraMenu.add("-");
357
- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
358
- editCameraItem.addActionListener(this);
359321
360322 objectPanel = new JTabbedPane();
361323 toolbarPanel = new JPanel();
....@@ -458,10 +420,10 @@
458420 e.printStackTrace();
459421 }
460422
461
- String selection = infoarea.getText();
462
- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
463
- java.awt.datatransfer.Clipboard clipboard =
464
- Toolkit.getDefaultToolkit().getSystemClipboard();
423
+// String selection = infoarea.getText();
424
+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
425
+// java.awt.datatransfer.Clipboard clipboard =
426
+// Toolkit.getDefaultToolkit().getSystemClipboard();
465427 //clipboard.setContents(data, data);
466428 }
467429
....@@ -484,13 +446,13 @@
484446 //SendInfo("Name:", "bold");
485447 if (sel.GetTextures() != null || debug)
486448 {
487
- si.SendInfo(sel.toString(), "bold");
449
+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
488450 //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
489451 if (sel.Size() > 0)
490452 {
491453 si.SendInfo("#children = " + sel.Size(), "regular");
492454 }
493
- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
455
+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
494456 if (debug)
495457 {
496458 try
....@@ -532,7 +494,7 @@
532494 }
533495 if (sel.support != null)
534496 {
535
- si.SendInfo(" support: " + sel.support, "regular");
497
+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
536498 }
537499 if (sel.scriptnode != null)
538500 {
....@@ -735,7 +697,7 @@
735697 protected static ImageIcon createImageIcon(String path,
736698 String description)
737699 {
738
- java.net.URL imgURL = GrafreeD.class.getResource(path);
700
+ java.net.URL imgURL = Grafreed.class.getResource(path);
739701 if (imgURL != null)
740702 {
741703 return new ImageIcon(imgURL, description);
....@@ -767,6 +729,7 @@
767729 // NumberSlider vDivsField;
768730 // JCheckBox endcaps;
769731 JCheckBox liveCB;
732
+ JCheckBox selectCB;
770733 JCheckBox hideCB;
771734 JCheckBox link2masterCB;
772735 JCheckBox markCB;
....@@ -785,6 +748,7 @@
785748
786749 cGridBag namePanel;
787750 cGridBag setupPanel;
751
+ cGridBag setupPanel2;
788752 cGridBag commandsPanel;
789753 cGridBag pushPanel;
790754 cGridBag fillPanel;
....@@ -969,27 +933,33 @@
969933
970934 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
971935 liveCB.setToolTipText("Animate object");
936
+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
937
+ selectCB.setToolTipText("Make object selectable");
938
+// Return();
972939 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
973940 hideCB.setToolTipText("Hide object");
974
-// Return();
975941 markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
976942 markCB.setToolTipText("Set the animation target transform");
977943
978
- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
944
+ setupPanel2 = new cGridBag().setVertical(false);
945
+
946
+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
979947 rewindCB.setToolTipText("Rewind animation");
980948
981
- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
982
- randomCB.setToolTipText("Option for switch node");
949
+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
950
+ randomCB.setToolTipText("Rewind or Go back and forth randomly");
983951
984952 if (Globals.ADVANCED)
985953 {
986
- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
954
+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
987955 link2masterCB.setToolTipText("Attach to support");
988
- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
956
+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
989957 speedupCB.setToolTipText("Option motion capture");
990958 }
991959
992960 oe.ctrlPanel.add(setupPanel);
961
+ oe.ctrlPanel.Return();
962
+ oe.ctrlPanel.add(setupPanel2);
993963 oe.ctrlPanel.Return();
994964
995965 commandsPanel = new cGridBag().setVertical(false);
....@@ -1011,7 +981,7 @@
1011981 oe.ctrlPanel.add(commandsPanel);
1012982 oe.ctrlPanel.Return();
1013983
1014
- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
984
+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1015985 normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1016986 //Return();
1017987
....@@ -1313,7 +1283,7 @@
13131283 scrollpane.addMouseWheelListener(this); // Default not fast enough
13141284
13151285 /*JTabbedPane*/ scenePanel = new cGridBag();
1316
- scenePanel.preferredWidth = 7;
1286
+ scenePanel.preferredWidth = 6;
13171287
13181288 JTabbedPane tabbedPane = new JTabbedPane();
13191289 tabbedPane.add(scrollpane);
....@@ -1419,8 +1389,8 @@
14191389
14201390 // aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14211391
1422
- frame.setSize(1024, 768);
1423
- frame.show();
1392
+ frame.setSize(1280, 860);
1393
+ frame.setVisible(true);
14241394
14251395 gridPanel.setDividerLocation(1.0);
14261396
....@@ -1459,19 +1429,22 @@
14591429
14601430 cGridBag editBar = new cGridBag().setVertical(false);
14611431
1462
- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1432
+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
14631433 createMaterialButton.setToolTipText("Create material");
14641434
14651435 /*
14661436 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
14671437 */
14681438
1469
- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1439
+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
14701440 clearMaterialButton.setToolTipText("Clear material");
14711441
1472
- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1473
- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1474
- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1442
+ if (Globals.ADVANCED)
1443
+ {
1444
+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1445
+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1446
+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1447
+ }
14751448
14761449 editBar.preferredHeight = 15;
14771450
....@@ -1740,12 +1713,15 @@
17401713 opacityPowerField.addChangeListener(this);
17411714 /**/
17421715
1743
- resetSlidersButton.addActionListener(this);
17441716 clearMaterialButton.addActionListener(this);
17451717 createMaterialButton.addActionListener(this);
1746
-
1747
- propagateToggle.addItemListener(this);
1748
- multiplyToggle.addItemListener(this);
1718
+
1719
+ if (Globals.ADVANCED)
1720
+ {
1721
+ resetSlidersButton.addActionListener(this);
1722
+ propagateToggle.addItemListener(this);
1723
+ multiplyToggle.addItemListener(this);
1724
+ }
17491725 }
17501726
17511727 void DropFile(java.io.File[] files, boolean textures)
....@@ -1916,7 +1892,7 @@
19161892
19171893 //? flashIt = false;
19181894 CameraPane pane = (CameraPane) cameraView;
1919
- pane.clickStart(location.x, location.y, 0);
1895
+ pane.clickStart(location.x, location.y, 0, 0);
19201896 pane.clickEnd(location.x, location.y, 0, true);
19211897
19221898 if (group.selection.size() == 1)
....@@ -1965,6 +1941,7 @@
19651941 e2.printStackTrace();
19661942 }
19671943 }
1944
+
19681945 LoadJMEThread loadThread;
19691946
19701947 class LoadJMEThread extends Thread
....@@ -2022,6 +1999,7 @@
20221999 //LoadFile0(filename, converter);
20232000 }
20242001 }
2002
+
20252003 LoadOBJThread loadObjThread;
20262004
20272005 class LoadOBJThread extends Thread
....@@ -2100,19 +2078,19 @@
21002078
21012079 void LoadObjFile(String fullname)
21022080 {
2103
- /*
2081
+ System.out.println("Loading " + fullname);
2082
+ /**/
21042083 //lastFilename = fullname;
21052084 if(loadObjThread == null)
21062085 {
2107
- loadObjThread = new LoadOBJThread();
2108
- loadObjThread.start();
2086
+ loadObjThread = new LoadOBJThread();
2087
+ loadObjThread.start();
21092088 }
21102089
21112090 loadObjThread.add(fullname);
2112
- */
2091
+ /**/
21132092
2114
- System.out.println("Loading " + fullname);
2115
- makeSomething(new FileObject(fullname, true), true);
2093
+ //makeSomething(new FileObject(fullname, true), true);
21162094 }
21172095
21182096 void LoadGFDFile(String fullname)
....@@ -2373,11 +2351,11 @@
23732351
23742352 void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
23752353 {
2376
- if (GrafreeD.standAlone)
2354
+ if (Grafreed.standAlone)
23772355 {
23782356 /**/
23792357 FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2380
- browser.show();
2358
+ browser.setVisible(true);
23812359 String filename = browser.getFile();
23822360 if (filename != null && filename.length() > 0)
23832361 {
....@@ -2737,7 +2715,8 @@
27372715 return;
27382716 }
27392717
2740
- multiplyToggle.setSelected(mat.multiply);
2718
+ if (multiplyToggle != null)
2719
+ multiplyToggle.setSelected(mat.multiply);
27412720
27422721 assert (object.projectedVertices != null);
27432722
....@@ -2952,9 +2931,9 @@
29522931 frame.validate();
29532932
29542933 return;
2955
- } else if (event.getSource() == toggleRandomItem)
2934
+ } else if (event.getSource() == toggleSwitchItem)
29562935 {
2957
- cameraView.ToggleRandom();
2936
+ cameraView.ToggleSwitch();
29582937 cameraView.repaint();
29592938 return;
29602939 } else if (event.getSource() == toggleHandleItem)
....@@ -2982,6 +2961,10 @@
29822961 } else if (event.getSource() == liveCB)
29832962 {
29842963 copy.live ^= true;
2964
+ return;
2965
+ } else if (event.getSource() == selectCB)
2966
+ {
2967
+ copy.dontselect ^= true;
29852968 return;
29862969 } else if (event.getSource() == hideCB)
29872970 {
....@@ -3021,8 +3004,9 @@
30213004
30223005 public void actionPerformed(ActionEvent event)
30233006 {
3007
+ Object source = event.getSource();
30243008 // SCRIPT DIALOG
3025
- if (event.getSource() == okbutton)
3009
+ if (source == okbutton)
30263010 {
30273011 textpanel.setVisible(false);
30283012 textpanel.remove(textarea);
....@@ -3034,7 +3018,7 @@
30343018 textarea = null;
30353019 textpanel = null;
30363020 }
3037
- if (event.getSource() == cancelbutton)
3021
+ if (source == cancelbutton)
30383022 {
30393023 textpanel.setVisible(false);
30403024 textpanel.remove(textarea);
....@@ -3046,50 +3030,50 @@
30463030 //applySelf();
30473031 //client.refreshEditWindow();
30483032 //refreshContents();
3049
- if (event.getSource() == nameField)
3033
+ if (source == nameField)
30503034 {
30513035 //System.out.println("ObjEditor " + event);
30523036 applySelf0(true);
30533037 //parent.applySelf();
30543038 objEditor.refreshContents();
3055
- } else if (event.getSource() == resetButton)
3039
+ } else if (source == resetButton)
30563040 {
30573041 CameraPane.fullreset = true;
30583042 copy.Reset(); // ResetMeshes();
30593043 copy.Touch();
30603044 objEditor.refreshContents();
3061
- } else if (event.getSource() == stepItem)
3045
+ } else if (source == stepItem)
30623046 {
30633047 //cameraView.ONESTEP = true;
30643048 Globals.ONESTEP = true;
30653049 cameraView.repaint();
30663050 return;
3067
- } else if (event.getSource() == stepButton)
3051
+ } else if (source == stepButton)
30683052 {
30693053 copy.Step();
30703054 copy.Touch();
30713055 objEditor.refreshContents();
3072
- } else if (event.getSource() == slowerButton)
3056
+ } else if (source == slowerButton)
30733057 {
30743058 copy.Slower();
30753059 copy.Touch();
30763060 objEditor.refreshContents();
3077
- } else if (event.getSource() == fasterButton)
3061
+ } else if (source == fasterButton)
30783062 {
30793063 copy.Faster();
30803064 copy.Touch();
30813065 objEditor.refreshContents();
3082
- } else if (event.getSource() == remarkButton)
3066
+ } else if (source == remarkButton)
30833067 {
30843068 copy.Remark();
30853069 copy.Touch();
30863070 objEditor.refreshContents();
3087
- } else if (event.getSource() == stepAllButton)
3071
+ } else if (source == stepAllButton)
30883072 {
30893073 copy.StepAll();
30903074 copy.Touch();
30913075 objEditor.refreshContents();
3092
- } else if (event.getSource() == resetAllButton)
3076
+ } else if (source == resetAllButton)
30933077 {
30943078 //CameraPane.fullreset = true;
30953079 copy.ResetAll(); // ResetMeshes();
....@@ -3122,53 +3106,75 @@
31223106 // Close();
31233107 // }
31243108 // else
3125
- if (event.getSource() == resetSlidersButton)
3109
+ if (source == resetSlidersButton)
31263110 {
31273111 ResetSliders();
3128
- } else if (event.getSource() == clearMaterialButton)
3112
+ } else if (source == clearMaterialButton)
31293113 {
31303114 ClearMaterial();
3131
- } else if (event.getSource() == createMaterialButton)
3115
+ } else if (source == createMaterialButton)
31323116 {
31333117 CreateMaterial();
3134
- } else if (event.getSource() == clearPanelButton)
3118
+ } else if (source == clearPanelButton)
31353119 {
31363120 copy.ClearUI();
31373121 refreshContents(true);
3138
- } /*
3139
- }
3140
-
3141
- public boolean action(Event event, Object arg)
3142
- {
3143
- */ else if (event.getSource() == closeItem)
3122
+ } else if (source == importGFDItem)
3123
+ {
3124
+ ImportGFD();
3125
+ } else
3126
+ if (source == importVRMLX3DItem)
3127
+ {
3128
+ ImportVRMLX3D();
3129
+ } else
3130
+ if (source == import3DSItem)
3131
+ {
3132
+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
3133
+ } else
3134
+ if (source == importOBJItem)
3135
+ {
3136
+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
3137
+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
3138
+ browser.setVisible(true);
3139
+ String filename = browser.getFile();
3140
+ if (filename != null && filename.length() > 0)
3141
+ {
3142
+ String fullname = browser.getDirectory() + filename;
3143
+ makeSomething(ReadOBJ(fullname), true);
3144
+ }
3145
+ } else
3146
+ if (source == closeItem)
31443147 {
31453148 Close();
31463149 //return true;
3147
- } else if (event.getSource() == loadItem)
3150
+ } else if (source == loadItem)
31483151 {
31493152 load();
31503153 //return true;
3151
- } else if (event.getSource() == saveItem)
3154
+ } else if (source == newItem)
3155
+ {
3156
+ New();
3157
+ } else if (source == saveItem)
31523158 {
31533159 save();
31543160 //return true;
3155
- } else if (event.getSource() == saveAsItem)
3161
+ } else if (source == saveAsItem)
31563162 {
31573163 saveAs();
31583164 //return true;
3159
- } else if (event.getSource() == reexportItem)
3165
+ } else if (source == reexportItem)
31603166 {
31613167 reexport();
31623168 //return true;
3163
- } else if (event.getSource() == exportAsItem)
3169
+ } else if (source == exportAsItem)
31643170 {
31653171 export();
31663172 //return true;
3167
- } else if (event.getSource() == povItem)
3173
+ } else if (source == povItem)
31683174 {
31693175 generatePOV();
31703176 //return true;
3171
- } else if (event.getSource() == zBufferItem)
3177
+ } else if (source == zBufferItem)
31723178 {
31733179 try
31743180 {
....@@ -3190,21 +3196,8 @@
31903196 cameraView.repaint();
31913197 //return true;
31923198 }
3193
- */ else if (event.getSource() == editCameraItem)
3194
- {
3195
- cameraView.ProtectCamera();
3196
- cameraView.repaint();
3197
- return;
3198
- } else if (event.getSource() == revertCameraItem)
3199
- {
3200
- cameraView.RevertCamera();
3201
- cameraView.repaint();
3202
- return;
3203
-// } else if (event.getSource() == textureButton)
3204
-// {
3205
-// return; // true;
3206
- } else // combos...
3207
- if (event.getSource() == texresMenu)
3199
+ */ else // combos...
3200
+ if (source == texresMenu)
32083201 {
32093202 System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
32103203 copy.texres = texresMenu.getSelectedIndex();
....@@ -3216,6 +3209,262 @@
32163209 }
32173210 }
32183211
3212
+ void New()
3213
+ {
3214
+ while (copy.Size() > 1)
3215
+ {
3216
+ copy.remove(1);
3217
+ }
3218
+
3219
+ ResetModel();
3220
+ objEditor.refreshContents();
3221
+ }
3222
+
3223
+ static public byte[] Compress(Object3D o)
3224
+ {
3225
+ try
3226
+ {
3227
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
3228
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3229
+ ObjectOutputStream out = new ObjectOutputStream(zstream);
3230
+
3231
+ Object3D parent = o.parent;
3232
+ o.parent = null;
3233
+
3234
+ out.writeObject(o);
3235
+
3236
+ o.parent = parent;
3237
+
3238
+ out.flush();
3239
+
3240
+ zstream.close();
3241
+ out.close();
3242
+
3243
+ return baos.toByteArray();
3244
+ } catch (Exception e)
3245
+ {
3246
+ System.err.println(e);
3247
+ return null;
3248
+ }
3249
+ }
3250
+
3251
+ static public Object Uncompress(byte[] bytes)
3252
+ {
3253
+ System.out.println("#bytes = " + bytes.length);
3254
+ try
3255
+ {
3256
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3257
+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3258
+ ObjectInputStream in = new ObjectInputStream(istream);
3259
+ Object obj = in.readObject();
3260
+ in.close();
3261
+
3262
+ return obj;
3263
+ } catch (Exception e)
3264
+ {
3265
+ System.err.println(e);
3266
+ return null;
3267
+ }
3268
+ }
3269
+
3270
+ static public Object clone(Object o)
3271
+ {
3272
+ try
3273
+ {
3274
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
3275
+ ObjectOutputStream out = new ObjectOutputStream(baos);
3276
+
3277
+ out.writeObject(o);
3278
+
3279
+ out.flush();
3280
+ out.close();
3281
+
3282
+ byte[] bytes = baos.toByteArray();
3283
+
3284
+ System.out.println("clone = " + bytes.length);
3285
+
3286
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3287
+ ObjectInputStream in = new ObjectInputStream(bais);
3288
+ Object obj = in.readObject();
3289
+ in.close();
3290
+
3291
+ return obj;
3292
+ } catch (Exception e)
3293
+ {
3294
+ System.err.println(e);
3295
+ return null;
3296
+ }
3297
+ }
3298
+
3299
+ cRadio GetCurrentTab()
3300
+ {
3301
+ cRadio ab;
3302
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3303
+ {
3304
+ ab = (cRadio)e.nextElement();
3305
+ if(ab.GetObject() == copy)
3306
+ {
3307
+ return ab;
3308
+ }
3309
+ }
3310
+
3311
+ return null;
3312
+ }
3313
+
3314
+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3315
+
3316
+ public void Save()
3317
+ {
3318
+ cRadio tab = GetCurrentTab();
3319
+
3320
+ boolean temp = CameraPane.SWITCH;
3321
+ CameraPane.SWITCH = false;
3322
+
3323
+ copy.ExtractBigData(hashtable);
3324
+
3325
+ //EditorFrame.m_MainFrame.requestFocusInWindow();
3326
+ tab.graphs[tab.undoindex++] = Compress(copy);
3327
+
3328
+ copy.RestoreBigData(hashtable);
3329
+
3330
+ CameraPane.SWITCH = temp;
3331
+
3332
+ //assert(hashtable.isEmpty());
3333
+
3334
+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
3335
+ {
3336
+ tab.graphs[i] = null;
3337
+ }
3338
+
3339
+ // test save
3340
+ if (false)
3341
+ {
3342
+ try
3343
+ {
3344
+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3345
+ ObjectOutputStream p = new ObjectOutputStream(ostream);
3346
+
3347
+ p.writeObject(copy);
3348
+
3349
+ p.flush();
3350
+
3351
+ ostream.close();
3352
+ } catch (Exception e)
3353
+ {
3354
+ e.printStackTrace();
3355
+ }
3356
+ }
3357
+ }
3358
+
3359
+ void CopyChanged(Object3D obj)
3360
+ {
3361
+ boolean temp = CameraPane.SWITCH;
3362
+ CameraPane.SWITCH = false;
3363
+
3364
+ copy.ExtractBigData(hashtable);
3365
+
3366
+ copy.clear();
3367
+
3368
+ for (int i=0; i<obj.Size(); i++)
3369
+ {
3370
+ copy.add(obj.get(i));
3371
+ }
3372
+
3373
+ copy.RestoreBigData(hashtable);
3374
+
3375
+ CameraPane.SWITCH = temp;
3376
+
3377
+ //assert(hashtable.isEmpty());
3378
+
3379
+ copy.Touch();
3380
+
3381
+ ResetModel();
3382
+ copy.HardTouch(); // recompile?
3383
+
3384
+ cRadio ab;
3385
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3386
+ {
3387
+ ab = (cRadio)e.nextElement();
3388
+ Object3D test = copy.GetObject(ab.object.GetUUID());
3389
+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3390
+ if (test != null)
3391
+ {
3392
+ test.editWindow = ab.object.editWindow;
3393
+ ab.object = test;
3394
+ }
3395
+ }
3396
+
3397
+ refreshContents();
3398
+ }
3399
+
3400
+ public void Undo()
3401
+ {
3402
+ cRadio tab = GetCurrentTab();
3403
+
3404
+ if (tab.undoindex == 0)
3405
+ {
3406
+ java.awt.Toolkit.getDefaultToolkit().beep();
3407
+ return;
3408
+ }
3409
+
3410
+ if (tab.graphs[tab.undoindex] == null)
3411
+ {
3412
+ Save();
3413
+ tab.undoindex -= 1;
3414
+ }
3415
+
3416
+ tab.undoindex -= 1;
3417
+
3418
+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3419
+ }
3420
+
3421
+ public void Redo()
3422
+ {
3423
+ cRadio tab = GetCurrentTab();
3424
+
3425
+ if (tab.graphs[tab.undoindex + 1] == null)
3426
+ {
3427
+ java.awt.Toolkit.getDefaultToolkit().beep();
3428
+ return;
3429
+ }
3430
+
3431
+ tab.undoindex += 1;
3432
+
3433
+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3434
+ }
3435
+
3436
+ void ImportGFD()
3437
+ {
3438
+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3439
+ browser.show();
3440
+ String filename = browser.getFile();
3441
+ if (filename != null && filename.length() > 0)
3442
+ {
3443
+ String fullname = browser.getDirectory() + filename;
3444
+
3445
+ //Object3D readobj =
3446
+ objEditor.ReadGFD(fullname, objEditor);
3447
+ //makeSomething(readobj);
3448
+ }
3449
+ }
3450
+
3451
+ void ImportVRMLX3D()
3452
+ {
3453
+ if (Grafreed.standAlone)
3454
+ {
3455
+ /**/
3456
+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
3457
+ browser.show();
3458
+ String filename = browser.getFile();
3459
+ if (filename != null && filename.length() > 0)
3460
+ {
3461
+ String fullname = browser.getDirectory() + filename;
3462
+ LoadVRMLX3D(fullname);
3463
+ }
3464
+ /**/
3465
+ }
3466
+ }
3467
+
32193468 void ToggleAnimation()
32203469 {
32213470 if (!Globals.ANIMATION)
....@@ -3231,8 +3480,8 @@
32313480
32323481 Globals.ANIMATION ^= true;
32333482
3234
- GrafreeD.wav.cursor = 0;
3235
- GrafreeD.wav.loop = 0;
3483
+ Grafreed.wav.cursor = 0;
3484
+ Grafreed.wav.loop = 0;
32363485 }
32373486 } else
32383487 {
....@@ -3253,7 +3502,6 @@
32533502 callee.refreshContents();
32543503 } else
32553504 {
3256
- new Exception().printStackTrace();
32573505 System.exit(0);
32583506 }
32593507 }
....@@ -3283,7 +3531,7 @@
32833531 void CreateMaterial()
32843532 {
32853533 //copy.ClearMaterial(); // PATCH
3286
- copy.CreateMaterialS(multiplyToggle.isSelected());
3534
+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
32873535 if (copy.selection.size() > 0)
32883536 //SetMaterial(copy);
32893537 {
....@@ -3342,11 +3590,11 @@
33423590 {
33433591 copy.ResetBlockLoop(); // temporary problem
33443592
3345
- boolean random = CameraPane.RANDOM;
3346
- CameraPane.RANDOM = false; // parse everything
3593
+ boolean random = CameraPane.SWITCH;
3594
+ CameraPane.SWITCH = false; // parse everything
33473595 copy.ResetDisplayList();
33483596 copy.HardTouch();
3349
- CameraPane.RANDOM = random;
3597
+ CameraPane.SWITCH = random;
33503598 }
33513599
33523600 // public void applySelf()
....@@ -3420,6 +3668,36 @@
34203668 {
34213669 //System.out.println("Propagate = " + propagate);
34223670 copy.UpdateMaterial(anchor, current, propagate);
3671
+
3672
+ if (copy.material != null)
3673
+ {
3674
+ cMaterial mat = copy.material;
3675
+
3676
+ colorField.SetToolTipValue((mat.color));
3677
+ modulationField.SetToolTipValue((mat.modulation));
3678
+ metalnessField.SetToolTipValue((mat.metalness));
3679
+ diffuseField.SetToolTipValue((mat.diffuse));
3680
+ specularField.SetToolTipValue((mat.specular));
3681
+ shininessField.SetToolTipValue((mat.shininess));
3682
+ shiftField.SetToolTipValue((mat.shift));
3683
+ ambientField.SetToolTipValue((mat.ambient));
3684
+ lightareaField.SetToolTipValue((mat.lightarea));
3685
+ diffusenessField.SetToolTipValue((mat.factor));
3686
+ velvetField.SetToolTipValue((mat.velvet));
3687
+ sheenField.SetToolTipValue((mat.sheen));
3688
+ subsurfaceField.SetToolTipValue((mat.subsurface));
3689
+ backlitField.SetToolTipValue((mat.bump));
3690
+ anisoField.SetToolTipValue((mat.aniso));
3691
+ anisoVField.SetToolTipValue((mat.anisoV));
3692
+ cameraField.SetToolTipValue((mat.cameralight));
3693
+ selfshadowField.SetToolTipValue((mat.diffuseness));
3694
+ shadowField.SetToolTipValue((mat.shadow));
3695
+ textureField.SetToolTipValue((mat.texture));
3696
+ opacityField.SetToolTipValue((mat.opacity));
3697
+ fakedepthField.SetToolTipValue((mat.fakedepth));
3698
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
3699
+ }
3700
+
34233701 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
34243702 {
34253703 copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
....@@ -3535,7 +3813,7 @@
35353813 }
35363814
35373815 if (normalpushField != null)
3538
- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3816
+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35393817 }
35403818
35413819 void SnapObject()
....@@ -3799,6 +4077,7 @@
37994077
38004078 void makeSomething(Object3D thing, boolean resetmodel) // deselect)
38014079 {
4080
+ Save();
38024081 //Tween.set(thing, 0).target(1).start(tweenManager);
38034082 //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
38044083 // if (thing instanceof GenericJointDemo)
....@@ -4002,6 +4281,7 @@
40024281 }
40034282 }
40044283 }
4284
+
40054285 LoadGFDThread loadGFDThread;
40064286
40074287 void ReadGFD(String fullname, iCallBack cb)
....@@ -4021,8 +4301,10 @@
40214301
40224302 try
40234303 {
4304
+ // Try compressed version first.
40244305 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4025
- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4306
+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4307
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
40264308
40274309 readobj = (Object3D) p.readObject();
40284310 istream.close();
....@@ -4030,7 +4312,20 @@
40304312 readobj.ResetDisplayList();
40314313 } catch (Exception e)
40324314 {
4033
- e.printStackTrace();
4315
+ //e.printStackTrace();
4316
+ try
4317
+ {
4318
+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4319
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4320
+
4321
+ readobj = (Object3D) p.readObject();
4322
+ istream.close();
4323
+
4324
+ readobj.ResetDisplayList();
4325
+ } catch (Exception e2)
4326
+ {
4327
+ e2.printStackTrace();
4328
+ }
40344329 }
40354330 // catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
40364331 // catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4076,6 +4371,12 @@
40764371
40774372 void LoadIt(Object obj)
40784373 {
4374
+ if (obj == null)
4375
+ {
4376
+ // Invalid file
4377
+ return;
4378
+ }
4379
+
40794380 System.out.println("Loaded " + obj);
40804381 //new Exception().printStackTrace();
40814382 Object3D readobj = (Object3D) obj;
....@@ -4085,6 +4386,7 @@
40854386
40864387 if (readobj != null)
40874388 {
4389
+ Save();
40884390 try
40894391 {
40904392 //readobj.deepCopySelf(copy);
....@@ -4147,7 +4449,7 @@
41474449
41484450 void load() // throws ClassNotFoundException
41494451 {
4150
- if (GrafreeD.standAlone)
4452
+ if (Grafreed.standAlone)
41514453 {
41524454 FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
41534455 browser.show();
....@@ -4234,11 +4536,13 @@
42344536 try
42354537 {
42364538 FileOutputStream ostream = new FileOutputStream(lastname);
4237
- ObjectOutputStream p = new ObjectOutputStream(ostream);
4539
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4540
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
42384541
42394542 p.writeObject(copy);
42404543 p.flush();
42414544
4545
+ zstream.close();
42424546 ostream.close();
42434547
42444548 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4248,11 +4552,12 @@
42484552 {
42494553 }
42504554 }
4555
+
42514556 String lastname;
42524557
42534558 void saveAs()
42544559 {
4255
- if (GrafreeD.standAlone)
4560
+ if (Grafreed.standAlone)
42564561 {
42574562 FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
42584563 browser.setVisible(true);
....@@ -4357,13 +4662,13 @@
43574662 try
43584663 {
43594664 FileOutputStream ostream = new FileOutputStream(filename);
4360
- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4361
- ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
4665
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4666
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
43624667
43634668 Object3D objectparent = obj.parent;
43644669 obj.parent = null;
43654670
4366
- Object3D object = (Object3D) GrafreeD.clone(obj);
4671
+ Object3D object = (Object3D) Grafreed.clone(obj);
43674672
43684673 obj.parent = objectparent;
43694674
....@@ -4375,8 +4680,8 @@
43754680 p.writeObject(object);
43764681 p.flush();
43774682
4683
+ zstream.close();
43784684 ostream.close();
4379
- // zstream.close();
43804685
43814686 // group.selection.get(0).parent = parent;
43824687 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4397,7 +4702,7 @@
43974702 buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
43984703 cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
43994704 copy.generatePOV(buffer);
4400
- if (GrafreeD.standAlone)
4705
+ if (Grafreed.standAlone)
44014706 {
44024707 FileDialog browser = new FileDialog(frame, "Export POV", 1);
44034708 browser.show();
....@@ -4423,7 +4728,8 @@
44234728 Object3D client;
44244729 Object3D copy;
44254730 MenuBar menuBar;
4426
- Menu windowMenu;
4731
+ Menu fileMenu;
4732
+ MenuItem newItem;
44274733 MenuItem loadItem;
44284734 MenuItem saveItem;
44294735 MenuItem saveAsItem;
....@@ -4431,11 +4737,9 @@
44314737 MenuItem reexportItem;
44324738 MenuItem povItem;
44334739 MenuItem closeItem;
4434
- Menu cameraMenu;
4740
+
44354741 CheckboxMenuItem zBufferItem;
44364742 //MenuItem normalLensItem;
4437
- MenuItem editCameraItem;
4438
- MenuItem revertCameraItem;
44394743 MenuItem stepItem;
44404744 CheckboxMenuItem toggleLiveItem;
44414745 CheckboxMenuItem toggleFullScreenItem;
....@@ -4446,7 +4750,7 @@
44464750 CheckboxMenuItem toggleFootContactItem;
44474751 CheckboxMenuItem toggleDLItem;
44484752 CheckboxMenuItem toggleTextureItem;
4449
- CheckboxMenuItem toggleRandomItem;
4753
+ CheckboxMenuItem toggleSwitchItem;
44504754 CheckboxMenuItem toggleRootItem;
44514755 CheckboxMenuItem animationItem;
44524756 CheckboxMenuItem toggleHandleItem;
....@@ -4583,4 +4887,9 @@
45834887 //ObjectUI parent;
45844888
45854889 cNumberSlider normalpushField;
4890
+
4891
+ private MenuItem importGFDItem;
4892
+ private MenuItem importVRMLX3DItem;
4893
+ private MenuItem import3DSItem;
4894
+ private MenuItem importOBJItem;
45864895 }