Normand Briere
2019-08-05 de0d8d87447fea5faea469ccf8072a7aead35b6d
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.*;
....@@ -13,6 +14,9 @@
1314 import javax.swing.plaf.metal.MetalLookAndFeel;
1415 //import javax.swing.plaf.ColorUIResource;
1516 //import javax.swing.plaf.metal.DefaultMetalTheme;
17
+
18
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
19
+import javax.swing.plaf.basic.BasicSplitPaneUI;
1620
1721 //import javax.media.opengl.GLCanvas;
1822
....@@ -35,6 +39,81 @@
3539
3640 GroupEditor callee;
3741 JFrame frame;
42
+
43
+ static ObjEditor theFrame;
44
+
45
+ public cGridBag GetSeparator()
46
+ {
47
+ cGridBag separator = new cGridBag();
48
+ separator.add(new JSeparator());
49
+ separator.preferredHeight = 5;
50
+ return separator;
51
+ }
52
+
53
+ cButton GetButton(String name, boolean border)
54
+ {
55
+ ImageIcon icon = GetIcon(name);
56
+ return new cButton(icon, border);
57
+ }
58
+
59
+ cLabel GetLabel(String name, boolean border)
60
+ {
61
+ //ImageIcon icon = GetIcon(name);
62
+ return new cLabel(GetImage(name), border);
63
+ }
64
+
65
+ cToggleButton GetToggleButton(String name, boolean border)
66
+ {
67
+ ImageIcon icon = GetIcon(name);
68
+ return new cToggleButton(icon, border);
69
+ }
70
+
71
+ cCheckBox GetCheckBox(String name, boolean border)
72
+ {
73
+ ImageIcon icon = GetIcon(name);
74
+ return new cCheckBox(icon, border);
75
+ }
76
+
77
+ ImageIcon GetIcon(String name)
78
+ {
79
+ try
80
+ {
81
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
82
+
83
+// if (image.getWidth() > 48 && image.getHeight() > 48)
84
+// {
85
+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
86
+// Graphics2D g = resized.createGraphics();
87
+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
88
+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
89
+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
90
+// g.dispose();
91
+//
92
+// image = resized;
93
+// }
94
+
95
+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
96
+ return icon;
97
+ }
98
+ catch (Exception e)
99
+ {
100
+ return null;
101
+ }
102
+ }
103
+
104
+ BufferedImage GetImage(String name)
105
+ {
106
+ try
107
+ {
108
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
109
+
110
+ return image;
111
+ }
112
+ catch (Exception e)
113
+ {
114
+ return null;
115
+ }
116
+ }
38117
39118 // SCRIPT
40119
....@@ -138,34 +217,42 @@
138217 public void closeUI()
139218 {
140219 //new Exception().printStackTrace();
141
- System.out.println("this = " + this);
142
- System.out.println("objEditor = " + objEditor);
220
+// System.out.println("this = " + this);
221
+// System.out.println("objEditor = " + objEditor);
143222 //nameField.removeActionListener(this);
144
- objEditor.ctrlPanel.remove(nameField);
223
+// objEditor.ctrlPanel.remove(nameField);
145224
146
- if (!GroupEditor.allparams)
225
+ objEditor.ctrlPanel.remove(namePanel);
226
+
227
+ if (!allparams)
147228 return;
148229
149
- objEditor.ctrlPanel.remove(liveCB);
150
- objEditor.ctrlPanel.remove(hideCB);
151
- objEditor.ctrlPanel.remove(markCB);
152
-
153
- objEditor.ctrlPanel.remove(randomCB);
154
- objEditor.ctrlPanel.remove(speedupCB);
155
- objEditor.ctrlPanel.remove(rewindCB);
156
-
157
- objEditor.ctrlPanel.remove(resetButton);
158
- objEditor.ctrlPanel.remove(stepButton);
159
-// objEditor.ctrlPanel.remove(stepAllButton);
160
-// objEditor.ctrlPanel.remove(resetAllButton);
161
- objEditor.ctrlPanel.remove(link2masterCB);
162
- //objEditor.ctrlPanel.remove(flipVCB);
163
- //objEditor.ctrlPanel.remove(texresMenu);
164
- objEditor.ctrlPanel.remove(slowerButton);
165
- objEditor.ctrlPanel.remove(fasterButton);
166
- objEditor.ctrlPanel.remove(remarkButton);
230
+// objEditor.ctrlPanel.remove(liveCB);
231
+// objEditor.ctrlPanel.remove(hideCB);
232
+// objEditor.ctrlPanel.remove(markCB);
233
+//
234
+// objEditor.ctrlPanel.remove(randomCB);
235
+// objEditor.ctrlPanel.remove(speedupCB);
236
+// objEditor.ctrlPanel.remove(rewindCB);
237
+//
238
+// objEditor.ctrlPanel.remove(resetButton);
239
+// objEditor.ctrlPanel.remove(stepButton);
240
+//// objEditor.ctrlPanel.remove(stepAllButton);
241
+//// objEditor.ctrlPanel.remove(resetAllButton);
242
+// objEditor.ctrlPanel.remove(link2masterCB);
243
+// //objEditor.ctrlPanel.remove(flipVCB);
244
+// //objEditor.ctrlPanel.remove(texresMenu);
245
+// objEditor.ctrlPanel.remove(slowerButton);
246
+// objEditor.ctrlPanel.remove(fasterButton);
247
+// objEditor.ctrlPanel.remove(remarkButton);
167248
168
- Remove(normalpushField);
249
+ objEditor.ctrlPanel.remove(setupPanel);
250
+ objEditor.ctrlPanel.remove(setupPanel2);
251
+ objEditor.ctrlPanel.remove(objectCommandsPanel);
252
+ objEditor.ctrlPanel.remove(pushPanel);
253
+ //objEditor.ctrlPanel.remove(fillPanel);
254
+
255
+ //Remove(normalpushField);
169256 }
170257
171258 public ObjEditor GetEditor()
....@@ -209,6 +296,12 @@
209296 client = inClient;
210297 copy = client;
211298
299
+ if (copy.versionlist == null)
300
+ {
301
+ copy.versionlist = new Object3D[100];
302
+ copy.versionindex = -1;
303
+ }
304
+
212305 // "this" is not called: SetupUI2(objEditor);
213306 }
214307
....@@ -222,6 +315,12 @@
222315 client = inClient;
223316 copy = client;
224317
318
+ if (copy.versionlist == null)
319
+ {
320
+ copy.versionlist = new Object3D[100];
321
+ copy.versionindex = -1;
322
+ }
323
+
225324 SetupUI2(callee.GetEditor());
226325 }
227326
....@@ -236,6 +335,7 @@
236335 //localCopy.parent = null;
237336
238337 frame = new JFrame();
338
+ frame.setUndecorated(false);
239339 objEditor = this;
240340 this.callee = callee;
241341
....@@ -253,6 +353,12 @@
253353 copy = localCopy;
254354 copy.editWindow = this;
255355
356
+ if (copy.versionlist == null)
357
+ {
358
+// copy.versions = new byte[100][];
359
+// copy.versionindex = -1;
360
+ }
361
+
256362 SetupMenu();
257363
258364 //SetupName(objEditor); // new
....@@ -266,28 +372,49 @@
266372 return frame.action(event, obj);
267373 }
268374
375
+ // Cannot work without static
376
+ static boolean allparams = true;
377
+
378
+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
379
+
269380 void SetupMenu()
270381 {
271382 frame.setMenuBar(menuBar = new MenuBar());
272
- menuBar.add(windowMenu = new Menu("File"));
273
- windowMenu.add(loadItem = new MenuItem("Load..."));
274
- windowMenu.add("-");
275
- windowMenu.add(saveItem = new MenuItem("Save"));
276
- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
383
+ menuBar.add(fileMenu = new Menu("File"));
384
+ fileMenu.add(newItem = new MenuItem("New"));
385
+ fileMenu.add(openItem = new MenuItem("Open..."));
386
+
387
+ //oe.menuBar.add(menu = new Menu("Include"));
388
+ Menu menu = new Menu("Import");
389
+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
390
+ importOBJItem.addActionListener(this);
391
+ import3DSItem = menu.add(new MenuItem("3DS file..."));
392
+ import3DSItem.addActionListener(this);
393
+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
394
+ importVRMLX3DItem.addActionListener(this);
395
+ menu.add("-");
396
+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
397
+ importGFDItem.addActionListener(this);
398
+ fileMenu.add(menu);
399
+ fileMenu.add("-");
400
+
401
+ fileMenu.add(saveItem = new MenuItem("Save"));
402
+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
277403 //windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
278
- windowMenu.add("-");
279
- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
280
- windowMenu.add(reexportItem = new MenuItem("Re-export"));
281
- windowMenu.add("-");
404
+ fileMenu.add("-");
405
+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
406
+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
407
+ fileMenu.add("-");
282408 if (client.parent != null)
283409 {
284
- windowMenu.add(closeItem = new MenuItem("Close"));
410
+ fileMenu.add(closeItem = new MenuItem("Close"));
285411 } else
286412 {
287
- windowMenu.add(closeItem = new MenuItem("Exit"));
413
+ fileMenu.add(closeItem = new MenuItem("Exit"));
288414 }
289415
290
- loadItem.addActionListener(this);
416
+ newItem.addActionListener(this);
417
+ openItem.addActionListener(this);
291418 saveItem.addActionListener(this);
292419 saveAsItem.addActionListener(this);
293420 exportAsItem.addActionListener(this);
....@@ -295,82 +422,69 @@
295422 //povItem.addActionListener(this);
296423 closeItem.addActionListener(this);
297424
298
- menuBar.add(cameraMenu = new Menu("View"));
299
- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
300
- //zBufferItem.addActionListener(this);
301
- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
302
- //normalLensItem.addActionListener(this);
303
- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
304
- revertCameraItem.addActionListener(this);
305
- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
306
- toggleTimelineItem.addItemListener(this);
307
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
308
- toggleFullScreenItem.addItemListener(this);
309
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
310
- cameraMenu.add("-");
311
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
312
- toggleTextureItem.addItemListener(this);
313
- toggleTextureItem.setState(CameraPane.textureon);
314
- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
315
- toggleLiveItem.addItemListener(this);
316
- toggleLiveItem.setState(Globals.isLIVE());
317
- cameraMenu.add(stepItem = new MenuItem("Step"));
318
- stepItem.addActionListener(this);
319
-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
320
-// toggleDLItem.addItemListener(this);
321
-// toggleDLItem.setState(false);
322
- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
323
- toggleRenderItem.addItemListener(this);
324
- toggleRenderItem.setState(!CameraPane.frozen);
325
- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
326
- toggleDebugItem.addItemListener(this);
327
- toggleDebugItem.setState(CameraPane.DEBUG);
328
- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
329
- toggleFrustumItem.addItemListener(this);
330
- toggleFrustumItem.setState(CameraPane.FRUSTUM);
331
- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
332
- toggleFootContactItem.addItemListener(this);
333
- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
334
- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
335
- toggleRandomItem.addItemListener(this);
336
- toggleRandomItem.setState(CameraPane.RANDOM);
337
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
338
- toggleHandleItem.addItemListener(this);
339
- toggleHandleItem.setState(CameraPane.HANDLES);
340
- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
341
- togglePaintItem.addItemListener(this);
342
- togglePaintItem.setState(CameraPane.PAINTMODE);
343
-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
344
-// toggleRootItem.addItemListener(this);
345
-// toggleRootItem.setState(false);
346
-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
347
-// animationItem.addItemListener(this);
348
-// animationItem.setState(CameraPane.ANIMATION);
349
- cameraMenu.add("-");
350
- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
351
- editCameraItem.addActionListener(this);
352
-
353425 objectPanel = new JTabbedPane();
426
+
427
+ ChangeListener changeListener = new ChangeListener()
428
+ {
429
+ public void stateChanged(ChangeEvent changeEvent)
430
+ {
431
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
432
+// {
433
+// if (latestObject != null)
434
+// {
435
+// refreshContents(true);
436
+// SetMaterial(latestObject);
437
+// }
438
+//
439
+// materialFlushed = true;
440
+// }
441
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
442
+// {
443
+// if (listUI.size() == 0)
444
+// EditSelection(false);
445
+// }
446
+
447
+ refreshContents(false); // To refresh Info tab
448
+ }
449
+ };
450
+ objectPanel.addChangeListener(changeListener);
451
+
354452 toolbarPanel = new JPanel();
355453 toolbarPanel.setName("Toolbar");
356
- treePanel = new JPanel();
454
+
455
+ treePanel = new cGridBag();
357456 treePanel.setName("Tree");
358
- ctrlPanel = new cGridBag(); // new GridBagLayout());
359
- ctrlPanel.setName("Edit");
360
- materialPanel = new cGridBag().setVertical(true);
361
- materialPanel.setName("Material");
457
+
458
+ editPanel = new cGridBag().setVertical(true);
459
+ //editPanel.setName("Edit");
460
+
461
+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
462
+
463
+ editCommandsPanel = new cGridBag();
464
+ editPanel.add(editCommandsPanel);
465
+ editPanel.add(ctrlPanel);
466
+
467
+ toolboxPanel = new cGridBag().setVertical(true);
468
+ //toolboxPanel.setName("Toolbox");
469
+
470
+ materialPanel = new cGridBag().setVertical(false);
471
+ //materialPanel.setName("Material");
472
+
362473 /*JTextPane*/
363474 infoarea = createTextPane();
475
+ doc = infoarea.getStyledDocument();
476
+
364477 infoarea.setEditable(true);
365478 SetText();
479
+
366480 // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367481 // infoarea.setOpaque(false);
368482 // //infoarea.setForeground(textcolor);
369
- infoarea.setLineWrap(true);
370
- infoarea.setWrapStyleWord(true);
483
+// TEXTAREA infoarea.setLineWrap(true);
484
+// TEXTAREA infoarea.setWrapStyleWord(true);
371485 infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372
- infoPanel.setPreferredSize(new Dimension(50, 200));
373
- infoPanel.setName("Info");
486
+ infoPanel.setPreferredSize(new Dimension(1, 1));
487
+ //infoPanel.setName("Info");
374488 //infoPanel.setLayout(new BorderLayout());
375489 //infoPanel.add(createTextPane());
376490
....@@ -378,15 +492,22 @@
378492 mainPanel.setName("Main");
379493 mainPanel.setContinuousLayout(true);
380494 mainPanel.setOneTouchExpandable(true);
381
- mainPanel.setDividerLocation(1.0);
382495 mainPanel.setDividerSize(9);
383
- mainPanel.setResizeWeight(0);
384
-
496
+ mainPanel.setDividerLocation(0.5); //1.0);
497
+ mainPanel.setResizeWeight(0.5);
498
+
499
+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
500
+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
501
+ divider.setDividerSize(15);
502
+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
503
+
504
+ mainPanel.setUI(new BasicSplitPaneUI());
505
+
385506 //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386507 //mainPanel.setLayout(new GridBagLayout());
387508 toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388
- treePanel.setLayout(new GridBagLayout());
389
- ctrlPanel.setLayout(new GridBagLayout());
509
+// treePanel.setLayout(new GridBagLayout());
510
+ //ctrlPanel.setLayout(new GridBagLayout());
390511 //materialPanel.setLayout(new GridBagLayout());
391512
392513 aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
....@@ -426,7 +547,7 @@
426547 static String newline = "\n";
427548 protected static final String buttonString = "JButton";
428549 StyledDocument doc;
429
- JTextArea infoarea;
550
+ JTextPane infoarea;
430551
431552 void ClearInfo()
432553 {
....@@ -449,10 +570,10 @@
449570 e.printStackTrace();
450571 }
451572
452
- String selection = infoarea.getText();
453
- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
454
- java.awt.datatransfer.Clipboard clipboard =
455
- Toolkit.getDefaultToolkit().getSystemClipboard();
573
+// String selection = infoarea.getText();
574
+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
575
+// java.awt.datatransfer.Clipboard clipboard =
576
+// Toolkit.getDefaultToolkit().getSystemClipboard();
456577 //clipboard.setContents(data, data);
457578 }
458579
....@@ -475,13 +596,13 @@
475596 //SendInfo("Name:", "bold");
476597 if (sel.GetTextures() != null || debug)
477598 {
478
- si.SendInfo(sel.toString(), "bold");
599
+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479600 //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480601 if (sel.Size() > 0)
481602 {
482603 si.SendInfo("#children = " + sel.Size(), "regular");
483604 }
484
- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
605
+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485606 if (debug)
486607 {
487608 try
....@@ -493,7 +614,10 @@
493614 }
494615
495616 if (full)
496
- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
617
+ {
618
+ si.SendInfo(" BBox min: " + minima, "regular");
619
+ si.SendInfo(" BBox max: " + maxima, "regular");
620
+ }
497621
498622 if (sel.bRep != null)
499623 {
....@@ -520,7 +644,7 @@
520644 }
521645 if (sel.support != null)
522646 {
523
- si.SendInfo(" support: " + sel.support, "regular");
647
+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524648 }
525649 if (sel.scriptnode != null)
526650 {
....@@ -591,6 +715,9 @@
591715 {
592716 CameraPane.pointflow = (PointFlow) sel;
593717 }
718
+
719
+ si.SendInfo("_____________________", "regular");
720
+ si.SendInfo("", "regular");
594721 }
595722 }
596723
....@@ -606,68 +733,194 @@
606733 }
607734 }
608735
736
+//static GraphicsDevice device = GraphicsEnvironment
737
+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
738
+
739
+ Rectangle keeprect;
740
+ cRadio radio;
741
+
742
+cButton keepButton;
743
+ cButton twoButton; // Full 3D
744
+ cButton sixButton;
745
+ cButton threeButton;
746
+ cButton sevenButton;
747
+ cButton fourButton; // full panel
748
+ cButton oneButton; // full XYZ
749
+ //cButton currentLayout;
750
+
751
+ boolean maximized;
752
+
753
+ cButton fullscreenLayout;
754
+
755
+ void Minimize()
756
+ {
757
+ frame.setState(Frame.ICONIFIED);
758
+ frame.validate();
759
+ }
760
+
761
+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
762
+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
763
+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
764
+ void Maximize()
765
+ {
766
+ if (CameraPane.FULLSCREEN)
767
+ {
768
+ ToggleFullScreen();
769
+ }
770
+
771
+ if (maximized)
772
+ {
773
+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
774
+ }
775
+ else
776
+ {
777
+ keeprect = frame.getBounds();
778
+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
779
+// Dimension rect2 = frame.getToolkit().getScreenSize();
780
+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
781
+// frame.setState(Frame.MAXIMIZED_BOTH);
782
+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
783
+ }
784
+
785
+ maximized ^= true;
786
+
787
+ frame.validate();
788
+ }
789
+
790
+ cButton minButton;
791
+ cButton maxButton;
792
+ cButton fullButton;
793
+
609794 void ToggleFullScreen()
610795 {
611
- if (CameraPane.FULLSCREEN)
796
+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797
+
798
+ cameraView.ToggleFullScreen();
799
+
800
+ if (!CameraPane.FULLSCREEN)
612801 {
613
- frame.getContentPane().remove(/*"Center",*/bigThree);
614
- framePanel.add(bigThree);
615
- frame.getContentPane().add(/*"Center",*/framePanel);
802
+ device.setFullScreenWindow(null);
803
+ frame.dispose();
804
+ frame.setUndecorated(false);
805
+ frame.validate();
806
+ frame.setVisible(true);
807
+
808
+ //frame.setVisible(false);
809
+// frame.removeNotify();
810
+// frame.setUndecorated(false);
811
+// frame.addNotify();
812
+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
813
+
814
+// X frame.getContentPane().remove(/*"Center",*/bigThree);
815
+// X framePanel.add(bigThree);
816
+// X frame.getContentPane().add(/*"Center",*/framePanel);
817
+ framePanel.setDividerLocation(46);
818
+
819
+ //frame.setVisible(true);
820
+ radio.layout = keepButton;
821
+ //theFrame = null;
822
+ keepButton = null;
823
+ radio.layout.doClick();
824
+
616825 } else
617826 {
618
- frame.getContentPane().remove(/*"Center",*/framePanel);
619
- framePanel.remove(bigThree);
620
- frame.getContentPane().add(/*"Center",*/bigThree);
827
+ keepButton = radio.layout;
828
+ //keeprect = frame.getBounds();
829
+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
830
+// frame.getToolkit().getScreenSize().height);
831
+ //frame.setVisible(false);
832
+
833
+ frame.dispose();
834
+ frame.setUndecorated(true);
835
+ device.setFullScreenWindow(frame);
836
+ frame.validate();
837
+ frame.setVisible(true);
838
+// frame.removeNotify();
839
+// frame.setUndecorated(true);
840
+// frame.addNotify();
841
+// X frame.getContentPane().remove(/*"Center",*/framePanel);
842
+// X framePanel.remove(bigThree);
843
+// X frame.getContentPane().add(/*"Center",*/bigThree);
844
+ framePanel.setDividerLocation(0);
845
+
846
+ radio.layout = fullscreenLayout;
847
+ radio.layout.doClick();
848
+ //frame.setVisible(true);
621849 }
622
- cameraView.ToggleFullScreen();
850
+ frame.validate();
851
+
852
+ cameraView.requestFocusInWindow();
623853 }
624854
625
- private JTextArea createTextPane()
855
+ private Object3D CompressCopy()
626856 {
627
- String[] initString =
628
- {
629
- "This is an editable JTextPane, ", //regular
630
- "another ", //italic
631
- "styled ", //bold
632
- "text ", //small
633
- "component, ", //large
634
- "which supports embedded components..." + newline,//regular
635
- " " + newline, //button
636
- "...and embedded icons..." + newline, //regular
637
- " ", //icon
638
- newline + "JTextPane is a subclass of JEditorPane that "
639
- + "uses a StyledEditorKit and StyledDocument, and provides "
640
- + "cover methods for interacting with those objects."
641
- };
857
+ boolean temp = CameraPane.SWITCH;
858
+ CameraPane.SWITCH = false;
859
+
860
+ copy.ExtractBigData(versiontable);
861
+ // if (copy == client)
862
+
863
+ Object3D versions[] = copy.versionlist;
864
+ copy.versionlist = null;
865
+
866
+ //byte[] compress = Compress(copy);
867
+ Object3D compress = (Object3D)Grafreed.clone(copy);
868
+
869
+ copy.versionlist = versions;
870
+
871
+ copy.RestoreBigData(versiontable);
872
+
873
+ CameraPane.SWITCH = temp;
874
+
875
+ return compress;
876
+ }
642877
643
- String[] initStyles =
644
- {
645
- "regular", "italic", "bold", "small", "large",
646
- "regular", "button", "regular", "icon",
647
- "regular"
648
- };
878
+ private JTextPane createTextPane()
879
+ {
880
+// TEXTAREA String[] initString =
881
+// {
882
+// "This is an editable JTextPane, ", //regular
883
+// "another ", //italic
884
+// "styled ", //bold
885
+// "text ", //small
886
+// "component, ", //large
887
+// "which supports embedded components..." + newline,//regular
888
+// " " + newline, //button
889
+// "...and embedded icons..." + newline, //regular
890
+// " ", //icon
891
+// newline + "JTextPane is a subclass of JEditorPane that "
892
+// + "uses a StyledEditorKit and StyledDocument, and provides "
893
+// + "cover methods for interacting with those objects."
894
+// };
895
+//
896
+// String[] initStyles =
897
+// {
898
+// "regular", "italic", "bold", "small", "large",
899
+// "regular", "button", "regular", "icon",
900
+// "regular"
901
+// };
902
+//
903
+// JTextPane textPane = new JTextPane();
904
+// textPane.setEditable(true);
905
+// /*StyledDocument*/ doc = textPane.getStyledDocument();
906
+// addStylesToDocument(doc);
907
+//
908
+// try
909
+// {
910
+// for (int j = 0; j < 2; j++)
911
+// {
912
+// for (int i = 0; i < initString.length; i++)
913
+// {
914
+// doc.insertString(doc.getLength(), initString[i],
915
+// doc.getStyle(initStyles[i]));
916
+// }
917
+// }
918
+// } catch (BadLocationException ble)
919
+// {
920
+// System.err.println("Couldn't insert initial text into text pane.");
921
+// }
649922
650
- JTextPane textPane = new JTextPane();
651
- textPane.setEditable(true);
652
- /*StyledDocument*/ doc = textPane.getStyledDocument();
653
- addStylesToDocument(doc);
654
-
655
- try
656
- {
657
- for (int j = 0; j < 2; j++)
658
- {
659
- for (int i = 0; i < initString.length; i++)
660
- {
661
- doc.insertString(doc.getLength(), initString[i],
662
- doc.getStyle(initStyles[i]));
663
- }
664
- }
665
- } catch (BadLocationException ble)
666
- {
667
- System.err.println("Couldn't insert initial text into text pane.");
668
- }
669
-
670
- return new JTextArea(); // textPane;
923
+ return new JTextPane(); // textPane;
671924 }
672925
673926 protected void addStylesToDocument(StyledDocument doc)
....@@ -720,7 +973,7 @@
720973 protected static ImageIcon createImageIcon(String path,
721974 String description)
722975 {
723
- java.net.URL imgURL = GrafreeD.class.getResource(path);
976
+ java.net.URL imgURL = Grafreed.class.getResource(path);
724977 if (imgURL != null)
725978 {
726979 return new ImageIcon(imgURL, description);
....@@ -743,6 +996,7 @@
743996 {
744997 SetupMaterial(materialPanel);
745998 }
999
+
7461000 //SetupName();
7471001 //SetupViews();
7481002 }
....@@ -752,6 +1006,7 @@
7521006 // NumberSlider vDivsField;
7531007 // JCheckBox endcaps;
7541008 JCheckBox liveCB;
1009
+ JCheckBox selectableCB;
7551010 JCheckBox hideCB;
7561011 JCheckBox link2masterCB;
7571012 JCheckBox markCB;
....@@ -759,7 +1014,12 @@
7591014 JCheckBox speedupCB;
7601015 JCheckBox rewindCB;
7611016 JCheckBox flipVCB;
1017
+
1018
+ cCheckBox toggleTextureCB;
1019
+ cCheckBox toggleSwitchCB;
1020
+
7621021 JComboBox texresMenu;
1022
+
7631023 JButton resetButton;
7641024 JButton stepButton;
7651025 JButton stepAllButton;
....@@ -767,54 +1027,48 @@
7671027 JButton slowerButton;
7681028 JButton fasterButton;
7691029 JButton remarkButton;
1030
+
1031
+ cGridBag editPanel;
1032
+ cGridBag editCommandsPanel;
1033
+
1034
+ cGridBag namePanel;
1035
+ cGridBag setupPanel;
1036
+ cGridBag setupPanel2;
1037
+ cGridBag objectCommandsPanel;
1038
+ cGridBag pushPanel;
1039
+ cGridBag fillPanel;
7701040
771
- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
1041
+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
7721042 {
7731043 JCheckBox cb;
7741044
775
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
776
- oe.aConstraints.gridwidth = 1; // 3;
777
-// oe.aConstraints.weightx = 1;
778
-// oe.aConstraints.anchor = GridBagConstraints.WEST;
779
- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1045
+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
7801046 cb.addItemListener(this);
781
-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782
- oe.aConstraints.gridwidth = 1;
783
- oe.aConstraints.gridx += 1;
7841047
7851048 return cb;
7861049 }
7871050
788
- cButton AddButton(ObjEditor oe, String label)
1051
+ cButton AddButton(cGridBag panel, String label)
7891052 {
7901053 cButton cb;
7911054
792
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
793
- oe.aConstraints.gridwidth = 1;
794
-// oe.aConstraints.weightx = 1;
795
-// oe.aConstraints.anchor = GridBagConstraints.WEST;
796
- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
1055
+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
7971056 cb.addActionListener(this);
798
-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799
- oe.aConstraints.gridwidth = 1;
800
- oe.aConstraints.gridx += 1;
8011057
8021058 return cb;
8031059 }
8041060
805
- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
1061
+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
8061062 {
8071063 JComboBox combo;
8081064
809
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
810
- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
811
- oe.aConstraints.gridx += 1;
1065
+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8121066 combo.addActionListener(this);
8131067
8141068 return combo;
8151069 }
8161070
817
- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, double min, double max, double current, double pow)
1071
+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
8181072 {
8191073 cGridBag control = new cGridBag();
8201074
....@@ -826,12 +1080,12 @@
8261080 control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8271081 combo.setFloat(current);
8281082
829
- ctrlPanel.add(control);
1083
+ panel.add(control);
8301084
831
- return combo;
1085
+ return control;
8321086 }
8331087
834
- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current)
1088
+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
8351089 {
8361090 cGridBag control = new cGridBag();
8371091
....@@ -839,25 +1093,21 @@
8391093
8401094 JLabel jlabel = new JLabel(label);
8411095 jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
842
- ctrlPanel.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
843
- ctrlPanel.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1096
+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1097
+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8441098 combo.setInteger(current);
8451099
846
- ctrlPanel.add(control);
1100
+ panel.add(control);
8471101
848
- return combo;
1102
+ return control;
8491103 }
8501104
8511105 JTextArea AddText(cGridBag ctrlPanel, String name)
8521106 {
8531107 JTextArea text;
8541108
855
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
856
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
8571109 ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8581110 text.addCaretListener(this);
859
- aConstraints.gridx += 1;
860
- aConstraints.gridwidth = 1;
8611111
8621112 return text;
8631113 }
....@@ -896,7 +1146,7 @@
8961146
8971147 /*
8981148 */
899
- void Return() // ObjEditor oe)
1149
+ void Return0() // ObjEditor oe)
9001150 {
9011151 aConstraints.gridy += 1;
9021152 aConstraints.gridx = 0;
....@@ -951,37 +1201,80 @@
9511201
9521202 void SetupUI2(ObjEditor oe)
9531203 {
954
-// oe.aConstraints.weightx = 0;
955
-// oe.aConstraints.weighty = 0;
956
-// oe.aConstraints.gridx = 0;
957
-// oe.aConstraints.gridy = 0;
958
- SetupName(oe);
1204
+ //SetupName(oe);
9591205
960
- if (!GroupEditor.allparams)
1206
+ namePanel = new cGridBag();
1207
+
1208
+ nameField = AddText(namePanel, copy.GetName());
1209
+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1210
+ oe.ctrlPanel.add(namePanel);
1211
+
1212
+ oe.ctrlPanel.Return();
1213
+
1214
+ if (!allparams)
9611215 return;
9621216
963
- liveCB = AddCheckBox(oe, "Live", copy.live);
964
- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
965
- hideCB = AddCheckBox(oe, "Hide", copy.hide);
1217
+ setupPanel = new cGridBag().setVertical(false);
1218
+
1219
+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1220
+ liveCB.setToolTipText("Animate object");
1221
+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1222
+ selectableCB.setToolTipText("Make object selectable");
9661223 // Return();
967
- markCB = AddCheckBox(oe, "Mark", copy.marked);
968
- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
969
- randomCB = AddCheckBox(oe, "Rand", copy.random);
970
- Return();
971
- resetButton = AddButton(oe, "Reset");
972
- stepButton = AddButton(oe, "Step");
1224
+
1225
+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1226
+ hideCB.setToolTipText("Hide object");
1227
+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1228
+ markCB.setToolTipText("As animation target transform");
1229
+
1230
+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1231
+
1232
+ setupPanel2 = new cGridBag().setVertical(false);
1233
+
1234
+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1235
+ rewindCB.setToolTipText("Rewind animation");
1236
+
1237
+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1238
+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1239
+
1240
+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1241
+ link2masterCB.setToolTipText("Attach to support");
1242
+
1243
+ if (Globals.ADVANCED)
1244
+ {
1245
+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1246
+ speedupCB.setToolTipText("Option motion capture");
1247
+ }
1248
+
1249
+ oe.ctrlPanel.add(setupPanel);
1250
+ oe.ctrlPanel.Return();
1251
+ oe.ctrlPanel.add(setupPanel2);
1252
+ oe.ctrlPanel.Return();
1253
+
1254
+ objectCommandsPanel = new cGridBag().setVertical(false);
1255
+
1256
+ resetButton = AddButton(objectCommandsPanel, "Reset");
1257
+ resetButton.setToolTipText("Jump to frame zero");
1258
+ stepButton = AddButton(objectCommandsPanel, "Step");
1259
+ stepButton.setToolTipText("Step one frame");
9731260 // resetAllButton = AddButton(oe, "Reset All");
9741261 // stepAllButton = AddButton(oe, "Step All");
975
- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
9761262 // Return();
977
- slowerButton = AddButton(oe, "Slow");
978
- fasterButton = AddButton(oe, "Fast");
979
- remarkButton = AddButton(oe, "Rem");
1263
+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1264
+ slowerButton.setToolTipText("Decrease animation speed");
1265
+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1266
+ fasterButton.setToolTipText("Increase animation speed");
1267
+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1268
+ remarkButton.setToolTipText("Set the current transform as the target");
9801269
981
- Return();
1270
+ oe.ctrlPanel.add(objectCommandsPanel);
1271
+ oe.ctrlPanel.Return();
9821272
983
- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
984
- Return();
1273
+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1274
+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1275
+ //Return();
1276
+
1277
+ oe.ctrlPanel.Return();
9851278
9861279 // oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
9871280 // ObjEditor.aConstraints.gridx += 1;
....@@ -1076,7 +1369,7 @@
10761369 oe.aConstraints.gridwidth = 1;
10771370 /**/
10781371 nameField = AddText(oe.ctrlPanel, copy.GetName());
1079
- Return();
1372
+ oe.ctrlPanel.Return();
10801373
10811374 //ctrlPanel.add(textureButton = new Button("Texture..."));
10821375 //textureButton.setEnabled(false);
....@@ -1180,8 +1473,11 @@
11801473 //worldPanel.setName("World");
11811474 centralPanel = new cGridBag();
11821475 centralPanel.preferredWidth = 20;
1183
- timelinePanel = new JPanel(new BorderLayout());
1184
- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1476
+
1477
+ if (Globals.ADVANCED)
1478
+ {
1479
+ timelinePanel = new JPanel(new BorderLayout());
1480
+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11851481
11861482 cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
11871483 cameraPanel.setContinuousLayout(true);
....@@ -1190,7 +1486,10 @@
11901486 // cameraPanel.setDividerSize(9);
11911487 cameraPanel.setResizeWeight(1.0);
11921488
1489
+ }
1490
+
11931491 centralPanel.add(cameraView);
1492
+ centralPanel.setFocusable(true);
11941493 //frame.setJMenuBar(timelineMenubar);
11951494 //centralPanel.add(timelinePanel);
11961495
....@@ -1216,6 +1515,7 @@
12161515 XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
12171516 XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
12181517 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1518
+ //XYZPanel.setName("XYZ");
12191519
12201520 /*
12211521 gridPanel = new JPanel(); //new BorderLayout());
....@@ -1253,11 +1553,29 @@
12531553 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
12541554 //tmp.setName("Edit");
12551555 objectPanel.add(materialPanel);
1256
- JPanel north = new JPanel(new BorderLayout());
1257
- north.setName("Edit");
1258
- north.add(ctrlPanel, BorderLayout.NORTH);
1259
- objectPanel.add(north);
1260
- objectPanel.add(infoPanel);
1556
+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1557
+ objectPanel.setToolTipTextAt(0, "Material");
1558
+
1559
+// JPanel north = new JPanel(new BorderLayout());
1560
+// north.setName("Edit");
1561
+// north.add(ctrlPanel, BorderLayout.NORTH);
1562
+// objectPanel.add(north);
1563
+ objectPanel.add(editPanel);
1564
+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1565
+ objectPanel.setToolTipTextAt(1, "Edit controls");
1566
+
1567
+ //if (Globals.ADVANCED)
1568
+ objectPanel.add(infoPanel);
1569
+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1570
+ objectPanel.setToolTipTextAt(2, "Information");
1571
+
1572
+ objectPanel.add(XYZPanel);
1573
+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1574
+ objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1575
+
1576
+ objectPanel.add(toolboxPanel);
1577
+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1578
+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
12611579
12621580 /*
12631581 aConstraints.gridx = 0;
....@@ -1266,7 +1584,7 @@
12661584 aConstraints.gridy += 1;
12671585 aConstraints.gridwidth = 1;
12681586 mainPanel.add(objectPanel, aConstraints);
1269
- */
1587
+ */
12701588
12711589 scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
12721590 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1278,14 +1596,12 @@
12781596 scrollpane.addMouseWheelListener(this); // Default not fast enough
12791597
12801598 /*JTabbedPane*/ scenePanel = new cGridBag();
1281
- scenePanel.preferredWidth = 7;
1599
+ scenePanel.preferredWidth = 5;
12821600
12831601 JTabbedPane tabbedPane = new JTabbedPane();
12841602 tabbedPane.add(scrollpane);
12851603
1286
- tabbedPane.add(FSPane = new cFileSystemPane(this));
1287
-
1288
- optionsPanel = new cGridBag().setVertical(true);
1604
+ optionsPanel = new cGridBag().setVertical(false);
12891605
12901606 optionsPanel.setName("Options");
12911607
....@@ -1293,6 +1609,8 @@
12931609
12941610 tabbedPane.add(optionsPanel);
12951611
1612
+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1613
+
12961614 scenePanel.add(tabbedPane);
12971615
12981616 /*
....@@ -1356,7 +1674,7 @@
13561674 bigThree = new cGridBag();
13571675 bigThree.addComponent(scenePanel);
13581676 bigThree.addComponent(centralPanel);
1359
- bigThree.addComponent(XYZPanel);
1677
+ //bigThree.addComponent(XYZPanel);
13601678
13611679 // // SIDE EFFECT!!!
13621680 // aConstraints.gridx = 0;
....@@ -1365,9 +1683,9 @@
13651683 // aConstraints.gridheight = 1;
13661684
13671685 framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1368
- framePanel.setContinuousLayout(true);
1369
- framePanel.setOneTouchExpandable(true);
1370
- framePanel.setDividerLocation(0.8);
1686
+ framePanel.setContinuousLayout(false);
1687
+ framePanel.setOneTouchExpandable(false);
1688
+ //.setDividerLocation(0.8);
13711689 //framePanel.setDividerSize(15);
13721690 //framePanel.setResizeWeight(0.15);
13731691 framePanel.setName("Frame");
....@@ -1384,15 +1702,19 @@
13841702
13851703 // aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
13861704
1387
- frame.setSize(1024, 768);
1388
- frame.show();
1389
-
1705
+ frame.setSize(1280, 860);
1706
+
1707
+ cameraView.requestFocusInWindow();
1708
+
13901709 gridPanel.setDividerLocation(1.0);
1710
+
1711
+ frame.validate();
1712
+
1713
+ frame.setVisible(true);
13911714
13921715 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
13931716 frame.addWindowListener(new WindowAdapter()
13941717 {
1395
-
13961718 public void windowClosing(WindowEvent e)
13971719 {
13981720 Close();
....@@ -1415,27 +1737,108 @@
14151737 ctrlPanel.removeAll();
14161738 }
14171739
1418
- void SetupMaterial(cGridBag ctrlPanel)
1740
+ void SetupMaterial(cGridBag materialpanel)
14191741 {
1420
- /*
1742
+ cGridBag presetpanel = new cGridBag().setVertical(true);
1743
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1744
+ skin.addMouseListener(new MouseAdapter()
1745
+ {
1746
+ public void mouseClicked(MouseEvent e)
1747
+ {
1748
+ Object3D object = Grafreed.materials.versionlist[0].get(0);
1749
+ cMaterial material = object.material;
1750
+
1751
+ // Skin
1752
+ colorField.setFloat(material.color);
1753
+ saturationField.setFloat(material.modulation);
1754
+ subsurfaceField.setFloat(material.subsurface);
1755
+ selfshadowField.setFloat(material.diffuseness);
1756
+ diffusenessField.setFloat(material.factor);
1757
+ shininessField.setFloat(material.shininess);
1758
+ shadowbiasField.setFloat(material.shadowbias);
1759
+ diffuseField.setFloat(material.diffuse);
1760
+ specularField.setFloat(material.specular);
1761
+
1762
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
1763
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
1764
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
1765
+
1766
+ materialtouched = true;
1767
+ applySelf();
1768
+ }
1769
+ });
1770
+ presetpanel.add(skin);
1771
+
1772
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1773
+ rough2.addMouseListener(new MouseAdapter()
1774
+ {
1775
+ public void mouseClicked(MouseEvent e)
1776
+ {
1777
+ Object3D object = Grafreed.materials.versionlist[1].get(0);
1778
+ cMaterial material = object.material;
1779
+
1780
+ shininessField.setFloat(material.shininess);
1781
+ velvetField.setFloat(material.velvet);
1782
+
1783
+ materialtouched = true;
1784
+ applySelf();
1785
+ }
1786
+ });
1787
+ presetpanel.add(rough2);
1788
+
1789
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
1790
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
1791
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
1792
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
1793
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
1794
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
1795
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
1796
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
1797
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
1798
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
1799
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
1800
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
1801
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
1802
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
1803
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
1804
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
1805
+
1806
+ cGridBag panel = new cGridBag().setVertical(true);
1807
+
1808
+ presetpanel.preferredWidth = 1;
1809
+
1810
+ materialpanel.add(panel);
1811
+ materialpanel.add(presetpanel);
1812
+
1813
+ panel.preferredWidth = 8;
1814
+
1815
+ /*
14211816 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
14221817 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1423
- */
1818
+ */
14241819
14251820 cGridBag editBar = new cGridBag().setVertical(false);
14261821
1427
- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
1822
+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1823
+ createMaterialButton.setToolTipText("Create material");
14281824
14291825 /*
14301826 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
14311827 */
14321828
1433
- editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1434
- editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
1435
- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1436
- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1829
+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1830
+ clearMaterialButton.setToolTipText("Clear material");
1831
+
1832
+ if (Globals.ADVANCED)
1833
+ {
1834
+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1835
+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1836
+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1837
+ }
14371838
1438
- ctrlPanel.add(editBar);
1839
+ editBar.preferredHeight = 15;
1840
+
1841
+ panel.add(editBar);
14391842
14401843 /**/
14411844 //aConstraints.weighty = 0;
....@@ -1445,59 +1848,57 @@
14451848 //aConstraints.gridx += 1;
14461849 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14471850
1448
- JPanel colorPanel = new JPanel(new BorderLayout());
1449
- colorPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1450
-
14511851 cGridBag colorSection = new cGridBag().setVertical(true);
1452
-
1453
- colorPanel.add(colorSection);
1852
+
1853
+ cGridBag huepanel = new cGridBag();
1854
+ cGridBag huelabel = new cGridBag();
1855
+ skin = GetLabel("icons/hue.png", false);
1856
+ skin.fit = true;
1857
+ huelabel.add(skin);
1858
+ huelabel.preferredWidth = 20;
1859
+ huepanel.add(new cGridBag()); // Label
1860
+ huepanel.add(huelabel); // Field/slider
1861
+
1862
+ huepanel.preferredHeight = 7;
1863
+
1864
+ colorSection.add(huepanel);
14541865
14551866 cGridBag color = new cGridBag();
1456
- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1457
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1458
- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1867
+
1868
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1869
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1870
+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1871
+
1872
+ //colorField.preferredWidth = 200;
14591873 colorSection.add(color);
14601874
14611875 cGridBag modulation = new cGridBag();
14621876 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
14631877 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1464
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1878
+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
14651879 colorSection.add(modulation);
14661880
1881
+ cGridBag opacity = new cGridBag();
1882
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1883
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1884
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1885
+ colorSection.add(opacity);
1886
+
1887
+ colorSection.add(GetSeparator());
1888
+
14671889 cGridBag texture = new cGridBag();
14681890 texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
14691891 textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
14701892 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
14711893 colorSection.add(texture);
14721894
1473
- cGridBag anisoU = new cGridBag();
1474
- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1475
- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476
- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1477
- colorSection.add(anisoU);
1478
-
1479
- cGridBag anisoV = new cGridBag();
1480
- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1481
- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1482
- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1483
- colorSection.add(anisoV);
1484
-
1485
- cGridBag shadowbias = new cGridBag();
1486
- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1487
- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1488
- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1489
- colorSection.add(shadowbias);
1490
-
1491
- ctrlPanel.add(colorPanel);
1895
+ panel.add(GetSeparator());
1896
+
1897
+ panel.add(colorSection);
14921898
14931899 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14941900
1495
- JPanel diffusePanel = new JPanel(new BorderLayout());
1496
- diffusePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1497
-
14981901 cGridBag diffuseSection = new cGridBag().setVertical(true);
1499
-
1500
- diffusePanel.add(diffuseSection);
15011902
15021903 cGridBag diffuse = new cGridBag();
15031904 diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
....@@ -1541,16 +1942,19 @@
15411942 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
15421943 diffuseSection.add(fakedepth);
15431944
1544
- ctrlPanel.add(diffusePanel);
1945
+ cGridBag shadowbias = new cGridBag();
1946
+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1947
+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1948
+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1949
+ diffuseSection.add(shadowbias);
1950
+
1951
+ panel.add(GetSeparator());
1952
+
1953
+ panel.add(diffuseSection);
15451954
15461955 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
15471956
1548
- JPanel specularPanel = new JPanel(new BorderLayout());
1549
- specularPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1550
-
15511957 cGridBag specularSection = new cGridBag().setVertical(true);
1552
-
1553
- specularPanel.add(specularSection);
15541958
15551959 cGridBag specular = new cGridBag();
15561960 specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
....@@ -1582,7 +1986,7 @@
15821986 velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
15831987 specularSection.add(velvet);
15841988
1585
- shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
1989
+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
15861990 //Return();
15871991 // ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
15881992 // shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
....@@ -1594,52 +1998,52 @@
15941998 // aConstraints.gridy += 1;
15951999 // aConstraints.gridwidth = 1;
15962000
2001
+ cGridBag anisoU = new cGridBag();
2002
+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
2003
+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2004
+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2005
+ specularSection.add(anisoU);
15972006
1598
- ctrlPanel.add(specularPanel);
2007
+ cGridBag anisoV = new cGridBag();
2008
+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
2009
+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2010
+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2011
+ specularSection.add(anisoV);
2012
+
2013
+
2014
+ panel.add(GetSeparator());
2015
+
2016
+ panel.add(specularSection);
15992017
16002018 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
16012019
1602
- JPanel globalPanel = new JPanel(new BorderLayout());
1603
- globalPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1604
-
1605
- cGridBag globalSection = new cGridBag().setVertical(true);
1606
-
1607
- globalPanel.add(globalSection);
2020
+ //cGridBag globalSection = new cGridBag().setVertical(true);
16082021
16092022 cGridBag camera = new cGridBag();
16102023 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
16112024 cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16122025 camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613
- globalSection.add(camera);
2026
+ colorSection.add(camera);
16142027
16152028 cGridBag ambient = new cGridBag();
16162029 ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
16172030 ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16182031 ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619
- globalSection.add(ambient);
2032
+ colorSection.add(ambient);
16202033
16212034 cGridBag backlit = new cGridBag();
16222035 backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
16232036 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16242037 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625
- globalSection.add(backlit);
2038
+ colorSection.add(backlit);
16262039
1627
- cGridBag opacity = new cGridBag();
1628
- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1629
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630
- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631
- globalSection.add(opacity);
1632
-
1633
- ctrlPanel.add(globalPanel);
2040
+ //panel.add(new JSeparator());
2041
+
2042
+ //panel.add(globalSection);
16342043
16352044 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
16362045
1637
- JPanel texturePanel = new JPanel(new BorderLayout());
1638
- texturePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1639
-
16402046 cGridBag textureSection = new cGridBag().setVertical(true);
1641
-
1642
- texturePanel.add(textureSection);
16432047
16442048 cGridBag bump = new cGridBag();
16452049 bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
....@@ -1677,7 +2081,9 @@
16772081 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
16782082 textureSection.add(opacityPower);
16792083
1680
- ctrlPanel.add(texturePanel);
2084
+ panel.add(GetSeparator());
2085
+
2086
+ panel.add(textureSection);
16812087
16822088 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
16832089
....@@ -1714,12 +2120,15 @@
17142120 opacityPowerField.addChangeListener(this);
17152121 /**/
17162122
1717
- resetSlidersButton.addActionListener(this);
17182123 clearMaterialButton.addActionListener(this);
17192124 createMaterialButton.addActionListener(this);
1720
-
1721
- propagateToggle.addItemListener(this);
1722
- multiplyToggle.addItemListener(this);
2125
+
2126
+ if (Globals.ADVANCED)
2127
+ {
2128
+ resetSlidersButton.addActionListener(this);
2129
+ propagateToggle.addItemListener(this);
2130
+ multiplyToggle.addItemListener(this);
2131
+ }
17232132 }
17242133
17252134 void DropFile(java.io.File[] files, boolean textures)
....@@ -1737,8 +2146,9 @@
17372146 // 3D models
17382147 if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
17392148 {
1740
- lastConverter = new com.jmex.model.converters.MaxToJme();
1741
- LoadFile(filename, lastConverter);
2149
+ //lastConverter = new com.jmex.model.converters.MaxToJme();
2150
+ //LoadFile(filename, lastConverter);
2151
+ LoadObjFile(filename); // New 3ds loader
17422152 continue;
17432153 }
17442154 if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -1890,7 +2300,7 @@
18902300
18912301 //? flashIt = false;
18922302 CameraPane pane = (CameraPane) cameraView;
1893
- pane.clickStart(location.x, location.y, 0);
2303
+ pane.clickStart(location.x, location.y, 0, 0);
18942304 pane.clickEnd(location.x, location.y, 0, true);
18952305
18962306 if (group.selection.size() == 1)
....@@ -1939,6 +2349,7 @@
19392349 e2.printStackTrace();
19402350 }
19412351 }
2352
+
19422353 LoadJMEThread loadThread;
19432354
19442355 class LoadJMEThread extends Thread
....@@ -1996,6 +2407,7 @@
19962407 //LoadFile0(filename, converter);
19972408 }
19982409 }
2410
+
19992411 LoadOBJThread loadObjThread;
20002412
20012413 class LoadOBJThread extends Thread
....@@ -2074,19 +2486,19 @@
20742486
20752487 void LoadObjFile(String fullname)
20762488 {
2077
- /*
2489
+ System.out.println("Loading " + fullname);
2490
+ /**/
20782491 //lastFilename = fullname;
20792492 if(loadObjThread == null)
20802493 {
2081
- loadObjThread = new LoadOBJThread();
2082
- loadObjThread.start();
2494
+ loadObjThread = new LoadOBJThread();
2495
+ loadObjThread.start();
20832496 }
20842497
20852498 loadObjThread.add(fullname);
2086
- */
2499
+ /**/
20872500
2088
- System.out.println("Loading " + fullname);
2089
- makeSomething(new FileObject(fullname, true), true);
2501
+ //makeSomething(new FileObject(fullname, true), true);
20902502 }
20912503
20922504 void LoadGFDFile(String fullname)
....@@ -2347,11 +2759,11 @@
23472759
23482760 void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
23492761 {
2350
- if (GrafreeD.standAlone)
2762
+ if (Grafreed.standAlone)
23512763 {
23522764 /**/
23532765 FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2354
- browser.show();
2766
+ browser.setVisible(true);
23552767 String filename = browser.getFile();
23562768 if (filename != null && filename.length() > 0)
23572769 {
....@@ -2462,6 +2874,7 @@
24622874 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
24632875 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
24642876 }
2877
+
24652878 //cJME.count++;
24662879 //cJME.count %= 12;
24672880 if (gc)
....@@ -2496,6 +2909,7 @@
24962909 }
24972910 if (input == null)
24982911 {
2912
+ new Exception().printStackTrace();
24992913 System.exit(0);
25002914 }
25012915
....@@ -2644,6 +3058,7 @@
26443058 }
26453059 }
26463060 }
3061
+
26473062 cFileSystemPane FSPane;
26483063
26493064 void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2653,7 +3068,7 @@
26533068
26543069 freezematerial = true;
26553070 colorField.setFloat(mat.color);
2656
- modulationField.setFloat(mat.modulation);
3071
+ saturationField.setFloat(mat.modulation);
26573072 metalnessField.setFloat(mat.metalness);
26583073 diffuseField.setFloat(mat.diffuse);
26593074 specularField.setFloat(mat.specular);
....@@ -2697,11 +3112,14 @@
26973112 }
26983113 }
26993114 }
3115
+
27003116 freezematerial = false;
27013117 }
27023118
27033119 void SetMaterial(Object3D object)
27043120 {
3121
+ latestObject = object;
3122
+
27053123 cMaterial mat = object.material;
27063124
27073125 if (mat == null)
....@@ -2710,7 +3128,8 @@
27103128 return;
27113129 }
27123130
2713
- multiplyToggle.setSelected(mat.multiply);
3131
+ if (multiplyToggle != null)
3132
+ multiplyToggle.setSelected(mat.multiply);
27143133
27153134 assert (object.projectedVertices != null);
27163135
....@@ -2812,12 +3231,17 @@
28123231 // }
28133232
28143233 /**/
2815
- if (deselect)
3234
+ if (deselect || child == null)
28163235 {
28173236 //group.deselectAll();
28183237 //freeze = true;
28193238 GetTree().clearSelection();
28203239 //freeze = false;
3240
+
3241
+ if (child == null)
3242
+ {
3243
+ return;
3244
+ }
28213245 }
28223246
28233247 //group.addSelectee(child);
....@@ -2886,7 +3310,7 @@
28863310 cameraView.ToggleDL();
28873311 cameraView.repaint();
28883312 return;
2889
- } else if (event.getSource() == toggleTextureItem)
3313
+ } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
28903314 {
28913315 cameraView.ToggleTexture();
28923316 // june 2013 copy.HardTouch();
....@@ -2925,9 +3349,9 @@
29253349 frame.validate();
29263350
29273351 return;
2928
- } else if (event.getSource() == toggleRandomItem)
3352
+ } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
29293353 {
2930
- cameraView.ToggleRandom();
3354
+ cameraView.ToggleSwitch();
29313355 cameraView.repaint();
29323356 return;
29333357 } else if (event.getSource() == toggleHandleItem)
....@@ -2955,12 +3379,17 @@
29553379 } else if (event.getSource() == liveCB)
29563380 {
29573381 copy.live ^= true;
3382
+ objEditor.refreshContents(true); // To show item colors
3383
+ return;
3384
+ } else if (event.getSource() == selectableCB)
3385
+ {
3386
+ copy.dontselect ^= true;
29583387 return;
29593388 } else if (event.getSource() == hideCB)
29603389 {
29613390 copy.hide ^= true;
29623391 copy.Touch(); // display list issue
2963
- objEditor.refreshContents();
3392
+ objEditor.refreshContents(true); // To show item colors
29643393 return;
29653394 } else if (event.getSource() == link2masterCB)
29663395 {
....@@ -2970,6 +3399,7 @@
29703399 if (event.getSource() == randomCB)
29713400 {
29723401 copy.random ^= true;
3402
+ objEditor.refreshContents();
29733403 return;
29743404 }
29753405 if (event.getSource() == speedupCB)
....@@ -2993,8 +3423,9 @@
29933423
29943424 public void actionPerformed(ActionEvent event)
29953425 {
3426
+ Object source = event.getSource();
29963427 // SCRIPT DIALOG
2997
- if (event.getSource() == okbutton)
3428
+ if (source == okbutton)
29983429 {
29993430 textpanel.setVisible(false);
30003431 textpanel.remove(textarea);
....@@ -3006,7 +3437,7 @@
30063437 textarea = null;
30073438 textpanel = null;
30083439 }
3009
- if (event.getSource() == cancelbutton)
3440
+ if (source == cancelbutton)
30103441 {
30113442 textpanel.setVisible(false);
30123443 textpanel.remove(textarea);
....@@ -3018,50 +3449,50 @@
30183449 //applySelf();
30193450 //client.refreshEditWindow();
30203451 //refreshContents();
3021
- if (event.getSource() == nameField)
3452
+ if (source == nameField)
30223453 {
30233454 //System.out.println("ObjEditor " + event);
30243455 applySelf0(true);
30253456 //parent.applySelf();
30263457 objEditor.refreshContents();
3027
- } else if (event.getSource() == resetButton)
3458
+ } else if (source == resetButton)
30283459 {
30293460 CameraPane.fullreset = true;
30303461 copy.Reset(); // ResetMeshes();
30313462 copy.Touch();
30323463 objEditor.refreshContents();
3033
- } else if (event.getSource() == stepItem)
3464
+ } else if (source == stepItem)
30343465 {
30353466 //cameraView.ONESTEP = true;
30363467 Globals.ONESTEP = true;
30373468 cameraView.repaint();
30383469 return;
3039
- } else if (event.getSource() == stepButton)
3470
+ } else if (source == stepButton)
30403471 {
30413472 copy.Step();
30423473 copy.Touch();
30433474 objEditor.refreshContents();
3044
- } else if (event.getSource() == slowerButton)
3475
+ } else if (source == slowerButton)
30453476 {
30463477 copy.Slower();
30473478 copy.Touch();
30483479 objEditor.refreshContents();
3049
- } else if (event.getSource() == fasterButton)
3480
+ } else if (source == fasterButton)
30503481 {
30513482 copy.Faster();
30523483 copy.Touch();
30533484 objEditor.refreshContents();
3054
- } else if (event.getSource() == remarkButton)
3485
+ } else if (source == remarkButton)
30553486 {
30563487 copy.Remark();
30573488 copy.Touch();
30583489 objEditor.refreshContents();
3059
- } else if (event.getSource() == stepAllButton)
3490
+ } else if (source == stepAllButton)
30603491 {
30613492 copy.StepAll();
30623493 copy.Touch();
30633494 objEditor.refreshContents();
3064
- } else if (event.getSource() == resetAllButton)
3495
+ } else if (source == resetAllButton)
30653496 {
30663497 //CameraPane.fullreset = true;
30673498 copy.ResetAll(); // ResetMeshes();
....@@ -3094,53 +3525,79 @@
30943525 // Close();
30953526 // }
30963527 // else
3097
- if (event.getSource() == resetSlidersButton)
3528
+ if (source == resetSlidersButton)
30983529 {
30993530 ResetSliders();
3100
- } else if (event.getSource() == clearMaterialButton)
3531
+ } else if (source == clearMaterialButton)
31013532 {
31023533 ClearMaterial();
3103
- } else if (event.getSource() == createMaterialButton)
3534
+ } else if (source == createMaterialButton)
31043535 {
31053536 CreateMaterial();
3106
- } else if (event.getSource() == clearPanelButton)
3537
+ } else if (source == clearPanelButton)
31073538 {
31083539 copy.ClearUI();
31093540 refreshContents(true);
3110
- } /*
3111
- }
3112
-
3113
- public boolean action(Event event, Object arg)
3114
- {
3115
- */ else if (event.getSource() == closeItem)
3541
+ } else if (source == importGFDItem)
3542
+ {
3543
+ ImportGFD();
3544
+ } else
3545
+ if (source == importVRMLX3DItem)
3546
+ {
3547
+ ImportVRMLX3D();
3548
+ } else
3549
+ if (source == import3DSItem)
3550
+ {
3551
+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
3552
+ } else
3553
+ if (source == importOBJItem)
3554
+ {
3555
+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
3556
+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
3557
+ browser.setVisible(true);
3558
+ String filename = browser.getFile();
3559
+ if (filename != null && filename.length() > 0)
3560
+ {
3561
+ String fullname = browser.getDirectory() + filename;
3562
+ makeSomething(ReadOBJ(fullname), true);
3563
+ }
3564
+ } else
3565
+ if (source == closeItem)
31163566 {
31173567 Close();
31183568 //return true;
3119
- } else if (event.getSource() == loadItem)
3569
+ } else if (source == openItem)
31203570 {
3121
- load();
3571
+ Open();
31223572 //return true;
3123
- } else if (event.getSource() == saveItem)
3573
+ } else if (source == newItem)
3574
+ {
3575
+ New();
3576
+ } else if (source == saveItem)
31243577 {
31253578 save();
31263579 //return true;
3127
- } else if (event.getSource() == saveAsItem)
3580
+ } else if (source == saveAsItem)
31283581 {
31293582 saveAs();
31303583 //return true;
3131
- } else if (event.getSource() == reexportItem)
3584
+ } else if (source == reexportItem)
31323585 {
31333586 reexport();
31343587 //return true;
3135
- } else if (event.getSource() == exportAsItem)
3588
+ } else if (source == exportAsItem)
31363589 {
31373590 export();
31383591 //return true;
3139
- } else if (event.getSource() == povItem)
3592
+ } else if (source == povItem)
31403593 {
31413594 generatePOV();
31423595 //return true;
3143
- } else if (event.getSource() == zBufferItem)
3596
+ } else if (event.getSource() == archiveItem)
3597
+ {
3598
+ cTools.Archive(frame);
3599
+ return;
3600
+ } else if (source == zBufferItem)
31443601 {
31453602 try
31463603 {
....@@ -3162,21 +3619,8 @@
31623619 cameraView.repaint();
31633620 //return true;
31643621 }
3165
- */ else if (event.getSource() == editCameraItem)
3166
- {
3167
- cameraView.ProtectCamera();
3168
- cameraView.repaint();
3169
- return;
3170
- } else if (event.getSource() == revertCameraItem)
3171
- {
3172
- cameraView.RevertCamera();
3173
- cameraView.repaint();
3174
- return;
3175
-// } else if (event.getSource() == textureButton)
3176
-// {
3177
-// return; // true;
3178
- } else // combos...
3179
- if (event.getSource() == texresMenu)
3622
+ */ else // combos...
3623
+ if (source == texresMenu)
31803624 {
31813625 System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
31823626 copy.texres = texresMenu.getSelectedIndex();
....@@ -3188,12 +3632,472 @@
31883632 }
31893633 }
31903634
3635
+ void New()
3636
+ {
3637
+ while (copy.Size() > 1)
3638
+ {
3639
+ copy.remove(1);
3640
+ }
3641
+
3642
+ ResetModel();
3643
+ objEditor.refreshContents();
3644
+ }
3645
+
3646
+ static public byte[] Compress(Object3D o)
3647
+ {
3648
+ // Slower to actually compress.
3649
+ try
3650
+ {
3651
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
3652
+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3653
+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3654
+
3655
+ Object3D parent = o.parent;
3656
+ o.parent = null;
3657
+
3658
+ out.writeObject(o);
3659
+
3660
+ o.parent = parent;
3661
+
3662
+ out.flush();
3663
+
3664
+ baos //zstream
3665
+ .close();
3666
+ out.close();
3667
+
3668
+ byte[] bytes = baos.toByteArray();
3669
+
3670
+ System.out.println("save #bytes = " + bytes.length);
3671
+ return bytes;
3672
+ } catch (Exception e)
3673
+ {
3674
+ System.err.println(e);
3675
+ return null;
3676
+ }
3677
+ }
3678
+
3679
+ static public Object Uncompress(byte[] bytes)
3680
+ {
3681
+ System.out.println("restore #bytes = " + bytes.length);
3682
+ try
3683
+ {
3684
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3685
+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3686
+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3687
+ Object obj = in.readObject();
3688
+
3689
+ bais //istream
3690
+ .close();
3691
+ in.close();
3692
+
3693
+ return obj;
3694
+ } catch (Exception e)
3695
+ {
3696
+ System.err.println(e);
3697
+ return null;
3698
+ }
3699
+ }
3700
+
3701
+ static public Object clone(Object o)
3702
+ {
3703
+ try
3704
+ {
3705
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
3706
+ ObjectOutputStream out = new ObjectOutputStream(baos);
3707
+
3708
+ out.writeObject(o);
3709
+
3710
+ out.flush();
3711
+ out.close();
3712
+
3713
+ byte[] bytes = baos.toByteArray();
3714
+
3715
+ System.out.println("clone = " + bytes.length);
3716
+
3717
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3718
+ ObjectInputStream in = new ObjectInputStream(bais);
3719
+ Object obj = in.readObject();
3720
+ in.close();
3721
+
3722
+ return obj;
3723
+ } catch (Exception e)
3724
+ {
3725
+ System.err.println(e);
3726
+ return null;
3727
+ }
3728
+ }
3729
+
3730
+ cRadio GetCurrentTab()
3731
+ {
3732
+ cRadio ab;
3733
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3734
+ {
3735
+ ab = (cRadio)e.nextElement();
3736
+ if(ab.GetObject() == copy)
3737
+ {
3738
+ return ab;
3739
+ }
3740
+ }
3741
+
3742
+ return null;
3743
+ }
3744
+
3745
+
3746
+ public void Save()
3747
+ {
3748
+ //Save(true);
3749
+ Replace();
3750
+ SetUndoStates();
3751
+ }
3752
+
3753
+ private boolean Equal(byte[] compress, byte[] name)
3754
+ {
3755
+ if (compress.length != name.length)
3756
+ {
3757
+ return false;
3758
+ }
3759
+
3760
+ for (int i=compress.length; --i>=0;)
3761
+ {
3762
+ if (compress[i] != name[i])
3763
+ return false;
3764
+ }
3765
+
3766
+ return true;
3767
+ }
3768
+
3769
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3770
+
3771
+ void DeleteVersion()
3772
+ {
3773
+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
3774
+ {
3775
+ copy.versionlist[i] = copy.versionlist[i+1];
3776
+ }
3777
+
3778
+ CopyChanged();
3779
+
3780
+ SetUndoStates();
3781
+ }
3782
+
3783
+ public boolean Save(boolean user)
3784
+ {
3785
+ System.err.println("Save");
3786
+ //Replace();
3787
+
3788
+ cRadio tab = GetCurrentTab();
3789
+
3790
+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
3791
+
3792
+ boolean thesame = false;
3793
+
3794
+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3795
+// {
3796
+// thesame = true;
3797
+// }
3798
+
3799
+ //EditorFrame.m_MainFrame.requestFocusInWindow();
3800
+ if (!thesame)
3801
+ {
3802
+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
3803
+ {
3804
+ copy.versionlist[i] = copy.versionlist[i-1];
3805
+ }
3806
+
3807
+ //tab.user[tab.versionindex] = user;
3808
+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
3809
+
3810
+ copy.versionlist[++copy.versionindex] = compress;
3811
+
3812
+ // if (increment)
3813
+ // tab.versionindex++;
3814
+ }
3815
+
3816
+ //copy.RestoreBigData(versiontable);
3817
+
3818
+ //assert(hashtable.isEmpty());
3819
+
3820
+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
3821
+// {
3822
+// //tab.user[i] = false;
3823
+// copy.versionlist[i] = null;
3824
+// }
3825
+
3826
+ SetUndoStates();
3827
+
3828
+ // test save
3829
+ if (false)
3830
+ {
3831
+ try
3832
+ {
3833
+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3834
+ ObjectOutputStream p = new ObjectOutputStream(ostream);
3835
+
3836
+ p.writeObject(copy);
3837
+
3838
+ p.flush();
3839
+
3840
+ ostream.close();
3841
+ } catch (Exception e)
3842
+ {
3843
+ e.printStackTrace();
3844
+ }
3845
+ }
3846
+
3847
+ return !thesame;
3848
+ }
3849
+
3850
+ boolean flashIt = true;
3851
+
3852
+ void RefreshSelection()
3853
+ {
3854
+ Object3D selection = new Object3D();
3855
+
3856
+ for (int i = 0; i < copy.selection.size(); i++)
3857
+ {
3858
+ Object3D elem = copy.selection.elementAt(i);
3859
+
3860
+ Object3D obj = copy.GetObject(elem.GetUUID());
3861
+
3862
+ if (obj == null)
3863
+ {
3864
+ copy.selection.remove(i--);
3865
+ }
3866
+ else
3867
+ {
3868
+ selection.add(obj);
3869
+ copy.selection.setElementAt(obj, i);
3870
+ }
3871
+ }
3872
+
3873
+ flashIt = false;
3874
+ GetTree().clearSelection();
3875
+ for (int i = 0; i < selection.size(); i++)
3876
+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
3877
+ flashIt = true;
3878
+
3879
+ //refreshContents(false);
3880
+ }
3881
+
3882
+ void CopyChanged()
3883
+ {
3884
+ Object3D obj = copy.versionlist[copy.versionindex];
3885
+
3886
+ SetUndoStates();
3887
+
3888
+ boolean temp = CameraPane.SWITCH;
3889
+ CameraPane.SWITCH = false;
3890
+
3891
+ copy.ExtractBigData(versiontable);
3892
+
3893
+ copy.clear();
3894
+
3895
+ copy.skyboxname = obj.skyboxname;
3896
+ copy.skyboxext = obj.skyboxext;
3897
+
3898
+ for (int i=0; i<obj.Size(); i++)
3899
+ {
3900
+ copy.add(obj.get(i));
3901
+ }
3902
+
3903
+ copy.RestoreBigData(versiontable);
3904
+
3905
+ CameraPane.SWITCH = temp;
3906
+
3907
+ RefreshSelection();
3908
+ //assert(hashtable.isEmpty());
3909
+
3910
+ copy.Touch();
3911
+
3912
+ ResetModel();
3913
+ copy.HardTouch(); // recompile?
3914
+
3915
+ cRadio ab;
3916
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3917
+ {
3918
+ ab = (cRadio)e.nextElement();
3919
+ Object3D test = copy.GetObject(ab.object.GetUUID());
3920
+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3921
+ if (test != null)
3922
+ {
3923
+ test.editWindow = ab.object.editWindow;
3924
+ ab.object = test;
3925
+ }
3926
+ }
3927
+
3928
+ refreshContents(true);
3929
+ }
3930
+
3931
+ cButton previousVersionButton;
3932
+ cButton restoreButton;
3933
+ cButton replaceButton;
3934
+ cButton nextVersionButton;
3935
+ cButton saveVersionButton;
3936
+ cButton deleteVersionButton;
3937
+
3938
+ boolean muteSlider;
3939
+
3940
+ int VersionCount()
3941
+ {
3942
+ int count = 0;
3943
+
3944
+ for (int i = copy.versionlist.length; --i >= 0;)
3945
+ {
3946
+ if (copy.versionlist[i] != null)
3947
+ count++;
3948
+ }
3949
+
3950
+ return count;
3951
+ }
3952
+
3953
+ void SetUndoStates()
3954
+ {
3955
+ cRadio tab = GetCurrentTab();
3956
+
3957
+ restoreButton.setEnabled(true); // copy.versionindex != -1);
3958
+ replaceButton.setEnabled(true); // copy.versionindex != -1);
3959
+
3960
+ previousVersionButton.setEnabled(copy.versionindex > 0);
3961
+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
3962
+
3963
+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
3964
+ copy.versionlist[copy.versionindex + 1] != null);
3965
+
3966
+ muteSlider = true;
3967
+ versionSlider.setMaximum(VersionCount() - 1);
3968
+ versionSlider.setInteger(copy.versionindex);
3969
+ muteSlider = false;
3970
+ }
3971
+
3972
+ public boolean PreviousVersion()
3973
+ {
3974
+ // Option?
3975
+ Replace();
3976
+
3977
+ System.err.println("Undo");
3978
+
3979
+ cRadio tab = GetCurrentTab();
3980
+
3981
+ if (copy.versionindex == 0)
3982
+ {
3983
+ java.awt.Toolkit.getDefaultToolkit().beep();
3984
+ return false;
3985
+ }
3986
+
3987
+// if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
3988
+// {
3989
+// if (Save(false))
3990
+// tab.versionindex -= 1;
3991
+// else
3992
+// {
3993
+// if (tab.versionindex <= 0)
3994
+// return false;
3995
+// else
3996
+// tab.versionindex -= 1;
3997
+// }
3998
+// }
3999
+
4000
+ copy.versionindex -= 1;
4001
+
4002
+ CopyChanged();
4003
+
4004
+ return true;
4005
+ }
4006
+
4007
+ public boolean Restore()
4008
+ {
4009
+ System.err.println("Restore");
4010
+
4011
+ cRadio tab = GetCurrentTab();
4012
+
4013
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4014
+ {
4015
+ java.awt.Toolkit.getDefaultToolkit().beep();
4016
+ return false;
4017
+ }
4018
+
4019
+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4020
+ CopyChanged();
4021
+
4022
+ return true;
4023
+ }
4024
+
4025
+ public boolean Replace()
4026
+ {
4027
+ System.err.println("Replace");
4028
+
4029
+ cRadio tab = GetCurrentTab();
4030
+
4031
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4032
+ {
4033
+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
4034
+ return false;
4035
+ }
4036
+
4037
+ copy.versionlist[copy.versionindex] = CompressCopy();
4038
+
4039
+ return true;
4040
+ }
4041
+
4042
+ public void NextVersion()
4043
+ {
4044
+ // Option?
4045
+ Replace();
4046
+
4047
+ cRadio tab = GetCurrentTab();
4048
+
4049
+ if (copy.versionlist[copy.versionindex + 1] == null)
4050
+ {
4051
+ java.awt.Toolkit.getDefaultToolkit().beep();
4052
+ return;
4053
+ }
4054
+
4055
+ copy.versionindex += 1;
4056
+
4057
+ CopyChanged();
4058
+
4059
+ //if (!tab.user[tab.versionindex])
4060
+ // tab.graphs[tab.versionindex] = null;
4061
+ }
4062
+
4063
+ void ImportGFD()
4064
+ {
4065
+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4066
+ browser.show();
4067
+ String filename = browser.getFile();
4068
+ if (filename != null && filename.length() > 0)
4069
+ {
4070
+ String fullname = browser.getDirectory() + filename;
4071
+
4072
+ //Object3D readobj =
4073
+ objEditor.ReadGFD(fullname, objEditor);
4074
+ //makeSomething(readobj);
4075
+ }
4076
+ }
4077
+
4078
+ void ImportVRMLX3D()
4079
+ {
4080
+ if (Grafreed.standAlone)
4081
+ {
4082
+ /**/
4083
+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4084
+ browser.show();
4085
+ String filename = browser.getFile();
4086
+ if (filename != null && filename.length() > 0)
4087
+ {
4088
+ String fullname = browser.getDirectory() + filename;
4089
+ LoadVRMLX3D(fullname);
4090
+ }
4091
+ /**/
4092
+ }
4093
+ }
4094
+
31914095 void ToggleAnimation()
31924096 {
31934097 if (!Globals.ANIMATION)
31944098 {
31954099 FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3196
- browser.show();
4100
+ browser.setVisible(true);
31974101 String filename = browser.getFile();
31984102 if (filename != null && filename.length() > 0)
31994103 {
....@@ -3203,8 +4107,8 @@
32034107
32044108 Globals.ANIMATION ^= true;
32054109
3206
- GrafreeD.wav.cursor = 0;
3207
- GrafreeD.wav.loop = 0;
4110
+ Grafreed.wav.cursor = 0;
4111
+ Grafreed.wav.loop = 0;
32084112 }
32094113 } else
32104114 {
....@@ -3254,7 +4158,7 @@
32544158 void CreateMaterial()
32554159 {
32564160 //copy.ClearMaterial(); // PATCH
3257
- copy.CreateMaterialS(multiplyToggle.isSelected());
4161
+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
32584162 if (copy.selection.size() > 0)
32594163 //SetMaterial(copy);
32604164 {
....@@ -3305,7 +4209,7 @@
33054209 assert false;
33064210 }
33074211
3308
- void EditSelection()
4212
+ void EditSelection(boolean newWindow)
33094213 {
33104214 }
33114215
....@@ -3313,11 +4217,11 @@
33134217 {
33144218 copy.ResetBlockLoop(); // temporary problem
33154219
3316
- boolean random = CameraPane.RANDOM;
3317
- CameraPane.RANDOM = false; // parse everything
4220
+ boolean random = CameraPane.SWITCH;
4221
+ CameraPane.SWITCH = false; // parse everything
33184222 copy.ResetDisplayList();
33194223 copy.HardTouch();
3320
- CameraPane.RANDOM = random;
4224
+ CameraPane.SWITCH = random;
33214225 }
33224226
33234227 // public void applySelf()
....@@ -3364,7 +4268,7 @@
33644268 //copy.material = new cMaterial(copy.GetMaterial());
33654269
33664270 current.color = (float) colorField.getFloat();
3367
- current.modulation = (float) modulationField.getFloat();
4271
+ current.modulation = (float) saturationField.getFloat();
33684272 current.metalness = (float) metalnessField.getFloat();
33694273 current.diffuse = (float) diffuseField.getFloat();
33704274 current.specular = (float) specularField.getFloat();
....@@ -3391,6 +4295,36 @@
33914295 {
33924296 //System.out.println("Propagate = " + propagate);
33934297 copy.UpdateMaterial(anchor, current, propagate);
4298
+
4299
+ if (copy.material != null)
4300
+ {
4301
+ cMaterial mat = copy.material;
4302
+
4303
+ colorField.SetToolTipValue((mat.color));
4304
+ saturationField.SetToolTipValue((mat.modulation));
4305
+ metalnessField.SetToolTipValue((mat.metalness));
4306
+ diffuseField.SetToolTipValue((mat.diffuse));
4307
+ specularField.SetToolTipValue((mat.specular));
4308
+ shininessField.SetToolTipValue((mat.shininess));
4309
+ shiftField.SetToolTipValue((mat.shift));
4310
+ ambientField.SetToolTipValue((mat.ambient));
4311
+ lightareaField.SetToolTipValue((mat.lightarea));
4312
+ diffusenessField.SetToolTipValue((mat.factor));
4313
+ velvetField.SetToolTipValue((mat.velvet));
4314
+ sheenField.SetToolTipValue((mat.sheen));
4315
+ subsurfaceField.SetToolTipValue((mat.subsurface));
4316
+ backlitField.SetToolTipValue((mat.bump));
4317
+ anisoField.SetToolTipValue((mat.aniso));
4318
+ anisoVField.SetToolTipValue((mat.anisoV));
4319
+ cameraField.SetToolTipValue((mat.cameralight));
4320
+ selfshadowField.SetToolTipValue((mat.diffuseness));
4321
+ shadowField.SetToolTipValue((mat.shadow));
4322
+ textureField.SetToolTipValue((mat.texture));
4323
+ opacityField.SetToolTipValue((mat.opacity));
4324
+ fakedepthField.SetToolTipValue((mat.fakedepth));
4325
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4326
+ }
4327
+
33944328 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
33954329 {
33964330 copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
....@@ -3419,9 +4353,26 @@
34194353 //copy.Touch();
34204354 }
34214355
4356
+ cNumberSlider versionSlider;
4357
+
34224358 public void stateChanged(ChangeEvent e)
34234359 {
34244360 // assert(false);
4361
+ if (e.getSource() == versionSlider)
4362
+ {
4363
+ if (muteSlider)
4364
+ return;
4365
+
4366
+ int version = versionSlider.getInteger();
4367
+
4368
+ if (copy.versionlist[version] != null)
4369
+ {
4370
+ copy.versionindex = version;
4371
+ CopyChanged();
4372
+ }
4373
+
4374
+ return;
4375
+ }
34254376
34264377 if (freezematerial)
34274378 {
....@@ -3435,6 +4386,7 @@
34354386 || e.getSource() == apertureField
34364387 || e.getSource() == shadowblurField)
34374388 {
4389
+ new Exception().printStackTrace();
34384390 System.exit(0);
34394391 cameraView.options1[0] = (float) focusField.getFloat() * 10;
34404392 cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
....@@ -3456,6 +4408,12 @@
34564408 {
34574409 //System.out.println("stateChanged = " + this);
34584410 materialtouched = true;
4411
+
4412
+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4413
+ {
4414
+ saturationField.setFloat(1);
4415
+ }
4416
+
34594417 applySelf();
34604418 //System.out.println("this = " + this);
34614419 //System.out.println("PARENT = " + parent);
....@@ -3505,7 +4463,7 @@
35054463 }
35064464
35074465 if (normalpushField != null)
3508
- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
4466
+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35094467 }
35104468
35114469 void SnapObject()
....@@ -3755,6 +4713,7 @@
37554713 {
37564714 if (GetTree() != null)
37574715 {
4716
+ GetTree().revalidate();
37584717 GetTree().repaint();
37594718 }
37604719
....@@ -3763,12 +4722,17 @@
37634722 ctrlPanel.validate(); // ? new
37644723 ctrlPanel.repaint();
37654724 }
4725
+
4726
+ if (previousVersionButton != null && copy.versionlist != null)
4727
+ SetUndoStates();
37664728 }
37674729
37684730 static TweenManager tweenManager = new TweenManager();
37694731
37704732 void makeSomething(Object3D thing, boolean resetmodel) // deselect)
37714733 {
4734
+ if (Globals.REPLACEONMAKE) // && resetmodel)
4735
+ Save();
37724736 //Tween.set(thing, 0).target(1).start(tweenManager);
37734737 //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
37744738 // if (thing instanceof GenericJointDemo)
....@@ -3855,6 +4819,12 @@
38554819 {
38564820 ResetModel();
38574821 Select(thing.GetTreePath(), true, false); // unselect... false);
4822
+
4823
+ if (thing.Size() == 0)
4824
+ {
4825
+ //EditSelection(false);
4826
+ }
4827
+
38584828 refreshContents();
38594829 }
38604830
....@@ -3972,6 +4942,7 @@
39724942 }
39734943 }
39744944 }
4945
+
39754946 LoadGFDThread loadGFDThread;
39764947
39774948 void ReadGFD(String fullname, iCallBack cb)
....@@ -3991,8 +4962,10 @@
39914962
39924963 try
39934964 {
4965
+ // Try compressed version first.
39944966 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3995
- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4967
+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4968
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
39964969
39974970 readobj = (Object3D) p.readObject();
39984971 istream.close();
....@@ -4000,7 +4973,22 @@
40004973 readobj.ResetDisplayList();
40014974 } catch (Exception e)
40024975 {
4003
- e.printStackTrace();
4976
+ if (!e.toString().contains("GZIP"))
4977
+ e.printStackTrace();
4978
+
4979
+ try
4980
+ {
4981
+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4982
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4983
+
4984
+ readobj = (Object3D) p.readObject();
4985
+ istream.close();
4986
+
4987
+ readobj.ResetDisplayList();
4988
+ } catch (Exception e2)
4989
+ {
4990
+ e2.printStackTrace();
4991
+ }
40044992 }
40054993 // catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
40064994 // catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4046,6 +5034,12 @@
40465034
40475035 void LoadIt(Object obj)
40485036 {
5037
+ if (obj == null)
5038
+ {
5039
+ // Invalid file
5040
+ return;
5041
+ }
5042
+
40495043 System.out.println("Loaded " + obj);
40505044 //new Exception().printStackTrace();
40515045 Object3D readobj = (Object3D) obj;
....@@ -4055,10 +5049,14 @@
40555049
40565050 if (readobj != null)
40575051 {
5052
+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
5053
+ // Save();
40585054 try
40595055 {
40605056 //readobj.deepCopySelf(copy);
40615057 copy.clear(); // june 2014
5058
+ copy.skyboxname = readobj.skyboxname;
5059
+ copy.skyboxext = readobj.skyboxext;
40625060 for (int i = 0; i < readobj.size(); i++)
40635061 {
40645062 Object3D child = readobj.get(i); // reserve(i);
....@@ -4099,6 +5097,7 @@
40995097 }
41005098 } catch (ClassCastException e)
41015099 {
5100
+ e.printStackTrace();
41025101 assert (false);
41035102 Composite c = (Composite) copy;
41045103 c.children.clear();
....@@ -4109,17 +5108,28 @@
41095108 c.addChild(csg);
41105109 }
41115110
5111
+ copy.versionlist = readobj.versionlist;
5112
+ copy.versionindex = readobj.versionindex;
5113
+
5114
+ if (copy.versionlist == null)
5115
+ {
5116
+ copy.versionlist = new Object3D[100];
5117
+ copy.versionindex = -1;
5118
+ }
5119
+
5120
+ //? SetUndoStates();
5121
+
41125122 ResetModel();
41135123 copy.HardTouch(); // recompile?
41145124 refreshContents();
41155125 }
41165126 }
41175127
4118
- void load() // throws ClassNotFoundException
5128
+ void Open() // throws ClassNotFoundException
41195129 {
4120
- if (GrafreeD.standAlone)
5130
+ if (Grafreed.standAlone)
41215131 {
4122
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5132
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
41235133 browser.show();
41245134 String filename = browser.getFile();
41255135 if (filename != null && filename.length() > 0)
....@@ -4204,11 +5214,13 @@
42045214 try
42055215 {
42065216 FileOutputStream ostream = new FileOutputStream(lastname);
4207
- ObjectOutputStream p = new ObjectOutputStream(ostream);
5217
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
5218
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
42085219
42095220 p.writeObject(copy);
42105221 p.flush();
42115222
5223
+ zstream.close();
42125224 ostream.close();
42135225
42145226 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4216,19 +5228,23 @@
42165228 //ps.print(buffer.toString());
42175229 } catch (IOException e)
42185230 {
5231
+ e.printStackTrace();
42195232 }
42205233 }
5234
+
42215235 String lastname;
42225236
42235237 void saveAs()
42245238 {
4225
- if (GrafreeD.standAlone)
5239
+ if (Grafreed.standAlone)
42265240 {
42275241 FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
42285242 browser.setVisible(true);
42295243 String filename = browser.getFile();
42305244 if (filename != null && filename.length() > 0)
42315245 {
5246
+ if (!filename.endsWith(".gfd"))
5247
+ filename += ".gfd";
42325248 lastname = browser.getDirectory() + filename;
42335249 save();
42345250 }
....@@ -4327,13 +5343,13 @@
43275343 try
43285344 {
43295345 FileOutputStream ostream = new FileOutputStream(filename);
4330
- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4331
- ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
5346
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
5347
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
43325348
43335349 Object3D objectparent = obj.parent;
43345350 obj.parent = null;
43355351
4336
- Object3D object = (Object3D) GrafreeD.clone(obj);
5352
+ Object3D object = (Object3D) Grafreed.clone(obj);
43375353
43385354 obj.parent = objectparent;
43395355
....@@ -4345,8 +5361,8 @@
43455361 p.writeObject(object);
43465362 p.flush();
43475363
5364
+ zstream.close();
43485365 ostream.close();
4349
- // zstream.close();
43505366
43515367 // group.selection.get(0).parent = parent;
43525368 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4367,7 +5383,7 @@
43675383 buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
43685384 cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
43695385 copy.generatePOV(buffer);
4370
- if (GrafreeD.standAlone)
5386
+ if (Grafreed.standAlone)
43715387 {
43725388 FileDialog browser = new FileDialog(frame, "Export POV", 1);
43735389 browser.show();
....@@ -4393,21 +5409,20 @@
43935409 Object3D client;
43945410 Object3D copy;
43955411 MenuBar menuBar;
4396
- Menu windowMenu;
4397
- MenuItem loadItem;
5412
+ Menu fileMenu;
5413
+ MenuItem newItem;
5414
+ MenuItem openItem;
43985415 MenuItem saveItem;
43995416 MenuItem saveAsItem;
44005417 MenuItem exportAsItem;
44015418 MenuItem reexportItem;
44025419 MenuItem povItem;
44035420 MenuItem closeItem;
4404
- Menu cameraMenu;
5421
+
44055422 CheckboxMenuItem zBufferItem;
44065423 //MenuItem normalLensItem;
4407
- MenuItem editCameraItem;
4408
- MenuItem revertCameraItem;
4409
- CheckboxMenuItem toggleLiveItem;
44105424 MenuItem stepItem;
5425
+ CheckboxMenuItem toggleLiveItem;
44115426 CheckboxMenuItem toggleFullScreenItem;
44125427 CheckboxMenuItem toggleTimelineItem;
44135428 CheckboxMenuItem toggleRenderItem;
....@@ -4416,25 +5431,39 @@
44165431 CheckboxMenuItem toggleFootContactItem;
44175432 CheckboxMenuItem toggleDLItem;
44185433 CheckboxMenuItem toggleTextureItem;
4419
- CheckboxMenuItem toggleRandomItem;
5434
+ CheckboxMenuItem toggleSwitchItem;
44205435 CheckboxMenuItem toggleRootItem;
44215436 CheckboxMenuItem animationItem;
5437
+ MenuItem archiveItem;
44225438 CheckboxMenuItem toggleHandleItem;
44235439 CheckboxMenuItem togglePaintItem;
44245440 JSplitPane mainPanel;
44255441 JScrollPane scrollpane;
5442
+
44265443 JPanel toolbarPanel;
4427
- JPanel treePanel;
5444
+
5445
+ cGridBag treePanel;
5446
+
44285447 JPanel radioPanel;
44295448 ButtonGroup buttonGroup;
4430
- cGridBag ctrlPanel;
5449
+
5450
+ cGridBag toolboxPanel;
44315451 cGridBag materialPanel;
5452
+ cGridBag ctrlPanel;
5453
+
44325454 JScrollPane infoPanel;
5455
+
44335456 cGridBag optionsPanel;
5457
+
44345458 JTabbedPane objectPanel;
5459
+ boolean materialFlushed;
5460
+ Object3D latestObject;
5461
+
44355462 cGridBag XYZPanel;
5463
+
44365464 JSplitPane gridPanel;
44375465 JSplitPane bigPanel;
5466
+
44385467 cGridBag bigThree;
44395468 cGridBag scenePanel;
44405469 cGridBag centralPanel;
....@@ -4492,7 +5521,7 @@
44925521 JLabel colorLabel;
44935522 cNumberSlider colorField;
44945523 JLabel modulationLabel;
4495
- cNumberSlider modulationField;
5524
+ cNumberSlider saturationField;
44965525 JLabel metalnessLabel;
44975526 cNumberSlider metalnessField;
44985527 JLabel diffuseLabel;
....@@ -4549,8 +5578,13 @@
45495578 cNumberSlider fogField;
45505579 JLabel opacityPowerLabel;
45515580 cNumberSlider opacityPowerField;
4552
- JTree jTree;
5581
+ cTree jTree;
45535582 //ObjectUI parent;
45545583
45555584 cNumberSlider normalpushField;
5585
+
5586
+ private MenuItem importGFDItem;
5587
+ private MenuItem importVRMLX3DItem;
5588
+ private MenuItem import3DSItem;
5589
+ private MenuItem importOBJItem;
45565590 }