Normand Briere
2019-08-12 8f1afe25ea8fc8801aab66331c32a50859a758c2
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
....@@ -30,11 +34,87 @@
3034 iSendInfo
3135 //KeyListener
3236 {
37
+ public cToggleButton pinButton;
3338 boolean timeline;
3439 boolean wasFullScreen;
3540
3641 GroupEditor callee;
3742 JFrame frame;
43
+
44
+ static ObjEditor theFrame;
45
+
46
+ public cGridBag GetSeparator()
47
+ {
48
+ cGridBag separator = new cGridBag();
49
+ separator.add(new JSeparator());
50
+ separator.preferredHeight = 5;
51
+ return separator;
52
+ }
53
+
54
+ cButton GetButton(String name, boolean border)
55
+ {
56
+ ImageIcon icon = GetIcon(name);
57
+ return new cButton(icon, border);
58
+ }
59
+
60
+ cLabel GetLabel(String name, boolean border)
61
+ {
62
+ //ImageIcon icon = GetIcon(name);
63
+ return new cLabel(GetImage(name), border);
64
+ }
65
+
66
+ cToggleButton GetToggleButton(String name, boolean border)
67
+ {
68
+ ImageIcon icon = GetIcon(name);
69
+ return new cToggleButton(icon, border);
70
+ }
71
+
72
+ cCheckBox GetCheckBox(String name, boolean border)
73
+ {
74
+ ImageIcon icon = GetIcon(name);
75
+ return new cCheckBox(icon, border);
76
+ }
77
+
78
+ ImageIcon GetIcon(String name)
79
+ {
80
+ try
81
+ {
82
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
83
+
84
+// if (image.getWidth() > 48 && image.getHeight() > 48)
85
+// {
86
+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
87
+// Graphics2D g = resized.createGraphics();
88
+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
89
+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
90
+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
91
+// g.dispose();
92
+//
93
+// image = resized;
94
+// }
95
+
96
+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
97
+ return icon;
98
+ }
99
+ catch (Exception e)
100
+ {
101
+ return null;
102
+ }
103
+ }
104
+
105
+ BufferedImage GetImage(String name)
106
+ {
107
+ try
108
+ {
109
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
110
+
111
+ return image;
112
+ }
113
+ catch (Exception e)
114
+ {
115
+ return null;
116
+ }
117
+ }
38118
39119 // SCRIPT
40120
....@@ -138,34 +218,42 @@
138218 public void closeUI()
139219 {
140220 //new Exception().printStackTrace();
141
- System.out.println("this = " + this);
142
- System.out.println("objEditor = " + objEditor);
221
+// System.out.println("this = " + this);
222
+// System.out.println("objEditor = " + objEditor);
143223 //nameField.removeActionListener(this);
144
- objEditor.ctrlPanel.remove(nameField);
224
+// objEditor.ctrlPanel.remove(nameField);
145225
146
- if (!GroupEditor.allparams)
226
+ objEditor.ctrlPanel.remove(namePanel);
227
+
228
+ if (!allparams)
147229 return;
148230
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);
231
+// objEditor.ctrlPanel.remove(liveCB);
232
+// objEditor.ctrlPanel.remove(hideCB);
233
+// objEditor.ctrlPanel.remove(markCB);
234
+//
235
+// objEditor.ctrlPanel.remove(randomCB);
236
+// objEditor.ctrlPanel.remove(speedupCB);
237
+// objEditor.ctrlPanel.remove(rewindCB);
238
+//
239
+// objEditor.ctrlPanel.remove(resetButton);
240
+// objEditor.ctrlPanel.remove(stepButton);
241
+//// objEditor.ctrlPanel.remove(stepAllButton);
242
+//// objEditor.ctrlPanel.remove(resetAllButton);
243
+// objEditor.ctrlPanel.remove(link2masterCB);
244
+// //objEditor.ctrlPanel.remove(flipVCB);
245
+// //objEditor.ctrlPanel.remove(texresMenu);
246
+// objEditor.ctrlPanel.remove(slowerButton);
247
+// objEditor.ctrlPanel.remove(fasterButton);
248
+// objEditor.ctrlPanel.remove(remarkButton);
167249
168
- Remove(normalpushField);
250
+ objEditor.ctrlPanel.remove(setupPanel);
251
+ objEditor.ctrlPanel.remove(setupPanel2);
252
+ objEditor.ctrlPanel.remove(objectCommandsPanel);
253
+ objEditor.ctrlPanel.remove(pushPanel);
254
+ //objEditor.ctrlPanel.remove(fillPanel);
255
+
256
+ //Remove(normalpushField);
169257 }
170258
171259 public ObjEditor GetEditor()
....@@ -209,6 +297,14 @@
209297 client = inClient;
210298 copy = client;
211299
300
+// if (copy.versionlist == null)
301
+// {
302
+// copy.versionlist = new Object3D[100];
303
+// copy.versionindex = -1;
304
+//
305
+// callee.Save(true);
306
+// }
307
+
212308 // "this" is not called: SetupUI2(objEditor);
213309 }
214310
....@@ -222,6 +318,14 @@
222318 client = inClient;
223319 copy = client;
224320
321
+ if (copy.versionlist == null)
322
+ {
323
+ copy.versionlist = new Object3D[100];
324
+ copy.versionindex = -1;
325
+
326
+// Save(true);
327
+ }
328
+
225329 SetupUI2(callee.GetEditor());
226330 }
227331
....@@ -236,6 +340,7 @@
236340 //localCopy.parent = null;
237341
238342 frame = new JFrame();
343
+ frame.setUndecorated(false);
239344 objEditor = this;
240345 this.callee = callee;
241346
....@@ -253,6 +358,14 @@
253358 copy = localCopy;
254359 copy.editWindow = this;
255360
361
+// if (copy.versionlist == null)
362
+// {
363
+// copy.versionlist = new Object3D[100];
364
+// copy.versionindex = -1;
365
+//
366
+// Save(true);
367
+// }
368
+
256369 SetupMenu();
257370
258371 //SetupName(objEditor); // new
....@@ -266,28 +379,49 @@
266379 return frame.action(event, obj);
267380 }
268381
382
+ // Cannot work without static
383
+ static boolean allparams = true;
384
+
385
+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
386
+
269387 void SetupMenu()
270388 {
271389 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..."));
390
+ menuBar.add(fileMenu = new Menu("File"));
391
+ fileMenu.add(newItem = new MenuItem("New"));
392
+ fileMenu.add(openItem = new MenuItem("Open..."));
393
+
394
+ //oe.menuBar.add(menu = new Menu("Include"));
395
+ Menu menu = new Menu("Import");
396
+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
397
+ importOBJItem.addActionListener(this);
398
+ import3DSItem = menu.add(new MenuItem("3DS file..."));
399
+ import3DSItem.addActionListener(this);
400
+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
401
+ importVRMLX3DItem.addActionListener(this);
402
+ menu.add("-");
403
+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
404
+ importGFDItem.addActionListener(this);
405
+ fileMenu.add(menu);
406
+ fileMenu.add("-");
407
+
408
+ fileMenu.add(saveItem = new MenuItem("Save"));
409
+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
277410 //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("-");
411
+ fileMenu.add("-");
412
+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
413
+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
414
+ fileMenu.add("-");
282415 if (client.parent != null)
283416 {
284
- windowMenu.add(closeItem = new MenuItem("Close"));
417
+ fileMenu.add(closeItem = new MenuItem("Close"));
285418 } else
286419 {
287
- windowMenu.add(closeItem = new MenuItem("Exit"));
420
+ fileMenu.add(closeItem = new MenuItem("Exit"));
288421 }
289422
290
- loadItem.addActionListener(this);
423
+ newItem.addActionListener(this);
424
+ openItem.addActionListener(this);
291425 saveItem.addActionListener(this);
292426 saveAsItem.addActionListener(this);
293427 exportAsItem.addActionListener(this);
....@@ -295,82 +429,71 @@
295429 //povItem.addActionListener(this);
296430 closeItem.addActionListener(this);
297431
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
-
353432 objectPanel = new JTabbedPane();
433
+
434
+ ChangeListener changeListener = new ChangeListener()
435
+ {
436
+ public void stateChanged(ChangeEvent changeEvent)
437
+ {
438
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
439
+// {
440
+// if (latestObject != null)
441
+// {
442
+// refreshContents(true);
443
+// SetMaterial(latestObject);
444
+// }
445
+//
446
+// materialFlushed = true;
447
+// }
448
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
449
+// {
450
+// if (listUI.size() == 0)
451
+// EditSelection(false);
452
+// }
453
+
454
+// refreshContents(false); // To refresh Info tab
455
+ }
456
+ };
457
+ objectPanel.addChangeListener(changeListener);
458
+
354459 toolbarPanel = new JPanel();
355460 toolbarPanel.setName("Toolbar");
356
- treePanel = new JPanel();
461
+
462
+ treePanel = new cGridBag();
357463 treePanel.setName("Tree");
358
- ctrlPanel = new cGridBag(); // new GridBagLayout());
359
- ctrlPanel.setName("Edit");
360
- materialPanel = new cGridBag().setVertical(true);
361
- materialPanel.setName("Material");
464
+
465
+ editPanel = new cGridBag().setVertical(true);
466
+ //editPanel.setName("Edit");
467
+
468
+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
469
+
470
+ editCommandsPanel = new cGridBag();
471
+ editPanel.add(editCommandsPanel);
472
+ editPanel.add(ctrlPanel);
473
+
474
+ toolboxPanel = new cGridBag().setVertical(true);
475
+ //toolboxPanel.setName("Toolbox");
476
+
477
+ skyboxPanel = new cGridBag().setVertical(true);
478
+
479
+ materialPanel = new cGridBag().setVertical(false);
480
+ //materialPanel.setName("Material");
481
+
362482 /*JTextPane*/
363483 infoarea = createTextPane();
484
+ doc = infoarea.getStyledDocument();
485
+
364486 infoarea.setEditable(true);
365487 SetText();
488
+
366489 // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367490 // infoarea.setOpaque(false);
368491 // //infoarea.setForeground(textcolor);
369
- infoarea.setLineWrap(true);
370
- infoarea.setWrapStyleWord(true);
492
+// TEXTAREA infoarea.setLineWrap(true);
493
+// TEXTAREA infoarea.setWrapStyleWord(true);
371494 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");
495
+ infoPanel.setPreferredSize(new Dimension(1, 1));
496
+ //infoPanel.setName("Info");
374497 //infoPanel.setLayout(new BorderLayout());
375498 //infoPanel.add(createTextPane());
376499
....@@ -378,15 +501,22 @@
378501 mainPanel.setName("Main");
379502 mainPanel.setContinuousLayout(true);
380503 mainPanel.setOneTouchExpandable(true);
381
- mainPanel.setDividerLocation(1.0);
382504 mainPanel.setDividerSize(9);
383
- mainPanel.setResizeWeight(0);
384
-
505
+ mainPanel.setDividerLocation(0.5); //1.0);
506
+ mainPanel.setResizeWeight(0.5);
507
+
508
+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
509
+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
510
+ divider.setDividerSize(15);
511
+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
512
+
513
+ mainPanel.setUI(new BasicSplitPaneUI());
514
+
385515 //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386516 //mainPanel.setLayout(new GridBagLayout());
387517 toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388
- treePanel.setLayout(new GridBagLayout());
389
- ctrlPanel.setLayout(new GridBagLayout());
518
+// treePanel.setLayout(new GridBagLayout());
519
+ //ctrlPanel.setLayout(new GridBagLayout());
390520 //materialPanel.setLayout(new GridBagLayout());
391521
392522 aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
....@@ -426,7 +556,7 @@
426556 static String newline = "\n";
427557 protected static final String buttonString = "JButton";
428558 StyledDocument doc;
429
- JTextArea infoarea;
559
+ JTextPane infoarea;
430560
431561 void ClearInfo()
432562 {
....@@ -449,10 +579,10 @@
449579 e.printStackTrace();
450580 }
451581
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();
582
+// String selection = infoarea.getText();
583
+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
584
+// java.awt.datatransfer.Clipboard clipboard =
585
+// Toolkit.getDefaultToolkit().getSystemClipboard();
456586 //clipboard.setContents(data, data);
457587 }
458588
....@@ -475,13 +605,13 @@
475605 //SendInfo("Name:", "bold");
476606 if (sel.GetTextures() != null || debug)
477607 {
478
- si.SendInfo(sel.toString(), "bold");
608
+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479609 //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480610 if (sel.Size() > 0)
481611 {
482612 si.SendInfo("#children = " + sel.Size(), "regular");
483613 }
484
- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
614
+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485615 if (debug)
486616 {
487617 try
....@@ -493,7 +623,10 @@
493623 }
494624
495625 if (full)
496
- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
626
+ {
627
+ si.SendInfo(" BBox min: " + minima, "regular");
628
+ si.SendInfo(" BBox max: " + maxima, "regular");
629
+ }
497630
498631 if (sel.bRep != null)
499632 {
....@@ -520,7 +653,7 @@
520653 }
521654 if (sel.support != null)
522655 {
523
- si.SendInfo(" support: " + sel.support, "regular");
656
+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524657 }
525658 if (sel.scriptnode != null)
526659 {
....@@ -591,6 +724,9 @@
591724 {
592725 CameraPane.pointflow = (PointFlow) sel;
593726 }
727
+
728
+ si.SendInfo("_____________________", "regular");
729
+ si.SendInfo("", "regular");
594730 }
595731 }
596732
....@@ -606,68 +742,205 @@
606742 }
607743 }
608744
745
+//static GraphicsDevice device = GraphicsEnvironment
746
+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
747
+
748
+ Rectangle keeprect;
749
+ cRadio radio;
750
+
751
+cButton keepButton;
752
+ cButton twoButton; // Full 3D
753
+ cButton sixButton;
754
+ cButton threeButton;
755
+ cButton sevenButton;
756
+ cButton fourButton; // full panel
757
+ cButton oneButton; // full XYZ
758
+ //cButton currentLayout;
759
+
760
+ boolean maximized;
761
+
762
+ cButton fullscreenLayout;
763
+ cButton expandedLayout;
764
+
765
+ void Minimize()
766
+ {
767
+ frame.setState(Frame.ICONIFIED);
768
+ frame.validate();
769
+ }
770
+
771
+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
772
+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
773
+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
774
+ void Maximize()
775
+ {
776
+ if (CameraPane.FULLSCREEN)
777
+ {
778
+ ToggleFullScreen();
779
+ }
780
+
781
+ if (maximized)
782
+ {
783
+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
784
+ }
785
+ else
786
+ {
787
+ keeprect = frame.getBounds();
788
+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
789
+// Dimension rect2 = frame.getToolkit().getScreenSize();
790
+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
791
+// frame.setState(Frame.MAXIMIZED_BOTH);
792
+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
793
+ }
794
+
795
+ maximized ^= true;
796
+
797
+ frame.validate();
798
+ }
799
+
800
+ cButton minButton;
801
+ cButton maxButton;
802
+ cButton fullButton;
803
+ cButton collapseButton;
804
+ cButton maximize3DButton;
805
+
609806 void ToggleFullScreen()
610807 {
611
- if (CameraPane.FULLSCREEN)
808
+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
809
+
810
+ cameraView.ToggleFullScreen();
811
+
812
+ if (!CameraPane.FULLSCREEN)
612813 {
613
- frame.getContentPane().remove(/*"Center",*/bigThree);
614
- framePanel.add(bigThree);
615
- frame.getContentPane().add(/*"Center",*/framePanel);
814
+ device.setFullScreenWindow(null);
815
+ frame.dispose();
816
+ frame.setUndecorated(false);
817
+ frame.validate();
818
+ frame.setVisible(true);
819
+
820
+ //frame.setVisible(false);
821
+// frame.removeNotify();
822
+// frame.setUndecorated(false);
823
+// frame.addNotify();
824
+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
825
+
826
+// X frame.getContentPane().remove(/*"Center",*/bigThree);
827
+// X framePanel.add(bigThree);
828
+// X frame.getContentPane().add(/*"Center",*/framePanel);
829
+// framePanel.setDividerLocation(46); // icons are 24x24
830
+
831
+ //frame.setVisible(true);
832
+// radio.layout = keepButton;
833
+ //theFrame = null;
834
+ keepButton = null;
835
+// radio.layout.doClick();
836
+
616837 } else
617838 {
618
- frame.getContentPane().remove(/*"Center",*/framePanel);
619
- framePanel.remove(bigThree);
620
- frame.getContentPane().add(/*"Center",*/bigThree);
839
+ keepButton = radio.layout;
840
+ //keeprect = frame.getBounds();
841
+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
842
+// frame.getToolkit().getScreenSize().height);
843
+ //frame.setVisible(false);
844
+
845
+ frame.dispose();
846
+ frame.setUndecorated(true);
847
+ device.setFullScreenWindow(frame);
848
+ frame.validate();
849
+ frame.setVisible(true);
850
+// frame.removeNotify();
851
+// frame.setUndecorated(true);
852
+// frame.addNotify();
853
+// X frame.getContentPane().remove(/*"Center",*/framePanel);
854
+// X framePanel.remove(bigThree);
855
+// X frame.getContentPane().add(/*"Center",*/bigThree);
856
+// framePanel.setDividerLocation(0);
857
+
858
+// radio.layout = fullscreenLayout;
859
+// radio.layout.doClick();
860
+ //frame.setVisible(true);
621861 }
622
- cameraView.ToggleFullScreen();
862
+ frame.validate();
863
+
864
+ cameraView.requestFocusInWindow();
623865 }
624866
625
- private JTextArea createTextPane()
867
+ void CollapseToolbar()
868
+ {
869
+ framePanel.setDividerLocation(0);
870
+ //frame.validate();
871
+
872
+ cameraView.requestFocusInWindow();
873
+ }
874
+
875
+ private Object3D Duplicate(Object3D object)
626876 {
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
- };
877
+ boolean temp = CameraPane.SWITCH;
878
+ CameraPane.SWITCH = false;
879
+
880
+ object.ExtractBigData(versiontable);
881
+ // if (copy == client)
882
+
883
+ Object3D versions[] = object.versionlist;
884
+ object.versionlist = null;
885
+
886
+ //byte[] compress = Compress(copy);
887
+ Object3D compress = (Object3D)Grafreed.clone(object);
888
+
889
+ object.versionlist = versions;
890
+
891
+ object.RestoreBigData(versiontable);
892
+
893
+ CameraPane.SWITCH = temp;
894
+
895
+ return compress;
896
+ }
642897
643
- String[] initStyles =
644
- {
645
- "regular", "italic", "bold", "small", "large",
646
- "regular", "button", "regular", "icon",
647
- "regular"
648
- };
898
+ private JTextPane createTextPane()
899
+ {
900
+// TEXTAREA String[] initString =
901
+// {
902
+// "This is an editable JTextPane, ", //regular
903
+// "another ", //italic
904
+// "styled ", //bold
905
+// "text ", //small
906
+// "component, ", //large
907
+// "which supports embedded components..." + newline,//regular
908
+// " " + newline, //button
909
+// "...and embedded icons..." + newline, //regular
910
+// " ", //icon
911
+// newline + "JTextPane is a subclass of JEditorPane that "
912
+// + "uses a StyledEditorKit and StyledDocument, and provides "
913
+// + "cover methods for interacting with those objects."
914
+// };
915
+//
916
+// String[] initStyles =
917
+// {
918
+// "regular", "italic", "bold", "small", "large",
919
+// "regular", "button", "regular", "icon",
920
+// "regular"
921
+// };
922
+//
923
+// JTextPane textPane = new JTextPane();
924
+// textPane.setEditable(true);
925
+// /*StyledDocument*/ doc = textPane.getStyledDocument();
926
+// addStylesToDocument(doc);
927
+//
928
+// try
929
+// {
930
+// for (int j = 0; j < 2; j++)
931
+// {
932
+// for (int i = 0; i < initString.length; i++)
933
+// {
934
+// doc.insertString(doc.getLength(), initString[i],
935
+// doc.getStyle(initStyles[i]));
936
+// }
937
+// }
938
+// } catch (BadLocationException ble)
939
+// {
940
+// System.err.println("Couldn't insert initial text into text pane.");
941
+// }
649942
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;
943
+ return new JTextPane(); // textPane;
671944 }
672945
673946 protected void addStylesToDocument(StyledDocument doc)
....@@ -720,7 +993,7 @@
720993 protected static ImageIcon createImageIcon(String path,
721994 String description)
722995 {
723
- java.net.URL imgURL = GrafreeD.class.getResource(path);
996
+ java.net.URL imgURL = Grafreed.class.getResource(path);
724997 if (imgURL != null)
725998 {
726999 return new ImageIcon(imgURL, description);
....@@ -743,6 +1016,7 @@
7431016 {
7441017 SetupMaterial(materialPanel);
7451018 }
1019
+
7461020 //SetupName();
7471021 //SetupViews();
7481022 }
....@@ -752,6 +1026,7 @@
7521026 // NumberSlider vDivsField;
7531027 // JCheckBox endcaps;
7541028 JCheckBox liveCB;
1029
+ JCheckBox selectableCB;
7551030 JCheckBox hideCB;
7561031 JCheckBox link2masterCB;
7571032 JCheckBox markCB;
....@@ -759,7 +1034,12 @@
7591034 JCheckBox speedupCB;
7601035 JCheckBox rewindCB;
7611036 JCheckBox flipVCB;
1037
+
1038
+ cCheckBox toggleTextureCB;
1039
+ cCheckBox toggleSwitchCB;
1040
+
7621041 JComboBox texresMenu;
1042
+
7631043 JButton resetButton;
7641044 JButton stepButton;
7651045 JButton stepAllButton;
....@@ -767,54 +1047,48 @@
7671047 JButton slowerButton;
7681048 JButton fasterButton;
7691049 JButton remarkButton;
1050
+
1051
+ cGridBag editPanel;
1052
+ cGridBag editCommandsPanel;
1053
+
1054
+ cGridBag namePanel;
1055
+ cGridBag setupPanel;
1056
+ cGridBag setupPanel2;
1057
+ cGridBag objectCommandsPanel;
1058
+ cGridBag pushPanel;
1059
+ cGridBag fillPanel;
7701060
771
- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
1061
+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
7721062 {
7731063 JCheckBox cb;
7741064
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);
1065
+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
7801066 cb.addItemListener(this);
781
-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782
- oe.aConstraints.gridwidth = 1;
783
- oe.aConstraints.gridx += 1;
7841067
7851068 return cb;
7861069 }
7871070
788
- cButton AddButton(ObjEditor oe, String label)
1071
+ cButton AddButton(cGridBag panel, String label)
7891072 {
7901073 cButton cb;
7911074
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);
1075
+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
7971076 cb.addActionListener(this);
798
-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799
- oe.aConstraints.gridwidth = 1;
800
- oe.aConstraints.gridx += 1;
8011077
8021078 return cb;
8031079 }
8041080
805
- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
1081
+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
8061082 {
8071083 JComboBox combo;
8081084
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;
1085
+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8121086 combo.addActionListener(this);
8131087
8141088 return combo;
8151089 }
8161090
817
- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, double min, double max, double current, double pow)
1091
+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
8181092 {
8191093 cGridBag control = new cGridBag();
8201094
....@@ -826,12 +1100,12 @@
8261100 control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8271101 combo.setFloat(current);
8281102
829
- ctrlPanel.add(control);
1103
+ panel.add(control);
8301104
831
- return combo;
1105
+ return control;
8321106 }
8331107
834
- cNumberSlider AddSlider(cGridBag ctrlPanel, String label, int min, int max, int current)
1108
+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
8351109 {
8361110 cGridBag control = new cGridBag();
8371111
....@@ -839,25 +1113,21 @@
8391113
8401114 JLabel jlabel = new JLabel(label);
8411115 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);
1116
+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1117
+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8441118 combo.setInteger(current);
8451119
846
- ctrlPanel.add(control);
1120
+ panel.add(control);
8471121
848
- return combo;
1122
+ return control;
8491123 }
8501124
8511125 JTextArea AddText(cGridBag ctrlPanel, String name)
8521126 {
8531127 JTextArea text;
8541128
855
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
856
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
8571129 ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8581130 text.addCaretListener(this);
859
- aConstraints.gridx += 1;
860
- aConstraints.gridwidth = 1;
8611131
8621132 return text;
8631133 }
....@@ -896,7 +1166,7 @@
8961166
8971167 /*
8981168 */
899
- void Return() // ObjEditor oe)
1169
+ void Return0() // ObjEditor oe)
9001170 {
9011171 aConstraints.gridy += 1;
9021172 aConstraints.gridx = 0;
....@@ -951,37 +1221,92 @@
9511221
9521222 void SetupUI2(ObjEditor oe)
9531223 {
954
-// oe.aConstraints.weightx = 0;
955
-// oe.aConstraints.weighty = 0;
956
-// oe.aConstraints.gridx = 0;
957
-// oe.aConstraints.gridy = 0;
958
- SetupName(oe);
1224
+ //SetupName(oe);
9591225
960
- if (!GroupEditor.allparams)
1226
+ namePanel = new cGridBag();
1227
+
1228
+ //if (copy.pinned)
1229
+ {
1230
+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1231
+ pinButton.setSelected(copy.pinned);
1232
+ cGridBag t = new cGridBag();
1233
+ t.preferredWidth = 2;
1234
+ t.add(pinButton);
1235
+ namePanel.add(t);
1236
+
1237
+ pinButton.addItemListener(this);
1238
+ }
1239
+
1240
+ nameField = AddText(namePanel, copy.GetName());
1241
+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1242
+ oe.ctrlPanel.add(namePanel);
1243
+
1244
+ oe.ctrlPanel.Return();
1245
+
1246
+ if (!allparams)
9611247 return;
9621248
963
- liveCB = AddCheckBox(oe, "Live", copy.live);
964
- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
965
- hideCB = AddCheckBox(oe, "Hide", copy.hide);
1249
+ setupPanel = new cGridBag().setVertical(false);
1250
+
1251
+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1252
+ liveCB.setToolTipText("Animate object");
1253
+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1254
+ selectableCB.setToolTipText("Make object selectable");
9661255 // 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");
1256
+
1257
+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1258
+ hideCB.setToolTipText("Hide object");
1259
+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1260
+ markCB.setToolTipText("As animation target transform");
1261
+
1262
+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1263
+
1264
+ setupPanel2 = new cGridBag().setVertical(false);
1265
+
1266
+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1267
+ rewindCB.setToolTipText("Rewind animation");
1268
+
1269
+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1270
+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1271
+
1272
+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1273
+ link2masterCB.setToolTipText("Attach to support");
1274
+
1275
+ if (Globals.ADVANCED)
1276
+ {
1277
+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1278
+ speedupCB.setToolTipText("Option motion capture");
1279
+ }
1280
+
1281
+ oe.ctrlPanel.add(setupPanel);
1282
+ oe.ctrlPanel.Return();
1283
+ oe.ctrlPanel.add(setupPanel2);
1284
+ oe.ctrlPanel.Return();
1285
+
1286
+ objectCommandsPanel = new cGridBag().setVertical(false);
1287
+
1288
+ resetButton = AddButton(objectCommandsPanel, "Reset");
1289
+ resetButton.setToolTipText("Jump to frame zero");
1290
+ stepButton = AddButton(objectCommandsPanel, "Step");
1291
+ stepButton.setToolTipText("Step one frame");
9731292 // resetAllButton = AddButton(oe, "Reset All");
9741293 // stepAllButton = AddButton(oe, "Step All");
975
- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
9761294 // Return();
977
- slowerButton = AddButton(oe, "Slow");
978
- fasterButton = AddButton(oe, "Fast");
979
- remarkButton = AddButton(oe, "Rem");
1295
+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1296
+ slowerButton.setToolTipText("Decrease animation speed");
1297
+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1298
+ fasterButton.setToolTipText("Increase animation speed");
1299
+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1300
+ remarkButton.setToolTipText("Set the current transform as the target");
9801301
981
- //Return();
1302
+ oe.ctrlPanel.add(objectCommandsPanel);
1303
+ oe.ctrlPanel.Return();
9821304
983
- //normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
1305
+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1306
+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
9841307 //Return();
1308
+
1309
+ oe.ctrlPanel.Return();
9851310
9861311 // oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
9871312 // ObjEditor.aConstraints.gridx += 1;
....@@ -1076,7 +1401,7 @@
10761401 oe.aConstraints.gridwidth = 1;
10771402 /**/
10781403 nameField = AddText(oe.ctrlPanel, copy.GetName());
1079
- Return();
1404
+ oe.ctrlPanel.Return();
10801405
10811406 //ctrlPanel.add(textureButton = new Button("Texture..."));
10821407 //textureButton.setEnabled(false);
....@@ -1180,8 +1505,11 @@
11801505 //worldPanel.setName("World");
11811506 centralPanel = new cGridBag();
11821507 centralPanel.preferredWidth = 20;
1183
- timelinePanel = new JPanel(new BorderLayout());
1184
- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1508
+
1509
+ if (Globals.ADVANCED)
1510
+ {
1511
+ timelinePanel = new JPanel(new BorderLayout());
1512
+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11851513
11861514 cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
11871515 cameraPanel.setContinuousLayout(true);
....@@ -1190,7 +1518,10 @@
11901518 // cameraPanel.setDividerSize(9);
11911519 cameraPanel.setResizeWeight(1.0);
11921520
1521
+ }
1522
+
11931523 centralPanel.add(cameraView);
1524
+ centralPanel.setFocusable(true);
11941525 //frame.setJMenuBar(timelineMenubar);
11951526 //centralPanel.add(timelinePanel);
11961527
....@@ -1216,6 +1547,7 @@
12161547 XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
12171548 XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
12181549 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1550
+ //XYZPanel.setName("XYZ");
12191551
12201552 /*
12211553 gridPanel = new JPanel(); //new BorderLayout());
....@@ -1253,12 +1585,29 @@
12531585 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
12541586 //tmp.setName("Edit");
12551587 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);
1588
+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1589
+ objectPanel.setToolTipTextAt(0, "Material");
1590
+
1591
+ objectPanel.add(toolboxPanel);
1592
+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1593
+ objectPanel.setToolTipTextAt(1, "Objects & textures");
12611594
1595
+ objectPanel.add(skyboxPanel);
1596
+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1597
+ objectPanel.setToolTipTextAt(2, "Backgrounds");
1598
+
1599
+// JPanel north = new JPanel(new BorderLayout());
1600
+// north.setName("Edit");
1601
+// north.add(ctrlPanel, BorderLayout.NORTH);
1602
+// objectPanel.add(north);
1603
+ objectPanel.add(editPanel);
1604
+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1605
+ objectPanel.setToolTipTextAt(3, "Edit controls");
1606
+
1607
+ objectPanel.add(XYZPanel);
1608
+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1609
+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1610
+
12621611 /*
12631612 aConstraints.gridx = 0;
12641613 aConstraints.gridwidth = 1;
....@@ -1266,7 +1615,7 @@
12661615 aConstraints.gridy += 1;
12671616 aConstraints.gridwidth = 1;
12681617 mainPanel.add(objectPanel, aConstraints);
1269
- */
1618
+ */
12701619
12711620 scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
12721621 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1278,14 +1627,12 @@
12781627 scrollpane.addMouseWheelListener(this); // Default not fast enough
12791628
12801629 /*JTabbedPane*/ scenePanel = new cGridBag();
1281
- scenePanel.preferredWidth = 7;
1630
+ scenePanel.preferredWidth = 5;
12821631
12831632 JTabbedPane tabbedPane = new JTabbedPane();
12841633 tabbedPane.add(scrollpane);
12851634
1286
- tabbedPane.add(FSPane = new cFileSystemPane(this));
1287
-
1288
- optionsPanel = new cGridBag().setVertical(true);
1635
+ optionsPanel = new cGridBag().setVertical(false);
12891636
12901637 optionsPanel.setName("Options");
12911638
....@@ -1293,8 +1640,15 @@
12931640
12941641 tabbedPane.add(optionsPanel);
12951642
1643
+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1644
+
12961645 scenePanel.add(tabbedPane);
12971646
1647
+ //if (Globals.ADVANCED)
1648
+ tabbedPane.add(infoPanel);
1649
+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1650
+ tabbedPane.setToolTipTextAt(3, "Information");
1651
+
12981652 /*
12991653 cTree jTree = new cTree(null);
13001654 ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1356,7 +1710,7 @@
13561710 bigThree = new cGridBag();
13571711 bigThree.addComponent(scenePanel);
13581712 bigThree.addComponent(centralPanel);
1359
- bigThree.addComponent(XYZPanel);
1713
+ //bigThree.addComponent(XYZPanel);
13601714
13611715 // // SIDE EFFECT!!!
13621716 // aConstraints.gridx = 0;
....@@ -1365,9 +1719,26 @@
13651719 // aConstraints.gridheight = 1;
13661720
13671721 framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1368
- framePanel.setContinuousLayout(true);
1369
- framePanel.setOneTouchExpandable(true);
1370
- framePanel.setDividerLocation(0.8);
1722
+
1723
+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1724
+ new java.beans.PropertyChangeListener()
1725
+ {
1726
+ public void propertyChange(java.beans.PropertyChangeEvent pce)
1727
+ {
1728
+ if ((Integer)pce.getOldValue() == 1)
1729
+ {
1730
+ if (radio.layout != expandedLayout)
1731
+ {
1732
+ radio.layout = expandedLayout;
1733
+ radio.layout.doClick();
1734
+ }
1735
+ }
1736
+ }
1737
+ });
1738
+
1739
+ framePanel.setContinuousLayout(false);
1740
+ framePanel.setOneTouchExpandable(false);
1741
+ //.setDividerLocation(0.8);
13711742 //framePanel.setDividerSize(15);
13721743 //framePanel.setResizeWeight(0.15);
13731744 framePanel.setName("Frame");
....@@ -1384,15 +1755,19 @@
13841755
13851756 // aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
13861757
1387
- frame.setSize(1024, 768);
1388
- frame.show();
1389
-
1758
+ frame.setSize(1280, 860);
1759
+
1760
+ cameraView.requestFocusInWindow();
1761
+
13901762 gridPanel.setDividerLocation(1.0);
1763
+
1764
+ frame.validate();
1765
+
1766
+ frame.setVisible(true);
13911767
13921768 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
13931769 frame.addWindowListener(new WindowAdapter()
13941770 {
1395
-
13961771 public void windowClosing(WindowEvent e)
13971772 {
13981773 Close();
....@@ -1415,27 +1790,426 @@
14151790 ctrlPanel.removeAll();
14161791 }
14171792
1418
- void SetupMaterial(cGridBag ctrlPanel)
1793
+ void SetupMaterial(cGridBag materialpanel)
14191794 {
1420
- /*
1795
+ cGridBag presetpanel = new cGridBag().setVertical(true);
1796
+
1797
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1798
+ skin.setToolTipText("Skin");
1799
+ skin.addMouseListener(new MouseAdapter()
1800
+ {
1801
+ public void mouseClicked(MouseEvent e)
1802
+ {
1803
+ Object3D object = Grafreed.materials.versionlist[0].get(0);
1804
+ cMaterial material = object.material;
1805
+
1806
+ // Skin
1807
+ colorField.setFloat(material.color);
1808
+ saturationField.setFloat(material.modulation);
1809
+ subsurfaceField.setFloat(material.subsurface);
1810
+ selfshadowField.setFloat(material.diffuseness);
1811
+ diffusenessField.setFloat(material.factor);
1812
+ shininessField.setFloat(material.shininess);
1813
+ shadowbiasField.setFloat(material.shadowbias);
1814
+ diffuseField.setFloat(material.diffuse);
1815
+ specularField.setFloat(material.specular);
1816
+
1817
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
1818
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
1819
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
1820
+
1821
+ materialtouched = true;
1822
+ applySelf();
1823
+ }
1824
+ });
1825
+ presetpanel.add(skin);
1826
+
1827
+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
1828
+ lambert.setToolTipText("Diffuse");
1829
+ lambert.addMouseListener(new MouseAdapter()
1830
+ {
1831
+ public void mouseClicked(MouseEvent e)
1832
+ {
1833
+ Object3D object = Grafreed.materials.versionlist[2].get(0);
1834
+ cMaterial material = object.material;
1835
+
1836
+ diffusenessField.setFloat(material.factor);
1837
+ selfshadowField.setFloat(material.diffuseness);
1838
+
1839
+ materialtouched = true;
1840
+ applySelf();
1841
+ }
1842
+ });
1843
+ presetpanel.add(lambert);
1844
+
1845
+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
1846
+ diffuse2.setToolTipText("Diffuse2");
1847
+ diffuse2.addMouseListener(new MouseAdapter()
1848
+ {
1849
+ public void mouseClicked(MouseEvent e)
1850
+ {
1851
+ Object3D object = Grafreed.materials.versionlist[3].get(0);
1852
+ cMaterial material = object.material;
1853
+
1854
+ diffusenessField.setFloat(material.factor);
1855
+ selfshadowField.setFloat(material.diffuseness);
1856
+
1857
+ materialtouched = true;
1858
+ applySelf();
1859
+ }
1860
+ });
1861
+ presetpanel.add(diffuse2);
1862
+
1863
+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
1864
+ diffusemoon.setToolTipText("Moon");
1865
+ diffusemoon.addMouseListener(new MouseAdapter()
1866
+ {
1867
+ public void mouseClicked(MouseEvent e)
1868
+ {
1869
+ Object3D object = Grafreed.materials.versionlist[4].get(0);
1870
+ cMaterial material = object.material;
1871
+
1872
+ diffusenessField.setFloat(material.factor);
1873
+ selfshadowField.setFloat(material.diffuseness);
1874
+
1875
+ materialtouched = true;
1876
+ applySelf();
1877
+ }
1878
+ });
1879
+ presetpanel.add(diffusemoon);
1880
+
1881
+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
1882
+ diffusemoon2.setToolTipText("Moon2");
1883
+ diffusemoon2.addMouseListener(new MouseAdapter()
1884
+ {
1885
+ public void mouseClicked(MouseEvent e)
1886
+ {
1887
+ Object3D object = Grafreed.materials.versionlist[5].get(0);
1888
+ cMaterial material = object.material;
1889
+
1890
+ diffusenessField.setFloat(material.factor);
1891
+ selfshadowField.setFloat(material.diffuseness);
1892
+
1893
+ materialtouched = true;
1894
+ applySelf();
1895
+ }
1896
+ });
1897
+ presetpanel.add(diffusemoon2);
1898
+
1899
+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
1900
+ diffusemoon3.setToolTipText("Moon3");
1901
+ diffusemoon3.addMouseListener(new MouseAdapter()
1902
+ {
1903
+ public void mouseClicked(MouseEvent e)
1904
+ {
1905
+ Object3D object = Grafreed.materials.versionlist[6].get(0);
1906
+ cMaterial material = object.material;
1907
+
1908
+ diffusenessField.setFloat(material.factor);
1909
+ selfshadowField.setFloat(material.diffuseness);
1910
+
1911
+ materialtouched = true;
1912
+ applySelf();
1913
+ }
1914
+ });
1915
+ presetpanel.add(diffusemoon3);
1916
+
1917
+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
1918
+ diffusesheen.setToolTipText("Sheen");
1919
+ diffusesheen.addMouseListener(new MouseAdapter()
1920
+ {
1921
+ public void mouseClicked(MouseEvent e)
1922
+ {
1923
+ Object3D object = Grafreed.materials.versionlist[7].get(0);
1924
+ cMaterial material = object.material;
1925
+
1926
+ sheenField.setFloat(material.sheen);
1927
+
1928
+ materialtouched = true;
1929
+ applySelf();
1930
+ }
1931
+ });
1932
+ presetpanel.add(diffusesheen);
1933
+
1934
+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1935
+ rough.setToolTipText("Rough metal");
1936
+ rough.addMouseListener(new MouseAdapter()
1937
+ {
1938
+ public void mouseClicked(MouseEvent e)
1939
+ {
1940
+ Object3D object = Grafreed.materials.versionlist[1].get(0);
1941
+ cMaterial material = object.material;
1942
+
1943
+ shininessField.setFloat(material.shininess);
1944
+ velvetField.setFloat(material.velvet);
1945
+
1946
+ materialtouched = true;
1947
+ applySelf();
1948
+ }
1949
+ });
1950
+ presetpanel.add(rough);
1951
+
1952
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
1953
+ rough2.setToolTipText("Medium metal");
1954
+ rough2.addMouseListener(new MouseAdapter()
1955
+ {
1956
+ public void mouseClicked(MouseEvent e)
1957
+ {
1958
+ Object3D object = Grafreed.materials.versionlist[13].get(0);
1959
+ cMaterial material = object.material;
1960
+
1961
+ shininessField.setFloat(material.shininess);
1962
+ lightareaField.setFloat(material.lightarea);
1963
+
1964
+ materialtouched = true;
1965
+ applySelf();
1966
+ }
1967
+ });
1968
+ presetpanel.add(rough2);
1969
+
1970
+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
1971
+ shini0.setToolTipText("Shiny");
1972
+ shini0.addMouseListener(new MouseAdapter()
1973
+ {
1974
+ public void mouseClicked(MouseEvent e)
1975
+ {
1976
+ Object3D object = Grafreed.materials.versionlist[14].get(0);
1977
+ cMaterial material = object.material;
1978
+
1979
+ shininessField.setFloat(material.shininess);
1980
+ lightareaField.setFloat(material.lightarea);
1981
+
1982
+ materialtouched = true;
1983
+ applySelf();
1984
+ }
1985
+ });
1986
+ presetpanel.add(shini0);
1987
+
1988
+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
1989
+ shini1.setToolTipText("Shiny2");
1990
+ shini1.addMouseListener(new MouseAdapter()
1991
+ {
1992
+ public void mouseClicked(MouseEvent e)
1993
+ {
1994
+ Object3D object = Grafreed.materials.versionlist[11].get(0);
1995
+ cMaterial material = object.material;
1996
+
1997
+ shininessField.setFloat(material.shininess);
1998
+ lightareaField.setFloat(material.lightarea);
1999
+
2000
+ materialtouched = true;
2001
+ applySelf();
2002
+ }
2003
+ });
2004
+ presetpanel.add(shini1);
2005
+
2006
+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2007
+ shini2.setToolTipText("Shiny3");
2008
+ shini2.addMouseListener(new MouseAdapter()
2009
+ {
2010
+ public void mouseClicked(MouseEvent e)
2011
+ {
2012
+ Object3D object = Grafreed.materials.versionlist[12].get(0);
2013
+ cMaterial material = object.material;
2014
+
2015
+ shininessField.setFloat(material.shininess);
2016
+ lightareaField.setFloat(material.lightarea);
2017
+
2018
+ materialtouched = true;
2019
+ applySelf();
2020
+ }
2021
+ });
2022
+ presetpanel.add(shini2);
2023
+
2024
+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2025
+ aniso.setToolTipText("AnisoU");
2026
+ aniso.addMouseListener(new MouseAdapter()
2027
+ {
2028
+ public void mouseClicked(MouseEvent e)
2029
+ {
2030
+ Object3D object = Grafreed.materials.versionlist[8].get(0);
2031
+ cMaterial material = object.material;
2032
+
2033
+ anisoField.setFloat(material.aniso);
2034
+ anisoVField.setFloat(material.anisoV);
2035
+
2036
+ materialtouched = true;
2037
+ applySelf();
2038
+ }
2039
+ });
2040
+ presetpanel.add(aniso);
2041
+
2042
+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2043
+ aniso2.setToolTipText("AnisoV");
2044
+ aniso2.addMouseListener(new MouseAdapter()
2045
+ {
2046
+ public void mouseClicked(MouseEvent e)
2047
+ {
2048
+ Object3D object = Grafreed.materials.versionlist[9].get(0);
2049
+ cMaterial material = object.material;
2050
+
2051
+ anisoField.setFloat(material.aniso);
2052
+ anisoVField.setFloat(material.anisoV);
2053
+
2054
+ materialtouched = true;
2055
+ applySelf();
2056
+ }
2057
+ });
2058
+ presetpanel.add(aniso2);
2059
+
2060
+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2061
+ aniso3.setToolTipText("AnisoUV");
2062
+ aniso3.addMouseListener(new MouseAdapter()
2063
+ {
2064
+ public void mouseClicked(MouseEvent e)
2065
+ {
2066
+ Object3D object = Grafreed.materials.versionlist[10].get(0);
2067
+ cMaterial material = object.material;
2068
+
2069
+ anisoField.setFloat(material.aniso);
2070
+ anisoVField.setFloat(material.anisoV);
2071
+
2072
+ materialtouched = true;
2073
+ applySelf();
2074
+ }
2075
+ });
2076
+ presetpanel.add(aniso3);
2077
+
2078
+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2079
+ velvet0.setToolTipText("Velvet");
2080
+ velvet0.addMouseListener(new MouseAdapter()
2081
+ {
2082
+ public void mouseClicked(MouseEvent e)
2083
+ {
2084
+ Object3D object = Grafreed.materials.versionlist[15].get(0);
2085
+ cMaterial material = object.material;
2086
+
2087
+ diffusenessField.setFloat(material.factor);
2088
+ selfshadowField.setFloat(material.diffuseness);
2089
+ sheenField.setFloat(material.sheen);
2090
+ shininessField.setFloat(material.shininess);
2091
+ velvetField.setFloat(material.velvet);
2092
+ shiftField.setFloat(material.shift);
2093
+
2094
+ materialtouched = true;
2095
+ applySelf();
2096
+ }
2097
+ });
2098
+ presetpanel.add(velvet0);
2099
+
2100
+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2101
+ bump0.setToolTipText("Bump texture");
2102
+ bump0.addMouseListener(new MouseAdapter()
2103
+ {
2104
+ public void mouseClicked(MouseEvent e)
2105
+ {
2106
+ Object3D object = Grafreed.materials.versionlist[16].get(0);
2107
+ cMaterial material = object.material;
2108
+
2109
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2110
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2111
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2112
+
2113
+ materialtouched = true;
2114
+ applySelf();
2115
+ }
2116
+ });
2117
+ presetpanel.add(bump0);
2118
+
2119
+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2120
+ halo.setToolTipText("Halo");
2121
+ halo.addMouseListener(new MouseAdapter()
2122
+ {
2123
+ public void mouseClicked(MouseEvent e)
2124
+ {
2125
+ Object3D object = Grafreed.materials.versionlist[17].get(0);
2126
+ cMaterial material = object.material;
2127
+
2128
+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2129
+
2130
+ materialtouched = true;
2131
+ applySelf();
2132
+ }
2133
+ });
2134
+ presetpanel.add(halo);
2135
+
2136
+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2137
+ candle.setToolTipText("Candle");
2138
+ candle.addMouseListener(new MouseAdapter()
2139
+ {
2140
+ public void mouseClicked(MouseEvent e)
2141
+ {
2142
+ Object3D object = Grafreed.materials.versionlist[18].get(0);
2143
+ cMaterial material = object.material;
2144
+
2145
+ subsurfaceField.setFloat(material.subsurface);
2146
+ shadowbiasField.setFloat(material.shadowbias);
2147
+ ambientField.setFloat(material.ambient);
2148
+ specularField.setFloat(material.specular);
2149
+ lightareaField.setFloat(material.lightarea);
2150
+ shininessField.setFloat(material.shininess);
2151
+
2152
+ materialtouched = true;
2153
+ applySelf();
2154
+ }
2155
+ });
2156
+ presetpanel.add(candle);
2157
+
2158
+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2159
+ shadowShader.setToolTipText("Shadow");
2160
+ shadowShader.addMouseListener(new MouseAdapter()
2161
+ {
2162
+ public void mouseClicked(MouseEvent e)
2163
+ {
2164
+ diffuseField.setFloat(0.001);
2165
+ ambientField.setFloat(0.001);
2166
+ cameraField.setFloat(0.001);
2167
+ specularField.setFloat(0.001);
2168
+ fakedepthField.setFloat(0.001);
2169
+ opacityField.setFloat(0.6);
2170
+
2171
+ materialtouched = true;
2172
+ applySelf();
2173
+ }
2174
+ });
2175
+ presetpanel.add(shadowShader);
2176
+
2177
+ cGridBag panel = new cGridBag().setVertical(true);
2178
+
2179
+ presetpanel.preferredWidth = 1;
2180
+
2181
+ materialpanel.add(presetpanel);
2182
+ materialpanel.add(panel);
2183
+
2184
+ panel.preferredWidth = 8;
2185
+
2186
+ /*
14212187 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
14222188 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1423
- */
2189
+ */
14242190
14252191 cGridBag editBar = new cGridBag().setVertical(false);
14262192
1427
- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
2193
+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
2194
+ createMaterialButton.setToolTipText("Create material");
14282195
14292196 /*
14302197 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
14312198 */
14322199
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);
2200
+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
2201
+ clearMaterialButton.setToolTipText("Clear material");
2202
+
2203
+ if (Globals.ADVANCED)
2204
+ {
2205
+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
2206
+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
2207
+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
2208
+ }
14372209
1438
- ctrlPanel.add(editBar);
2210
+ editBar.preferredHeight = 15;
2211
+
2212
+ panel.add(editBar);
14392213
14402214 /**/
14412215 //aConstraints.weighty = 0;
....@@ -1446,47 +2220,52 @@
14462220 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14472221
14482222 cGridBag colorSection = new cGridBag().setVertical(true);
2223
+
2224
+ cGridBag huepanel = new cGridBag();
2225
+ cGridBag huelabel = new cGridBag();
2226
+ skin = GetLabel("icons/hue.png", false);
2227
+ skin.fit = true;
2228
+ huelabel.add(skin);
2229
+ huelabel.preferredWidth = 20;
2230
+ huepanel.add(new cGridBag()); // Label
2231
+ huepanel.add(huelabel); // Field/slider
2232
+
2233
+ huepanel.preferredHeight = 7;
2234
+
2235
+ colorSection.add(huepanel);
14492236
14502237 cGridBag color = new cGridBag();
1451
- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1452
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1453
- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2238
+
2239
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
2240
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2241
+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2242
+
14542243 //colorField.preferredWidth = 200;
14552244 colorSection.add(color);
14562245
14572246 cGridBag modulation = new cGridBag();
14582247 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
14592248 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1460
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2249
+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
14612250 colorSection.add(modulation);
14622251
2252
+ cGridBag opacity = new cGridBag();
2253
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
2254
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2255
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2256
+ colorSection.add(opacity);
2257
+
2258
+ colorSection.add(GetSeparator());
2259
+
14632260 cGridBag texture = new cGridBag();
14642261 texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
14652262 textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
14662263 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
14672264 colorSection.add(texture);
14682265
1469
- cGridBag anisoU = new cGridBag();
1470
- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1471
- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472
- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1473
- colorSection.add(anisoU);
1474
-
1475
- cGridBag anisoV = new cGridBag();
1476
- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1477
- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478
- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1479
- colorSection.add(anisoV);
1480
-
1481
- cGridBag shadowbias = new cGridBag();
1482
- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1483
- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1484
- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1485
- colorSection.add(shadowbias);
1486
-
1487
- ctrlPanel.add(new JSeparator());
2266
+ panel.add(GetSeparator());
14882267
1489
- ctrlPanel.add(colorSection);
2268
+ panel.add(colorSection);
14902269
14912270 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14922271
....@@ -1534,9 +2313,15 @@
15342313 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
15352314 diffuseSection.add(fakedepth);
15362315
1537
- ctrlPanel.add(new JSeparator());
2316
+ cGridBag shadowbias = new cGridBag();
2317
+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
2318
+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2319
+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2320
+ diffuseSection.add(shadowbias);
2321
+
2322
+ panel.add(GetSeparator());
15382323
1539
- ctrlPanel.add(diffuseSection);
2324
+ panel.add(diffuseSection);
15402325
15412326 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
15422327
....@@ -1572,7 +2357,7 @@
15722357 velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
15732358 specularSection.add(velvet);
15742359
1575
- shiftField = AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1);
2360
+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
15762361 //Return();
15772362 // ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
15782363 // shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
....@@ -1584,42 +2369,48 @@
15842369 // aConstraints.gridy += 1;
15852370 // aConstraints.gridwidth = 1;
15862371
2372
+ cGridBag anisoU = new cGridBag();
2373
+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
2374
+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2375
+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2376
+ specularSection.add(anisoU);
15872377
1588
- ctrlPanel.add(new JSeparator());
2378
+ cGridBag anisoV = new cGridBag();
2379
+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
2380
+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2381
+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2382
+ specularSection.add(anisoV);
2383
+
2384
+
2385
+ panel.add(GetSeparator());
15892386
1590
- ctrlPanel.add(specularSection);
2387
+ panel.add(specularSection);
15912388
15922389 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
15932390
1594
- cGridBag globalSection = new cGridBag().setVertical(true);
2391
+ //cGridBag globalSection = new cGridBag().setVertical(true);
15952392
15962393 cGridBag camera = new cGridBag();
15972394 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
15982395 cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
15992396 camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1600
- globalSection.add(camera);
2397
+ colorSection.add(camera);
16012398
16022399 cGridBag ambient = new cGridBag();
16032400 ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
16042401 ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16052402 ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1606
- globalSection.add(ambient);
2403
+ colorSection.add(ambient);
16072404
16082405 cGridBag backlit = new cGridBag();
16092406 backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
16102407 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16112408 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1612
- globalSection.add(backlit);
2409
+ colorSection.add(backlit);
16132410
1614
- cGridBag opacity = new cGridBag();
1615
- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1616
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1617
- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1618
- globalSection.add(opacity);
1619
-
1620
- ctrlPanel.add(new JSeparator());
2411
+ //panel.add(new JSeparator());
16212412
1622
- ctrlPanel.add(globalSection);
2413
+ //panel.add(globalSection);
16232414
16242415 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
16252416
....@@ -1661,9 +2452,9 @@
16612452 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
16622453 textureSection.add(opacityPower);
16632454
1664
- ctrlPanel.add(new JSeparator());
2455
+ panel.add(GetSeparator());
16652456
1666
- ctrlPanel.add(textureSection);
2457
+ panel.add(textureSection);
16672458
16682459 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
16692460
....@@ -1700,12 +2491,15 @@
17002491 opacityPowerField.addChangeListener(this);
17012492 /**/
17022493
1703
- resetSlidersButton.addActionListener(this);
17042494 clearMaterialButton.addActionListener(this);
17052495 createMaterialButton.addActionListener(this);
1706
-
1707
- propagateToggle.addItemListener(this);
1708
- multiplyToggle.addItemListener(this);
2496
+
2497
+ if (Globals.ADVANCED)
2498
+ {
2499
+ resetSlidersButton.addActionListener(this);
2500
+ propagateToggle.addItemListener(this);
2501
+ multiplyToggle.addItemListener(this);
2502
+ }
17092503 }
17102504
17112505 void DropFile(java.io.File[] files, boolean textures)
....@@ -1723,8 +2517,9 @@
17232517 // 3D models
17242518 if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
17252519 {
1726
- lastConverter = new com.jmex.model.converters.MaxToJme();
1727
- LoadFile(filename, lastConverter);
2520
+ //lastConverter = new com.jmex.model.converters.MaxToJme();
2521
+ //LoadFile(filename, lastConverter);
2522
+ LoadObjFile(filename); // New 3ds loader
17282523 continue;
17292524 }
17302525 if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -1876,7 +2671,7 @@
18762671
18772672 //? flashIt = false;
18782673 CameraPane pane = (CameraPane) cameraView;
1879
- pane.clickStart(location.x, location.y, 0);
2674
+ pane.clickStart(location.x, location.y, 0, 0);
18802675 pane.clickEnd(location.x, location.y, 0, true);
18812676
18822677 if (group.selection.size() == 1)
....@@ -1925,6 +2720,7 @@
19252720 e2.printStackTrace();
19262721 }
19272722 }
2723
+
19282724 LoadJMEThread loadThread;
19292725
19302726 class LoadJMEThread extends Thread
....@@ -1982,6 +2778,7 @@
19822778 //LoadFile0(filename, converter);
19832779 }
19842780 }
2781
+
19852782 LoadOBJThread loadObjThread;
19862783
19872784 class LoadOBJThread extends Thread
....@@ -2060,19 +2857,19 @@
20602857
20612858 void LoadObjFile(String fullname)
20622859 {
2063
- /*
2860
+ System.out.println("Loading " + fullname);
2861
+ /**/
20642862 //lastFilename = fullname;
20652863 if(loadObjThread == null)
20662864 {
2067
- loadObjThread = new LoadOBJThread();
2068
- loadObjThread.start();
2865
+ loadObjThread = new LoadOBJThread();
2866
+ loadObjThread.start();
20692867 }
20702868
20712869 loadObjThread.add(fullname);
2072
- */
2870
+ /**/
20732871
2074
- System.out.println("Loading " + fullname);
2075
- makeSomething(new FileObject(fullname, true), true);
2872
+ //makeSomething(new FileObject(fullname, true), true);
20762873 }
20772874
20782875 void LoadGFDFile(String fullname)
....@@ -2333,11 +3130,11 @@
23333130
23343131 void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
23353132 {
2336
- if (GrafreeD.standAlone)
3133
+ if (Grafreed.standAlone)
23373134 {
23383135 /**/
23393136 FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2340
- browser.show();
3137
+ browser.setVisible(true);
23413138 String filename = browser.getFile();
23423139 if (filename != null && filename.length() > 0)
23433140 {
....@@ -2448,6 +3245,7 @@
24483245 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
24493246 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
24503247 }
3248
+
24513249 //cJME.count++;
24523250 //cJME.count %= 12;
24533251 if (gc)
....@@ -2482,6 +3280,7 @@
24823280 }
24833281 if (input == null)
24843282 {
3283
+ new Exception().printStackTrace();
24853284 System.exit(0);
24863285 }
24873286
....@@ -2630,6 +3429,7 @@
26303429 }
26313430 }
26323431 }
3432
+
26333433 cFileSystemPane FSPane;
26343434
26353435 void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2639,7 +3439,7 @@
26393439
26403440 freezematerial = true;
26413441 colorField.setFloat(mat.color);
2642
- modulationField.setFloat(mat.modulation);
3442
+ saturationField.setFloat(mat.modulation);
26433443 metalnessField.setFloat(mat.metalness);
26443444 diffuseField.setFloat(mat.diffuse);
26453445 specularField.setFloat(mat.specular);
....@@ -2683,11 +3483,14 @@
26833483 }
26843484 }
26853485 }
3486
+
26863487 freezematerial = false;
26873488 }
26883489
26893490 void SetMaterial(Object3D object)
26903491 {
3492
+ latestObject = object;
3493
+
26913494 cMaterial mat = object.material;
26923495
26933496 if (mat == null)
....@@ -2696,7 +3499,8 @@
26963499 return;
26973500 }
26983501
2699
- multiplyToggle.setSelected(mat.multiply);
3502
+ if (multiplyToggle != null)
3503
+ multiplyToggle.setSelected(mat.multiply);
27003504
27013505 assert (object.projectedVertices != null);
27023506
....@@ -2798,12 +3602,17 @@
27983602 // }
27993603
28003604 /**/
2801
- if (deselect)
3605
+ if (deselect || child == null)
28023606 {
28033607 //group.deselectAll();
28043608 //freeze = true;
28053609 GetTree().clearSelection();
28063610 //freeze = false;
3611
+
3612
+ if (child == null)
3613
+ {
3614
+ return;
3615
+ }
28073616 }
28083617
28093618 //group.addSelectee(child);
....@@ -2837,6 +3646,17 @@
28373646 public void itemStateChanged(ItemEvent event)
28383647 {
28393648 // System.out.println("Propagate = " + propagate);
3649
+ if (event.getSource() == pinButton)
3650
+ {
3651
+ copy.pinned ^= true;
3652
+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3653
+ {
3654
+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
3655
+ copy.CloseUI();
3656
+ //copy.editWindow.refreshContents();
3657
+ }
3658
+ }
3659
+ else
28403660 if (event.getSource() == propagateToggle)
28413661 {
28423662 propagate ^= true;
....@@ -2872,7 +3692,7 @@
28723692 cameraView.ToggleDL();
28733693 cameraView.repaint();
28743694 return;
2875
- } else if (event.getSource() == toggleTextureItem)
3695
+ } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
28763696 {
28773697 cameraView.ToggleTexture();
28783698 // june 2013 copy.HardTouch();
....@@ -2911,9 +3731,9 @@
29113731 frame.validate();
29123732
29133733 return;
2914
- } else if (event.getSource() == toggleRandomItem)
3734
+ } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
29153735 {
2916
- cameraView.ToggleRandom();
3736
+ cameraView.ToggleSwitch();
29173737 cameraView.repaint();
29183738 return;
29193739 } else if (event.getSource() == toggleHandleItem)
....@@ -2941,12 +3761,17 @@
29413761 } else if (event.getSource() == liveCB)
29423762 {
29433763 copy.live ^= true;
3764
+ objEditor.refreshContents(true); // To show item colors
3765
+ return;
3766
+ } else if (event.getSource() == selectableCB)
3767
+ {
3768
+ copy.dontselect ^= true;
29443769 return;
29453770 } else if (event.getSource() == hideCB)
29463771 {
29473772 copy.hide ^= true;
29483773 copy.Touch(); // display list issue
2949
- objEditor.refreshContents();
3774
+ objEditor.refreshContents(true); // To show item colors
29503775 return;
29513776 } else if (event.getSource() == link2masterCB)
29523777 {
....@@ -2956,6 +3781,7 @@
29563781 if (event.getSource() == randomCB)
29573782 {
29583783 copy.random ^= true;
3784
+ objEditor.refreshContents();
29593785 return;
29603786 }
29613787 if (event.getSource() == speedupCB)
....@@ -2979,8 +3805,9 @@
29793805
29803806 public void actionPerformed(ActionEvent event)
29813807 {
3808
+ Object source = event.getSource();
29823809 // SCRIPT DIALOG
2983
- if (event.getSource() == okbutton)
3810
+ if (source == okbutton)
29843811 {
29853812 textpanel.setVisible(false);
29863813 textpanel.remove(textarea);
....@@ -2992,7 +3819,7 @@
29923819 textarea = null;
29933820 textpanel = null;
29943821 }
2995
- if (event.getSource() == cancelbutton)
3822
+ if (source == cancelbutton)
29963823 {
29973824 textpanel.setVisible(false);
29983825 textpanel.remove(textarea);
....@@ -3004,50 +3831,50 @@
30043831 //applySelf();
30053832 //client.refreshEditWindow();
30063833 //refreshContents();
3007
- if (event.getSource() == nameField)
3834
+ if (source == nameField)
30083835 {
30093836 //System.out.println("ObjEditor " + event);
30103837 applySelf0(true);
30113838 //parent.applySelf();
30123839 objEditor.refreshContents();
3013
- } else if (event.getSource() == resetButton)
3840
+ } else if (source == resetButton)
30143841 {
30153842 CameraPane.fullreset = true;
30163843 copy.Reset(); // ResetMeshes();
30173844 copy.Touch();
30183845 objEditor.refreshContents();
3019
- } else if (event.getSource() == stepItem)
3846
+ } else if (source == stepItem)
30203847 {
30213848 //cameraView.ONESTEP = true;
30223849 Globals.ONESTEP = true;
30233850 cameraView.repaint();
30243851 return;
3025
- } else if (event.getSource() == stepButton)
3852
+ } else if (source == stepButton)
30263853 {
30273854 copy.Step();
30283855 copy.Touch();
30293856 objEditor.refreshContents();
3030
- } else if (event.getSource() == slowerButton)
3857
+ } else if (source == slowerButton)
30313858 {
30323859 copy.Slower();
30333860 copy.Touch();
30343861 objEditor.refreshContents();
3035
- } else if (event.getSource() == fasterButton)
3862
+ } else if (source == fasterButton)
30363863 {
30373864 copy.Faster();
30383865 copy.Touch();
30393866 objEditor.refreshContents();
3040
- } else if (event.getSource() == remarkButton)
3867
+ } else if (source == remarkButton)
30413868 {
30423869 copy.Remark();
30433870 copy.Touch();
30443871 objEditor.refreshContents();
3045
- } else if (event.getSource() == stepAllButton)
3872
+ } else if (source == stepAllButton)
30463873 {
30473874 copy.StepAll();
30483875 copy.Touch();
30493876 objEditor.refreshContents();
3050
- } else if (event.getSource() == resetAllButton)
3877
+ } else if (source == resetAllButton)
30513878 {
30523879 //CameraPane.fullreset = true;
30533880 copy.ResetAll(); // ResetMeshes();
....@@ -3080,53 +3907,79 @@
30803907 // Close();
30813908 // }
30823909 // else
3083
- if (event.getSource() == resetSlidersButton)
3910
+ if (source == resetSlidersButton)
30843911 {
30853912 ResetSliders();
3086
- } else if (event.getSource() == clearMaterialButton)
3913
+ } else if (source == clearMaterialButton)
30873914 {
30883915 ClearMaterial();
3089
- } else if (event.getSource() == createMaterialButton)
3916
+ } else if (source == createMaterialButton)
30903917 {
30913918 CreateMaterial();
3092
- } else if (event.getSource() == clearPanelButton)
3919
+ } else if (source == clearPanelButton)
30933920 {
30943921 copy.ClearUI();
30953922 refreshContents(true);
3096
- } /*
3097
- }
3098
-
3099
- public boolean action(Event event, Object arg)
3100
- {
3101
- */ else if (event.getSource() == closeItem)
3923
+ } else if (source == importGFDItem)
3924
+ {
3925
+ ImportGFD();
3926
+ } else
3927
+ if (source == importVRMLX3DItem)
3928
+ {
3929
+ ImportVRMLX3D();
3930
+ } else
3931
+ if (source == import3DSItem)
3932
+ {
3933
+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
3934
+ } else
3935
+ if (source == importOBJItem)
3936
+ {
3937
+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
3938
+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
3939
+ browser.setVisible(true);
3940
+ String filename = browser.getFile();
3941
+ if (filename != null && filename.length() > 0)
3942
+ {
3943
+ String fullname = browser.getDirectory() + filename;
3944
+ makeSomething(ReadOBJ(fullname), true);
3945
+ }
3946
+ } else
3947
+ if (source == closeItem)
31023948 {
31033949 Close();
31043950 //return true;
3105
- } else if (event.getSource() == loadItem)
3951
+ } else if (source == openItem)
31063952 {
3107
- load();
3953
+ Open();
31083954 //return true;
3109
- } else if (event.getSource() == saveItem)
3955
+ } else if (source == newItem)
3956
+ {
3957
+ New();
3958
+ } else if (source == saveItem)
31103959 {
31113960 save();
31123961 //return true;
3113
- } else if (event.getSource() == saveAsItem)
3962
+ } else if (source == saveAsItem)
31143963 {
31153964 saveAs();
31163965 //return true;
3117
- } else if (event.getSource() == reexportItem)
3966
+ } else if (source == reexportItem)
31183967 {
31193968 reexport();
31203969 //return true;
3121
- } else if (event.getSource() == exportAsItem)
3970
+ } else if (source == exportAsItem)
31223971 {
31233972 export();
31243973 //return true;
3125
- } else if (event.getSource() == povItem)
3974
+ } else if (source == povItem)
31263975 {
31273976 generatePOV();
31283977 //return true;
3129
- } else if (event.getSource() == zBufferItem)
3978
+ } else if (event.getSource() == archiveItem)
3979
+ {
3980
+ cTools.Archive(frame);
3981
+ return;
3982
+ } else if (source == zBufferItem)
31303983 {
31313984 try
31323985 {
....@@ -3148,21 +4001,8 @@
31484001 cameraView.repaint();
31494002 //return true;
31504003 }
3151
- */ else if (event.getSource() == editCameraItem)
3152
- {
3153
- cameraView.ProtectCamera();
3154
- cameraView.repaint();
3155
- return;
3156
- } else if (event.getSource() == revertCameraItem)
3157
- {
3158
- cameraView.RevertCamera();
3159
- cameraView.repaint();
3160
- return;
3161
-// } else if (event.getSource() == textureButton)
3162
-// {
3163
-// return; // true;
3164
- } else // combos...
3165
- if (event.getSource() == texresMenu)
4004
+ */ else // combos...
4005
+ if (source == texresMenu)
31664006 {
31674007 System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
31684008 copy.texres = texresMenu.getSelectedIndex();
....@@ -3174,12 +4014,477 @@
31744014 }
31754015 }
31764016
4017
+ void New()
4018
+ {
4019
+ while (copy.Size() > 1)
4020
+ {
4021
+ copy.remove(1);
4022
+ }
4023
+
4024
+ ResetModel();
4025
+ objEditor.refreshContents();
4026
+ }
4027
+
4028
+ static public byte[] Compress(Object3D o)
4029
+ {
4030
+ // Slower to actually compress.
4031
+ try
4032
+ {
4033
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
4034
+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
4035
+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
4036
+
4037
+ Object3D parent = o.parent;
4038
+ o.parent = null;
4039
+
4040
+ out.writeObject(o);
4041
+
4042
+ o.parent = parent;
4043
+
4044
+ out.flush();
4045
+
4046
+ baos //zstream
4047
+ .close();
4048
+ out.close();
4049
+
4050
+ byte[] bytes = baos.toByteArray();
4051
+
4052
+ System.out.println("save #bytes = " + bytes.length);
4053
+ return bytes;
4054
+ } catch (Exception e)
4055
+ {
4056
+ System.err.println(e);
4057
+ return null;
4058
+ }
4059
+ }
4060
+
4061
+ static public Object Uncompress(byte[] bytes)
4062
+ {
4063
+ System.out.println("restore #bytes = " + bytes.length);
4064
+ try
4065
+ {
4066
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
4067
+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
4068
+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
4069
+ Object obj = in.readObject();
4070
+
4071
+ bais //istream
4072
+ .close();
4073
+ in.close();
4074
+
4075
+ return obj;
4076
+ } catch (Exception e)
4077
+ {
4078
+ System.err.println(e);
4079
+ return null;
4080
+ }
4081
+ }
4082
+
4083
+ static public Object clone(Object o)
4084
+ {
4085
+ try
4086
+ {
4087
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
4088
+ ObjectOutputStream out = new ObjectOutputStream(baos);
4089
+
4090
+ out.writeObject(o);
4091
+
4092
+ out.flush();
4093
+ out.close();
4094
+
4095
+ byte[] bytes = baos.toByteArray();
4096
+
4097
+ System.out.println("clone = " + bytes.length);
4098
+
4099
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
4100
+ ObjectInputStream in = new ObjectInputStream(bais);
4101
+ Object obj = in.readObject();
4102
+ in.close();
4103
+
4104
+ return obj;
4105
+ } catch (Exception e)
4106
+ {
4107
+ System.err.println(e);
4108
+ return null;
4109
+ }
4110
+ }
4111
+
4112
+ cRadio GetCurrentTab()
4113
+ {
4114
+ cRadio ab;
4115
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
4116
+ {
4117
+ ab = (cRadio)e.nextElement();
4118
+ if(ab.GetObject() == copy)
4119
+ {
4120
+ return ab;
4121
+ }
4122
+ }
4123
+
4124
+ return null;
4125
+ }
4126
+
4127
+
4128
+ public void Save()
4129
+ {
4130
+ //Save(true);
4131
+ Replace();
4132
+ SetUndoStates();
4133
+ }
4134
+
4135
+ private boolean Equal(byte[] compress, byte[] name)
4136
+ {
4137
+ if (compress.length != name.length)
4138
+ {
4139
+ return false;
4140
+ }
4141
+
4142
+ for (int i=compress.length; --i>=0;)
4143
+ {
4144
+ if (compress[i] != name[i])
4145
+ return false;
4146
+ }
4147
+
4148
+ return true;
4149
+ }
4150
+
4151
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4152
+
4153
+ void DeleteVersion()
4154
+ {
4155
+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
4156
+ {
4157
+ copy.versionlist[i] = copy.versionlist[i+1];
4158
+ }
4159
+
4160
+ CopyChanged();
4161
+
4162
+ SetUndoStates();
4163
+ }
4164
+
4165
+ public boolean Save(boolean user)
4166
+ {
4167
+ System.err.println("Save");
4168
+ Replace();
4169
+
4170
+ //cRadio tab = GetCurrentTab();
4171
+
4172
+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4173
+
4174
+ boolean thesame = false;
4175
+
4176
+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
4177
+// {
4178
+// thesame = true;
4179
+// }
4180
+
4181
+ //EditorFrame.m_MainFrame.requestFocusInWindow();
4182
+ if (!thesame)
4183
+ {
4184
+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
4185
+ {
4186
+ copy.versionlist[i] = copy.versionlist[i-1];
4187
+ }
4188
+
4189
+ //tab.user[tab.versionindex] = user;
4190
+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
4191
+
4192
+ copy.versionlist[++copy.versionindex] = compress;
4193
+
4194
+ // if (increment)
4195
+ // tab.versionindex++;
4196
+ }
4197
+
4198
+ //copy.RestoreBigData(versiontable);
4199
+
4200
+ //assert(hashtable.isEmpty());
4201
+
4202
+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
4203
+// {
4204
+// //tab.user[i] = false;
4205
+// copy.versionlist[i] = null;
4206
+// }
4207
+
4208
+ SetUndoStates();
4209
+
4210
+ // test save
4211
+ if (false)
4212
+ {
4213
+ try
4214
+ {
4215
+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
4216
+ ObjectOutputStream p = new ObjectOutputStream(ostream);
4217
+
4218
+ p.writeObject(copy);
4219
+
4220
+ p.flush();
4221
+
4222
+ ostream.close();
4223
+ } catch (Exception e)
4224
+ {
4225
+ e.printStackTrace();
4226
+ }
4227
+ }
4228
+
4229
+ return !thesame;
4230
+ }
4231
+
4232
+ boolean flashIt = true;
4233
+
4234
+ void RefreshSelection()
4235
+ {
4236
+ Object3D selection = new Object3D();
4237
+
4238
+ for (int i = 0; i < copy.selection.size(); i++)
4239
+ {
4240
+ Object3D elem = copy.selection.elementAt(i);
4241
+
4242
+ Object3D obj = copy.GetObject(elem.GetUUID());
4243
+
4244
+ if (obj == null)
4245
+ {
4246
+ copy.selection.remove(i--);
4247
+ }
4248
+ else
4249
+ {
4250
+ selection.add(obj);
4251
+ copy.selection.setElementAt(obj, i);
4252
+ }
4253
+ }
4254
+
4255
+ flashIt = false;
4256
+ GetTree().clearSelection();
4257
+ for (int i = 0; i < selection.size(); i++)
4258
+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
4259
+ flashIt = true;
4260
+
4261
+ //refreshContents(false);
4262
+ }
4263
+
4264
+ void CopyChanged()
4265
+ {
4266
+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4267
+
4268
+ SetUndoStates();
4269
+
4270
+ boolean temp = CameraPane.SWITCH;
4271
+ CameraPane.SWITCH = false;
4272
+
4273
+ copy.ExtractBigData(versiontable);
4274
+
4275
+ copy.clear();
4276
+
4277
+ copy.skyboxname = obj.skyboxname;
4278
+ copy.skyboxext = obj.skyboxext;
4279
+
4280
+ for (int i=0; i<obj.Size(); i++)
4281
+ {
4282
+ copy.add(obj.get(i));
4283
+ }
4284
+
4285
+ copy.RestoreBigData(versiontable);
4286
+
4287
+ CameraPane.SWITCH = temp;
4288
+
4289
+ RefreshSelection();
4290
+ //assert(hashtable.isEmpty());
4291
+
4292
+ copy.Touch();
4293
+
4294
+ ResetModel();
4295
+ copy.HardTouch(); // recompile?
4296
+
4297
+ cRadio ab;
4298
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
4299
+ {
4300
+ ab = (cRadio)e.nextElement();
4301
+ Object3D test = copy.GetObject(ab.object.GetUUID());
4302
+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
4303
+ if (test != null)
4304
+ {
4305
+ test.editWindow = ab.object.editWindow;
4306
+ ab.object = test;
4307
+ }
4308
+ }
4309
+
4310
+ refreshContents(true);
4311
+ }
4312
+
4313
+ cButton previousVersionButton;
4314
+ cButton restoreButton;
4315
+ cButton replaceButton;
4316
+ cButton nextVersionButton;
4317
+ cButton saveVersionButton;
4318
+ cButton deleteVersionButton;
4319
+
4320
+ boolean muteSlider;
4321
+
4322
+ int VersionCount()
4323
+ {
4324
+ int count = 0;
4325
+
4326
+ for (int i = copy.versionlist.length; --i >= 0;)
4327
+ {
4328
+ if (copy.versionlist[i] != null)
4329
+ count++;
4330
+ }
4331
+
4332
+ return count;
4333
+ }
4334
+
4335
+ void SetUndoStates()
4336
+ {
4337
+ //if (true)
4338
+ // return;
4339
+
4340
+ //cRadio tab = GetCurrentTab();
4341
+
4342
+ restoreButton.setEnabled(copy.versionindex != -1);
4343
+ replaceButton.setEnabled(copy.versionindex != -1);
4344
+
4345
+ previousVersionButton.setEnabled(copy.versionindex > 0);
4346
+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4347
+
4348
+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4349
+ copy.versionlist[copy.versionindex + 1] != null);
4350
+
4351
+ muteSlider = true;
4352
+ versionSlider.setMinimum(0);
4353
+ versionSlider.setMaximum(VersionCount() - 1);
4354
+ versionSlider.setInteger(copy.versionindex);
4355
+ versionSlider.setEnabled(copy.versionindex != -1);
4356
+ muteSlider = false;
4357
+ }
4358
+
4359
+ public boolean PreviousVersion()
4360
+ {
4361
+ // Option?
4362
+ Replace();
4363
+
4364
+ System.err.println("Undo");
4365
+
4366
+ //cRadio tab = GetCurrentTab();
4367
+
4368
+ if (copy.versionindex == 0)
4369
+ {
4370
+ java.awt.Toolkit.getDefaultToolkit().beep();
4371
+ return false;
4372
+ }
4373
+
4374
+// if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
4375
+// {
4376
+// if (Save(false))
4377
+// tab.versionindex -= 1;
4378
+// else
4379
+// {
4380
+// if (tab.versionindex <= 0)
4381
+// return false;
4382
+// else
4383
+// tab.versionindex -= 1;
4384
+// }
4385
+// }
4386
+
4387
+ copy.versionindex -= 1;
4388
+
4389
+ CopyChanged();
4390
+
4391
+ return true;
4392
+ }
4393
+
4394
+ public boolean Restore()
4395
+ {
4396
+ System.err.println("Restore");
4397
+
4398
+ //cRadio tab = GetCurrentTab();
4399
+
4400
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4401
+ {
4402
+ java.awt.Toolkit.getDefaultToolkit().beep();
4403
+ return false;
4404
+ }
4405
+
4406
+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4407
+ CopyChanged();
4408
+
4409
+ return true;
4410
+ }
4411
+
4412
+ public boolean Replace()
4413
+ {
4414
+ System.err.println("Replace");
4415
+
4416
+ //cRadio tab = GetCurrentTab();
4417
+
4418
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4419
+ {
4420
+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
4421
+ return false;
4422
+ }
4423
+
4424
+ copy.versionlist[copy.versionindex] = Duplicate(copy);
4425
+
4426
+ return true;
4427
+ }
4428
+
4429
+ public void NextVersion()
4430
+ {
4431
+ // Option?
4432
+ Replace();
4433
+
4434
+ //cRadio tab = GetCurrentTab();
4435
+
4436
+ if (copy.versionlist[copy.versionindex + 1] == null)
4437
+ {
4438
+ java.awt.Toolkit.getDefaultToolkit().beep();
4439
+ return;
4440
+ }
4441
+
4442
+ copy.versionindex += 1;
4443
+
4444
+ CopyChanged();
4445
+
4446
+ //if (!tab.user[tab.versionindex])
4447
+ // tab.graphs[tab.versionindex] = null;
4448
+ }
4449
+
4450
+ void ImportGFD()
4451
+ {
4452
+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4453
+ browser.show();
4454
+ String filename = browser.getFile();
4455
+ if (filename != null && filename.length() > 0)
4456
+ {
4457
+ String fullname = browser.getDirectory() + filename;
4458
+
4459
+ //Object3D readobj =
4460
+ objEditor.ReadGFD(fullname, objEditor);
4461
+ //makeSomething(readobj);
4462
+ }
4463
+ }
4464
+
4465
+ void ImportVRMLX3D()
4466
+ {
4467
+ if (Grafreed.standAlone)
4468
+ {
4469
+ /**/
4470
+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4471
+ browser.show();
4472
+ String filename = browser.getFile();
4473
+ if (filename != null && filename.length() > 0)
4474
+ {
4475
+ String fullname = browser.getDirectory() + filename;
4476
+ LoadVRMLX3D(fullname);
4477
+ }
4478
+ /**/
4479
+ }
4480
+ }
4481
+
31774482 void ToggleAnimation()
31784483 {
31794484 if (!Globals.ANIMATION)
31804485 {
31814486 FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3182
- browser.show();
4487
+ browser.setVisible(true);
31834488 String filename = browser.getFile();
31844489 if (filename != null && filename.length() > 0)
31854490 {
....@@ -3189,8 +4494,8 @@
31894494
31904495 Globals.ANIMATION ^= true;
31914496
3192
- GrafreeD.wav.cursor = 0;
3193
- GrafreeD.wav.loop = 0;
4497
+ Grafreed.wav.cursor = 0;
4498
+ Grafreed.wav.loop = 0;
31944499 }
31954500 } else
31964501 {
....@@ -3240,7 +4545,7 @@
32404545 void CreateMaterial()
32414546 {
32424547 //copy.ClearMaterial(); // PATCH
3243
- copy.CreateMaterialS(multiplyToggle.isSelected());
4548
+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
32444549 if (copy.selection.size() > 0)
32454550 //SetMaterial(copy);
32464551 {
....@@ -3291,7 +4596,7 @@
32914596 assert false;
32924597 }
32934598
3294
- void EditSelection()
4599
+ void EditSelection(boolean newWindow)
32954600 {
32964601 }
32974602
....@@ -3299,11 +4604,11 @@
32994604 {
33004605 copy.ResetBlockLoop(); // temporary problem
33014606
3302
- boolean random = CameraPane.RANDOM;
3303
- CameraPane.RANDOM = false; // parse everything
4607
+ boolean random = CameraPane.SWITCH;
4608
+ CameraPane.SWITCH = false; // parse everything
33044609 copy.ResetDisplayList();
33054610 copy.HardTouch();
3306
- CameraPane.RANDOM = random;
4611
+ CameraPane.SWITCH = random;
33074612 }
33084613
33094614 // public void applySelf()
....@@ -3350,7 +4655,7 @@
33504655 //copy.material = new cMaterial(copy.GetMaterial());
33514656
33524657 current.color = (float) colorField.getFloat();
3353
- current.modulation = (float) modulationField.getFloat();
4658
+ current.modulation = (float) saturationField.getFloat();
33544659 current.metalness = (float) metalnessField.getFloat();
33554660 current.diffuse = (float) diffuseField.getFloat();
33564661 current.specular = (float) specularField.getFloat();
....@@ -3377,6 +4682,36 @@
33774682 {
33784683 //System.out.println("Propagate = " + propagate);
33794684 copy.UpdateMaterial(anchor, current, propagate);
4685
+
4686
+ if (copy.material != null)
4687
+ {
4688
+ cMaterial mat = copy.material;
4689
+
4690
+ colorField.SetToolTipValue((mat.color));
4691
+ saturationField.SetToolTipValue((mat.modulation));
4692
+ metalnessField.SetToolTipValue((mat.metalness));
4693
+ diffuseField.SetToolTipValue((mat.diffuse));
4694
+ specularField.SetToolTipValue((mat.specular));
4695
+ shininessField.SetToolTipValue((mat.shininess));
4696
+ shiftField.SetToolTipValue((mat.shift));
4697
+ ambientField.SetToolTipValue((mat.ambient));
4698
+ lightareaField.SetToolTipValue((mat.lightarea));
4699
+ diffusenessField.SetToolTipValue((mat.factor));
4700
+ velvetField.SetToolTipValue((mat.velvet));
4701
+ sheenField.SetToolTipValue((mat.sheen));
4702
+ subsurfaceField.SetToolTipValue((mat.subsurface));
4703
+ backlitField.SetToolTipValue((mat.bump));
4704
+ anisoField.SetToolTipValue((mat.aniso));
4705
+ anisoVField.SetToolTipValue((mat.anisoV));
4706
+ cameraField.SetToolTipValue((mat.cameralight));
4707
+ selfshadowField.SetToolTipValue((mat.diffuseness));
4708
+ shadowField.SetToolTipValue((mat.shadow));
4709
+ textureField.SetToolTipValue((mat.texture));
4710
+ opacityField.SetToolTipValue((mat.opacity));
4711
+ fakedepthField.SetToolTipValue((mat.fakedepth));
4712
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4713
+ }
4714
+
33804715 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
33814716 {
33824717 copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
....@@ -3405,9 +4740,26 @@
34054740 //copy.Touch();
34064741 }
34074742
4743
+ cNumberSlider versionSlider;
4744
+
34084745 public void stateChanged(ChangeEvent e)
34094746 {
34104747 // assert(false);
4748
+ if (e.getSource() == versionSlider)
4749
+ {
4750
+ if (muteSlider)
4751
+ return;
4752
+
4753
+ int version = versionSlider.getInteger();
4754
+
4755
+ if (version != -1 && copy.versionlist[version] != null)
4756
+ {
4757
+ copy.versionindex = version;
4758
+ CopyChanged();
4759
+ }
4760
+
4761
+ return;
4762
+ }
34114763
34124764 if (freezematerial)
34134765 {
....@@ -3421,6 +4773,7 @@
34214773 || e.getSource() == apertureField
34224774 || e.getSource() == shadowblurField)
34234775 {
4776
+ new Exception().printStackTrace();
34244777 System.exit(0);
34254778 cameraView.options1[0] = (float) focusField.getFloat() * 10;
34264779 cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
....@@ -3442,6 +4795,12 @@
34424795 {
34434796 //System.out.println("stateChanged = " + this);
34444797 materialtouched = true;
4798
+
4799
+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
4800
+ {
4801
+ saturationField.setFloat(1);
4802
+ }
4803
+
34454804 applySelf();
34464805 //System.out.println("this = " + this);
34474806 //System.out.println("PARENT = " + parent);
....@@ -3491,7 +4850,7 @@
34914850 }
34924851
34934852 if (normalpushField != null)
3494
- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
4853
+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
34954854 }
34964855
34974856 void SnapObject()
....@@ -3741,6 +5100,7 @@
37415100 {
37425101 if (GetTree() != null)
37435102 {
5103
+ GetTree().revalidate();
37445104 GetTree().repaint();
37455105 }
37465106
....@@ -3749,12 +5109,17 @@
37495109 ctrlPanel.validate(); // ? new
37505110 ctrlPanel.repaint();
37515111 }
5112
+
5113
+ if (previousVersionButton != null && copy.versionlist != null)
5114
+ SetUndoStates();
37525115 }
37535116
37545117 static TweenManager tweenManager = new TweenManager();
37555118
37565119 void makeSomething(Object3D thing, boolean resetmodel) // deselect)
37575120 {
5121
+ if (Globals.REPLACEONMAKE) // && resetmodel)
5122
+ Save();
37585123 //Tween.set(thing, 0).target(1).start(tweenManager);
37595124 //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
37605125 // if (thing instanceof GenericJointDemo)
....@@ -3841,6 +5206,12 @@
38415206 {
38425207 ResetModel();
38435208 Select(thing.GetTreePath(), true, false); // unselect... false);
5209
+
5210
+ if (thing.Size() == 0)
5211
+ {
5212
+ //EditSelection(false);
5213
+ }
5214
+
38445215 refreshContents();
38455216 }
38465217
....@@ -3958,6 +5329,7 @@
39585329 }
39595330 }
39605331 }
5332
+
39615333 LoadGFDThread loadGFDThread;
39625334
39635335 void ReadGFD(String fullname, iCallBack cb)
....@@ -3977,8 +5349,10 @@
39775349
39785350 try
39795351 {
5352
+ // Try compressed version first.
39805353 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3981
- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
5354
+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
5355
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
39825356
39835357 readobj = (Object3D) p.readObject();
39845358 istream.close();
....@@ -3986,7 +5360,22 @@
39865360 readobj.ResetDisplayList();
39875361 } catch (Exception e)
39885362 {
3989
- e.printStackTrace();
5363
+ if (!e.toString().contains("GZIP"))
5364
+ e.printStackTrace();
5365
+
5366
+ try
5367
+ {
5368
+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
5369
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
5370
+
5371
+ readobj = (Object3D) p.readObject();
5372
+ istream.close();
5373
+
5374
+ readobj.ResetDisplayList();
5375
+ } catch (Exception e2)
5376
+ {
5377
+ e2.printStackTrace();
5378
+ }
39905379 }
39915380 // catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
39925381 // catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4032,6 +5421,12 @@
40325421
40335422 void LoadIt(Object obj)
40345423 {
5424
+ if (obj == null)
5425
+ {
5426
+ // Invalid file
5427
+ return;
5428
+ }
5429
+
40355430 System.out.println("Loaded " + obj);
40365431 //new Exception().printStackTrace();
40375432 Object3D readobj = (Object3D) obj;
....@@ -4041,10 +5436,14 @@
40415436
40425437 if (readobj != null)
40435438 {
5439
+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
5440
+ // Save();
40445441 try
40455442 {
40465443 //readobj.deepCopySelf(copy);
40475444 copy.clear(); // june 2014
5445
+ copy.skyboxname = readobj.skyboxname;
5446
+ copy.skyboxext = readobj.skyboxext;
40485447 for (int i = 0; i < readobj.size(); i++)
40495448 {
40505449 Object3D child = readobj.get(i); // reserve(i);
....@@ -4085,6 +5484,7 @@
40855484 }
40865485 } catch (ClassCastException e)
40875486 {
5487
+ e.printStackTrace();
40885488 assert (false);
40895489 Composite c = (Composite) copy;
40905490 c.children.clear();
....@@ -4095,17 +5495,31 @@
40955495 c.addChild(csg);
40965496 }
40975497
5498
+ copy.versionlist = readobj.versionlist;
5499
+ copy.versionindex = readobj.versionindex;
5500
+
5501
+ if (copy.versionlist == null)
5502
+ {
5503
+ // Backward compatibility
5504
+ copy.versionlist = new Object3D[100];
5505
+ copy.versionindex = -1;
5506
+
5507
+ Save(true);
5508
+ }
5509
+
5510
+ //? SetUndoStates();
5511
+
40985512 ResetModel();
40995513 copy.HardTouch(); // recompile?
41005514 refreshContents();
41015515 }
41025516 }
41035517
4104
- void load() // throws ClassNotFoundException
5518
+ void Open() // throws ClassNotFoundException
41055519 {
4106
- if (GrafreeD.standAlone)
5520
+ if (Grafreed.standAlone)
41075521 {
4108
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5522
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
41095523 browser.show();
41105524 String filename = browser.getFile();
41115525 if (filename != null && filename.length() > 0)
....@@ -4190,11 +5604,13 @@
41905604 try
41915605 {
41925606 FileOutputStream ostream = new FileOutputStream(lastname);
4193
- ObjectOutputStream p = new ObjectOutputStream(ostream);
5607
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
5608
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
41945609
41955610 p.writeObject(copy);
41965611 p.flush();
41975612
5613
+ zstream.close();
41985614 ostream.close();
41995615
42005616 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4202,19 +5618,23 @@
42025618 //ps.print(buffer.toString());
42035619 } catch (IOException e)
42045620 {
5621
+ e.printStackTrace();
42055622 }
42065623 }
5624
+
42075625 String lastname;
42085626
42095627 void saveAs()
42105628 {
4211
- if (GrafreeD.standAlone)
5629
+ if (Grafreed.standAlone)
42125630 {
42135631 FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
42145632 browser.setVisible(true);
42155633 String filename = browser.getFile();
42165634 if (filename != null && filename.length() > 0)
42175635 {
5636
+ if (!filename.endsWith(".gfd"))
5637
+ filename += ".gfd";
42185638 lastname = browser.getDirectory() + filename;
42195639 save();
42205640 }
....@@ -4313,13 +5733,13 @@
43135733 try
43145734 {
43155735 FileOutputStream ostream = new FileOutputStream(filename);
4316
- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4317
- ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
5736
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
5737
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
43185738
43195739 Object3D objectparent = obj.parent;
43205740 obj.parent = null;
43215741
4322
- Object3D object = (Object3D) GrafreeD.clone(obj);
5742
+ Object3D object = (Object3D) Grafreed.clone(obj);
43235743
43245744 obj.parent = objectparent;
43255745
....@@ -4331,8 +5751,8 @@
43315751 p.writeObject(object);
43325752 p.flush();
43335753
5754
+ zstream.close();
43345755 ostream.close();
4335
- // zstream.close();
43365756
43375757 // group.selection.get(0).parent = parent;
43385758 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4353,7 +5773,7 @@
43535773 buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
43545774 cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
43555775 copy.generatePOV(buffer);
4356
- if (GrafreeD.standAlone)
5776
+ if (Grafreed.standAlone)
43575777 {
43585778 FileDialog browser = new FileDialog(frame, "Export POV", 1);
43595779 browser.show();
....@@ -4379,21 +5799,20 @@
43795799 Object3D client;
43805800 Object3D copy;
43815801 MenuBar menuBar;
4382
- Menu windowMenu;
4383
- MenuItem loadItem;
5802
+ Menu fileMenu;
5803
+ MenuItem newItem;
5804
+ MenuItem openItem;
43845805 MenuItem saveItem;
43855806 MenuItem saveAsItem;
43865807 MenuItem exportAsItem;
43875808 MenuItem reexportItem;
43885809 MenuItem povItem;
43895810 MenuItem closeItem;
4390
- Menu cameraMenu;
5811
+
43915812 CheckboxMenuItem zBufferItem;
43925813 //MenuItem normalLensItem;
4393
- MenuItem editCameraItem;
4394
- MenuItem revertCameraItem;
4395
- CheckboxMenuItem toggleLiveItem;
43965814 MenuItem stepItem;
5815
+ CheckboxMenuItem toggleLiveItem;
43975816 CheckboxMenuItem toggleFullScreenItem;
43985817 CheckboxMenuItem toggleTimelineItem;
43995818 CheckboxMenuItem toggleRenderItem;
....@@ -4402,25 +5821,40 @@
44025821 CheckboxMenuItem toggleFootContactItem;
44035822 CheckboxMenuItem toggleDLItem;
44045823 CheckboxMenuItem toggleTextureItem;
4405
- CheckboxMenuItem toggleRandomItem;
5824
+ CheckboxMenuItem toggleSwitchItem;
44065825 CheckboxMenuItem toggleRootItem;
44075826 CheckboxMenuItem animationItem;
5827
+ MenuItem archiveItem;
44085828 CheckboxMenuItem toggleHandleItem;
44095829 CheckboxMenuItem togglePaintItem;
44105830 JSplitPane mainPanel;
44115831 JScrollPane scrollpane;
5832
+
44125833 JPanel toolbarPanel;
4413
- JPanel treePanel;
5834
+
5835
+ cGridBag treePanel;
5836
+
44145837 JPanel radioPanel;
44155838 ButtonGroup buttonGroup;
4416
- cGridBag ctrlPanel;
5839
+
5840
+ cGridBag toolboxPanel;
5841
+ cGridBag skyboxPanel;
44175842 cGridBag materialPanel;
5843
+ cGridBag ctrlPanel;
5844
+
44185845 JScrollPane infoPanel;
5846
+
44195847 cGridBag optionsPanel;
5848
+
44205849 JTabbedPane objectPanel;
5850
+ boolean materialFlushed;
5851
+ Object3D latestObject;
5852
+
44215853 cGridBag XYZPanel;
5854
+
44225855 JSplitPane gridPanel;
44235856 JSplitPane bigPanel;
5857
+
44245858 cGridBag bigThree;
44255859 cGridBag scenePanel;
44265860 cGridBag centralPanel;
....@@ -4478,7 +5912,7 @@
44785912 JLabel colorLabel;
44795913 cNumberSlider colorField;
44805914 JLabel modulationLabel;
4481
- cNumberSlider modulationField;
5915
+ cNumberSlider saturationField;
44825916 JLabel metalnessLabel;
44835917 cNumberSlider metalnessField;
44845918 JLabel diffuseLabel;
....@@ -4509,6 +5943,7 @@
45095943 cNumberSlider anisoField;
45105944 JLabel anisoVLabel;
45115945 cNumberSlider anisoVField;
5946
+
45125947 JLabel cameraLabel;
45135948 cNumberSlider cameraField;
45145949 JLabel selfshadowLabel;
....@@ -4523,6 +5958,7 @@
45235958 cNumberSlider fakedepthField;
45245959 JLabel shadowbiasLabel;
45255960 cNumberSlider shadowbiasField;
5961
+
45265962 JLabel bumpLabel;
45275963 cNumberSlider bumpField;
45285964 JLabel noiseLabel;
....@@ -4535,8 +5971,13 @@
45355971 cNumberSlider fogField;
45365972 JLabel opacityPowerLabel;
45375973 cNumberSlider opacityPowerField;
4538
- JTree jTree;
5974
+ cTree jTree;
45395975 //ObjectUI parent;
45405976
45415977 cNumberSlider normalpushField;
5978
+
5979
+ private MenuItem importGFDItem;
5980
+ private MenuItem importVRMLX3DItem;
5981
+ private MenuItem import3DSItem;
5982
+ private MenuItem importOBJItem;
45425983 }