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
....@@ -145,7 +225,7 @@
145225
146226 objEditor.ctrlPanel.remove(namePanel);
147227
148
- if (!GroupEditor.allparams)
228
+ if (!allparams)
149229 return;
150230
151231 // objEditor.ctrlPanel.remove(liveCB);
....@@ -168,7 +248,8 @@
168248 // objEditor.ctrlPanel.remove(remarkButton);
169249
170250 objEditor.ctrlPanel.remove(setupPanel);
171
- objEditor.ctrlPanel.remove(commandsPanel);
251
+ objEditor.ctrlPanel.remove(setupPanel2);
252
+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172253 objEditor.ctrlPanel.remove(pushPanel);
173254 //objEditor.ctrlPanel.remove(fillPanel);
174255
....@@ -216,6 +297,14 @@
216297 client = inClient;
217298 copy = client;
218299
300
+// if (copy.versionlist == null)
301
+// {
302
+// copy.versionlist = new Object3D[100];
303
+// copy.versionindex = -1;
304
+//
305
+// callee.Save(true);
306
+// }
307
+
219308 // "this" is not called: SetupUI2(objEditor);
220309 }
221310
....@@ -229,6 +318,14 @@
229318 client = inClient;
230319 copy = client;
231320
321
+ if (copy.versionlist == null)
322
+ {
323
+ copy.versionlist = new Object3D[100];
324
+ copy.versionindex = -1;
325
+
326
+// Save(true);
327
+ }
328
+
232329 SetupUI2(callee.GetEditor());
233330 }
234331
....@@ -243,6 +340,7 @@
243340 //localCopy.parent = null;
244341
245342 frame = new JFrame();
343
+ frame.setUndecorated(false);
246344 objEditor = this;
247345 this.callee = callee;
248346
....@@ -260,6 +358,14 @@
260358 copy = localCopy;
261359 copy.editWindow = this;
262360
361
+// if (copy.versionlist == null)
362
+// {
363
+// copy.versionlist = new Object3D[100];
364
+// copy.versionindex = -1;
365
+//
366
+// Save(true);
367
+// }
368
+
263369 SetupMenu();
264370
265371 //SetupName(objEditor); // new
....@@ -273,28 +379,49 @@
273379 return frame.action(event, obj);
274380 }
275381
382
+ // Cannot work without static
383
+ static boolean allparams = true;
384
+
385
+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
386
+
276387 void SetupMenu()
277388 {
278389 frame.setMenuBar(menuBar = new MenuBar());
279
- menuBar.add(windowMenu = new Menu("File"));
280
- windowMenu.add(loadItem = new MenuItem("Load..."));
281
- windowMenu.add("-");
282
- windowMenu.add(saveItem = new MenuItem("Save"));
283
- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
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..."));
284410 //windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
285
- windowMenu.add("-");
286
- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
287
- windowMenu.add(reexportItem = new MenuItem("Re-export"));
288
- windowMenu.add("-");
411
+ fileMenu.add("-");
412
+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
413
+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
414
+ fileMenu.add("-");
289415 if (client.parent != null)
290416 {
291
- windowMenu.add(closeItem = new MenuItem("Close"));
417
+ fileMenu.add(closeItem = new MenuItem("Close"));
292418 } else
293419 {
294
- windowMenu.add(closeItem = new MenuItem("Exit"));
420
+ fileMenu.add(closeItem = new MenuItem("Exit"));
295421 }
296422
297
- loadItem.addActionListener(this);
423
+ newItem.addActionListener(this);
424
+ openItem.addActionListener(this);
298425 saveItem.addActionListener(this);
299426 saveAsItem.addActionListener(this);
300427 exportAsItem.addActionListener(this);
....@@ -302,101 +429,71 @@
302429 //povItem.addActionListener(this);
303430 closeItem.addActionListener(this);
304431
305
- menuBar.add(cameraMenu = new Menu("View"));
306
- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
307
- //zBufferItem.addActionListener(this);
308
- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
309
- //normalLensItem.addActionListener(this);
310
- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
311
- revertCameraItem.addActionListener(this);
312
-
313
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314
- toggleFullScreenItem.addItemListener(this);
315
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316
- cameraMenu.add("-");
317
-
318
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319
- toggleTextureItem.addItemListener(this);
320
- toggleTextureItem.setState(CameraPane.textureon);
321
-
322
- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
323
- toggleSwitchItem.addItemListener(this);
324
- toggleSwitchItem.setState(CameraPane.SWITCH);
325
-
326
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
327
- toggleHandleItem.addItemListener(this);
328
- toggleHandleItem.setState(CameraPane.HANDLES);
329
-
330
- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
331
- togglePaintItem.addItemListener(this);
332
- togglePaintItem.setState(CameraPane.PAINTMODE);
333
-
334
- if (Globals.ADVANCED)
335
- {
336
- cameraMenu.add("-");
337
- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
338
- toggleLiveItem.addItemListener(this);
339
- toggleLiveItem.setState(Globals.isLIVE());
340
-
341
- cameraMenu.add(stepItem = new MenuItem("Step"));
342
- stepItem.addActionListener(this);
343
- // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
344
- // toggleDLItem.addItemListener(this);
345
- // toggleDLItem.setState(false);
346
-
347
- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
348
- toggleRenderItem.addItemListener(this);
349
- toggleRenderItem.setState(!CameraPane.frozen);
350
-
351
- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
352
- toggleDebugItem.addItemListener(this);
353
- toggleDebugItem.setState(CameraPane.DEBUG);
354
-
355
- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
356
- toggleFrustumItem.addItemListener(this);
357
- toggleFrustumItem.setState(CameraPane.FRUSTUM);
358
-
359
- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
360
- toggleFootContactItem.addItemListener(this);
361
- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
362
-
363
- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
364
- toggleTimelineItem.addItemListener(this);
365
- }
366
-
367
-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
368
-// toggleRootItem.addItemListener(this);
369
-// toggleRootItem.setState(false);
370
-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
371
-// animationItem.addItemListener(this);
372
-// animationItem.setState(CameraPane.ANIMATION);
373
- cameraMenu.add("-");
374
- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
375
- editCameraItem.addActionListener(this);
376
-
377432 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
+
378459 toolbarPanel = new JPanel();
379460 toolbarPanel.setName("Toolbar");
461
+
380462 treePanel = new cGridBag();
381463 treePanel.setName("Tree");
464
+
465
+ editPanel = new cGridBag().setVertical(true);
466
+ //editPanel.setName("Edit");
467
+
382468 ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
383
- ctrlPanel.setName("Edit");
384
- materialPanel = new cGridBag().setVertical(true);
385
- materialPanel.setName("Material");
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
+
386482 /*JTextPane*/
387483 infoarea = createTextPane();
388484 doc = infoarea.getStyledDocument();
389485
390486 infoarea.setEditable(true);
391487 SetText();
488
+
392489 // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
393490 // infoarea.setOpaque(false);
394491 // //infoarea.setForeground(textcolor);
395492 // TEXTAREA infoarea.setLineWrap(true);
396493 // TEXTAREA infoarea.setWrapStyleWord(true);
397494 infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
398
- infoPanel.setPreferredSize(new Dimension(50, 200));
399
- infoPanel.setName("Info");
495
+ infoPanel.setPreferredSize(new Dimension(1, 1));
496
+ //infoPanel.setName("Info");
400497 //infoPanel.setLayout(new BorderLayout());
401498 //infoPanel.add(createTextPane());
402499
....@@ -407,7 +504,14 @@
407504 mainPanel.setDividerSize(9);
408505 mainPanel.setDividerLocation(0.5); //1.0);
409506 mainPanel.setResizeWeight(0.5);
410
-
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
+
411515 //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
412516 //mainPanel.setLayout(new GridBagLayout());
413517 toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -475,10 +579,10 @@
475579 e.printStackTrace();
476580 }
477581
478
- String selection = infoarea.getText();
479
- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
480
- java.awt.datatransfer.Clipboard clipboard =
481
- Toolkit.getDefaultToolkit().getSystemClipboard();
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();
482586 //clipboard.setContents(data, data);
483587 }
484588
....@@ -501,13 +605,13 @@
501605 //SendInfo("Name:", "bold");
502606 if (sel.GetTextures() != null || debug)
503607 {
504
- si.SendInfo(sel.toString(), "bold");
608
+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
505609 //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
506610 if (sel.Size() > 0)
507611 {
508612 si.SendInfo("#children = " + sel.Size(), "regular");
509613 }
510
- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
614
+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
511615 if (debug)
512616 {
513617 try
....@@ -549,7 +653,7 @@
549653 }
550654 if (sel.support != null)
551655 {
552
- si.SendInfo(" support: " + sel.support, "regular");
656
+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
553657 }
554658 if (sel.scriptnode != null)
555659 {
....@@ -638,21 +742,158 @@
638742 }
639743 }
640744
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
+
641806 void ToggleFullScreen()
642807 {
643
- if (CameraPane.FULLSCREEN)
808
+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
809
+
810
+ cameraView.ToggleFullScreen();
811
+
812
+ if (!CameraPane.FULLSCREEN)
644813 {
645
- frame.getContentPane().remove(/*"Center",*/bigThree);
646
- framePanel.add(bigThree);
647
- 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
+
648837 } else
649838 {
650
- frame.getContentPane().remove(/*"Center",*/framePanel);
651
- framePanel.remove(bigThree);
652
- 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);
653861 }
654
- cameraView.ToggleFullScreen();
862
+ frame.validate();
863
+
864
+ cameraView.requestFocusInWindow();
655865 }
866
+
867
+ void CollapseToolbar()
868
+ {
869
+ framePanel.setDividerLocation(0);
870
+ //frame.validate();
871
+
872
+ cameraView.requestFocusInWindow();
873
+ }
874
+
875
+ private Object3D Duplicate(Object3D object)
876
+ {
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
+ }
656897
657898 private JTextPane createTextPane()
658899 {
....@@ -752,7 +993,7 @@
752993 protected static ImageIcon createImageIcon(String path,
753994 String description)
754995 {
755
- java.net.URL imgURL = GrafreeD.class.getResource(path);
996
+ java.net.URL imgURL = Grafreed.class.getResource(path);
756997 if (imgURL != null)
757998 {
758999 return new ImageIcon(imgURL, description);
....@@ -775,6 +1016,7 @@
7751016 {
7761017 SetupMaterial(materialPanel);
7771018 }
1019
+
7781020 //SetupName();
7791021 //SetupViews();
7801022 }
....@@ -784,6 +1026,7 @@
7841026 // NumberSlider vDivsField;
7851027 // JCheckBox endcaps;
7861028 JCheckBox liveCB;
1029
+ JCheckBox selectableCB;
7871030 JCheckBox hideCB;
7881031 JCheckBox link2masterCB;
7891032 JCheckBox markCB;
....@@ -791,7 +1034,12 @@
7911034 JCheckBox speedupCB;
7921035 JCheckBox rewindCB;
7931036 JCheckBox flipVCB;
1037
+
1038
+ cCheckBox toggleTextureCB;
1039
+ cCheckBox toggleSwitchCB;
1040
+
7941041 JComboBox texresMenu;
1042
+
7951043 JButton resetButton;
7961044 JButton stepButton;
7971045 JButton stepAllButton;
....@@ -800,9 +1048,13 @@
8001048 JButton fasterButton;
8011049 JButton remarkButton;
8021050
1051
+ cGridBag editPanel;
1052
+ cGridBag editCommandsPanel;
1053
+
8031054 cGridBag namePanel;
8041055 cGridBag setupPanel;
805
- cGridBag commandsPanel;
1056
+ cGridBag setupPanel2;
1057
+ cGridBag objectCommandsPanel;
8061058 cGridBag pushPanel;
8071059 cGridBag fillPanel;
8081060
....@@ -973,62 +1225,84 @@
9731225
9741226 namePanel = new cGridBag();
9751227
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
+
9761240 nameField = AddText(namePanel, copy.GetName());
977
- namePanel.add(nameField);
1241
+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
9781242 oe.ctrlPanel.add(namePanel);
9791243
9801244 oe.ctrlPanel.Return();
9811245
982
- if (!GroupEditor.allparams)
1246
+ if (!allparams)
9831247 return;
9841248
9851249 setupPanel = new cGridBag().setVertical(false);
9861250
9871251 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
9881252 liveCB.setToolTipText("Animate object");
1253
+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1254
+ selectableCB.setToolTipText("Make object selectable");
1255
+// Return();
1256
+
9891257 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
9901258 hideCB.setToolTipText("Hide object");
991
-// Return();
9921259 markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
993
- markCB.setToolTipText("Set the animation target transform");
1260
+ markCB.setToolTipText("As animation target transform");
9941261
995
- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
1262
+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1263
+
1264
+ setupPanel2 = new cGridBag().setVertical(false);
1265
+
1266
+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
9961267 rewindCB.setToolTipText("Rewind animation");
9971268
998
- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
999
- randomCB.setToolTipText("Option for switch node");
1269
+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1270
+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
10001271
1272
+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1273
+ link2masterCB.setToolTipText("Attach to support");
1274
+
10011275 if (Globals.ADVANCED)
10021276 {
1003
- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1004
- link2masterCB.setToolTipText("Attach to support");
1005
- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
1277
+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
10061278 speedupCB.setToolTipText("Option motion capture");
10071279 }
10081280
10091281 oe.ctrlPanel.add(setupPanel);
10101282 oe.ctrlPanel.Return();
1283
+ oe.ctrlPanel.add(setupPanel2);
1284
+ oe.ctrlPanel.Return();
10111285
1012
- commandsPanel = new cGridBag().setVertical(false);
1286
+ objectCommandsPanel = new cGridBag().setVertical(false);
10131287
1014
- resetButton = AddButton(commandsPanel, "Reset");
1288
+ resetButton = AddButton(objectCommandsPanel, "Reset");
10151289 resetButton.setToolTipText("Jump to frame zero");
1016
- stepButton = AddButton(commandsPanel, "Step");
1290
+ stepButton = AddButton(objectCommandsPanel, "Step");
10171291 stepButton.setToolTipText("Step one frame");
10181292 // resetAllButton = AddButton(oe, "Reset All");
10191293 // stepAllButton = AddButton(oe, "Step All");
10201294 // Return();
1021
- slowerButton = AddButton(commandsPanel, "Slow");
1295
+ slowerButton = AddButton(objectCommandsPanel, "Slow");
10221296 slowerButton.setToolTipText("Decrease animation speed");
1023
- fasterButton = AddButton(commandsPanel, "Fast");
1297
+ fasterButton = AddButton(objectCommandsPanel, "Fast");
10241298 fasterButton.setToolTipText("Increase animation speed");
1025
- remarkButton = AddButton(commandsPanel, "Remark");
1299
+ remarkButton = AddButton(objectCommandsPanel, "Remark");
10261300 remarkButton.setToolTipText("Set the current transform as the target");
10271301
1028
- oe.ctrlPanel.add(commandsPanel);
1302
+ oe.ctrlPanel.add(objectCommandsPanel);
10291303 oe.ctrlPanel.Return();
10301304
1031
- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
1305
+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
10321306 normalpushField = (cNumberSlider)pushPanel.getComponent(1);
10331307 //Return();
10341308
....@@ -1231,8 +1505,11 @@
12311505 //worldPanel.setName("World");
12321506 centralPanel = new cGridBag();
12331507 centralPanel.preferredWidth = 20;
1234
- timelinePanel = new JPanel(new BorderLayout());
1235
- 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);
12361513
12371514 cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
12381515 cameraPanel.setContinuousLayout(true);
....@@ -1241,7 +1518,10 @@
12411518 // cameraPanel.setDividerSize(9);
12421519 cameraPanel.setResizeWeight(1.0);
12431520
1521
+ }
1522
+
12441523 centralPanel.add(cameraView);
1524
+ centralPanel.setFocusable(true);
12451525 //frame.setJMenuBar(timelineMenubar);
12461526 //centralPanel.add(timelinePanel);
12471527
....@@ -1267,6 +1547,7 @@
12671547 XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
12681548 XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
12691549 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1550
+ //XYZPanel.setName("XYZ");
12701551
12711552 /*
12721553 gridPanel = new JPanel(); //new BorderLayout());
....@@ -1304,13 +1585,29 @@
13041585 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
13051586 //tmp.setName("Edit");
13061587 objectPanel.add(materialPanel);
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");
1594
+
1595
+ objectPanel.add(skyboxPanel);
1596
+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1597
+ objectPanel.setToolTipTextAt(2, "Backgrounds");
1598
+
13071599 // JPanel north = new JPanel(new BorderLayout());
13081600 // north.setName("Edit");
13091601 // north.add(ctrlPanel, BorderLayout.NORTH);
13101602 // objectPanel.add(north);
1311
- objectPanel.add(ctrlPanel);
1312
- objectPanel.add(infoPanel);
1313
-
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
+
13141611 /*
13151612 aConstraints.gridx = 0;
13161613 aConstraints.gridwidth = 1;
....@@ -1318,7 +1615,7 @@
13181615 aConstraints.gridy += 1;
13191616 aConstraints.gridwidth = 1;
13201617 mainPanel.add(objectPanel, aConstraints);
1321
- */
1618
+ */
13221619
13231620 scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
13241621 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1330,14 +1627,12 @@
13301627 scrollpane.addMouseWheelListener(this); // Default not fast enough
13311628
13321629 /*JTabbedPane*/ scenePanel = new cGridBag();
1333
- scenePanel.preferredWidth = 6;
1630
+ scenePanel.preferredWidth = 5;
13341631
13351632 JTabbedPane tabbedPane = new JTabbedPane();
13361633 tabbedPane.add(scrollpane);
13371634
1338
- tabbedPane.add(FSPane = new cFileSystemPane(this));
1339
-
1340
- optionsPanel = new cGridBag().setVertical(true);
1635
+ optionsPanel = new cGridBag().setVertical(false);
13411636
13421637 optionsPanel.setName("Options");
13431638
....@@ -1345,8 +1640,15 @@
13451640
13461641 tabbedPane.add(optionsPanel);
13471642
1643
+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1644
+
13481645 scenePanel.add(tabbedPane);
13491646
1647
+ //if (Globals.ADVANCED)
1648
+ tabbedPane.add(infoPanel);
1649
+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1650
+ tabbedPane.setToolTipTextAt(3, "Information");
1651
+
13501652 /*
13511653 cTree jTree = new cTree(null);
13521654 ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1408,7 +1710,7 @@
14081710 bigThree = new cGridBag();
14091711 bigThree.addComponent(scenePanel);
14101712 bigThree.addComponent(centralPanel);
1411
- bigThree.addComponent(XYZPanel);
1713
+ //bigThree.addComponent(XYZPanel);
14121714
14131715 // // SIDE EFFECT!!!
14141716 // aConstraints.gridx = 0;
....@@ -1417,9 +1719,26 @@
14171719 // aConstraints.gridheight = 1;
14181720
14191721 framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1420
- framePanel.setContinuousLayout(true);
1421
- framePanel.setOneTouchExpandable(true);
1422
- 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);
14231742 //framePanel.setDividerSize(15);
14241743 //framePanel.setResizeWeight(0.15);
14251744 framePanel.setName("Frame");
....@@ -1437,14 +1756,18 @@
14371756 // aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14381757
14391758 frame.setSize(1280, 860);
1440
- frame.setVisible(true);
1441
-
1759
+
1760
+ cameraView.requestFocusInWindow();
1761
+
14421762 gridPanel.setDividerLocation(1.0);
1763
+
1764
+ frame.validate();
1765
+
1766
+ frame.setVisible(true);
14431767
14441768 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
14451769 frame.addWindowListener(new WindowAdapter()
14461770 {
1447
-
14481771 public void windowClosing(WindowEvent e)
14491772 {
14501773 Close();
....@@ -1467,28 +1790,419 @@
14671790 ctrlPanel.removeAll();
14681791 }
14691792
1470
- void SetupMaterial(cGridBag panel)
1793
+ void SetupMaterial(cGridBag materialpanel)
14711794 {
1472
- /*
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
+ /*
14732187 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
14742188 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1475
- */
2189
+ */
14762190
14772191 cGridBag editBar = new cGridBag().setVertical(false);
14782192
1479
- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
2193
+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
14802194 createMaterialButton.setToolTipText("Create material");
14812195
14822196 /*
14832197 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
14842198 */
14852199
1486
- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
2200
+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
14872201 clearMaterialButton.setToolTipText("Clear material");
14882202
14892203 if (Globals.ADVANCED)
14902204 {
1491
- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
2205
+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
14922206 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
14932207 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
14942208 }
....@@ -1506,45 +2220,50 @@
15062220 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
15072221
15082222 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);
15092236
15102237 cGridBag color = new cGridBag();
1511
- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1512
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1513
- 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
+
15142243 //colorField.preferredWidth = 200;
15152244 colorSection.add(color);
15162245
15172246 cGridBag modulation = new cGridBag();
15182247 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
15192248 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1520
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2249
+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
15212250 colorSection.add(modulation);
15222251
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
+
15232260 cGridBag texture = new cGridBag();
15242261 texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
15252262 textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
15262263 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
15272264 colorSection.add(texture);
15282265
1529
- cGridBag anisoU = new cGridBag();
1530
- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1531
- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532
- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1533
- colorSection.add(anisoU);
1534
-
1535
- cGridBag anisoV = new cGridBag();
1536
- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1537
- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1538
- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1539
- colorSection.add(anisoV);
1540
-
1541
- cGridBag shadowbias = new cGridBag();
1542
- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1543
- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1544
- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1545
- colorSection.add(shadowbias);
1546
-
1547
- panel.add(new JSeparator());
2266
+ panel.add(GetSeparator());
15482267
15492268 panel.add(colorSection);
15502269
....@@ -1594,7 +2313,13 @@
15942313 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
15952314 diffuseSection.add(fakedepth);
15962315
1597
- panel.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());
15982323
15992324 panel.add(diffuseSection);
16002325
....@@ -1644,42 +2369,48 @@
16442369 // aConstraints.gridy += 1;
16452370 // aConstraints.gridwidth = 1;
16462371
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);
16472377
1648
- panel.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());
16492386
16502387 panel.add(specularSection);
16512388
16522389 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
16532390
1654
- cGridBag globalSection = new cGridBag().setVertical(true);
2391
+ //cGridBag globalSection = new cGridBag().setVertical(true);
16552392
16562393 cGridBag camera = new cGridBag();
16572394 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
16582395 cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16592396 camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1660
- globalSection.add(camera);
2397
+ colorSection.add(camera);
16612398
16622399 cGridBag ambient = new cGridBag();
16632400 ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
16642401 ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16652402 ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1666
- globalSection.add(ambient);
2403
+ colorSection.add(ambient);
16672404
16682405 cGridBag backlit = new cGridBag();
16692406 backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
16702407 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16712408 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1672
- globalSection.add(backlit);
2409
+ colorSection.add(backlit);
16732410
1674
- cGridBag opacity = new cGridBag();
1675
- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1676
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1677
- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1678
- globalSection.add(opacity);
1679
-
1680
- panel.add(new JSeparator());
2411
+ //panel.add(new JSeparator());
16812412
1682
- panel.add(globalSection);
2413
+ //panel.add(globalSection);
16832414
16842415 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
16852416
....@@ -1721,7 +2452,7 @@
17212452 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
17222453 textureSection.add(opacityPower);
17232454
1724
- panel.add(new JSeparator());
2455
+ panel.add(GetSeparator());
17252456
17262457 panel.add(textureSection);
17272458
....@@ -1786,8 +2517,9 @@
17862517 // 3D models
17872518 if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
17882519 {
1789
- lastConverter = new com.jmex.model.converters.MaxToJme();
1790
- LoadFile(filename, lastConverter);
2520
+ //lastConverter = new com.jmex.model.converters.MaxToJme();
2521
+ //LoadFile(filename, lastConverter);
2522
+ LoadObjFile(filename); // New 3ds loader
17912523 continue;
17922524 }
17932525 if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -1939,7 +2671,7 @@
19392671
19402672 //? flashIt = false;
19412673 CameraPane pane = (CameraPane) cameraView;
1942
- pane.clickStart(location.x, location.y, 0);
2674
+ pane.clickStart(location.x, location.y, 0, 0);
19432675 pane.clickEnd(location.x, location.y, 0, true);
19442676
19452677 if (group.selection.size() == 1)
....@@ -1988,6 +2720,7 @@
19882720 e2.printStackTrace();
19892721 }
19902722 }
2723
+
19912724 LoadJMEThread loadThread;
19922725
19932726 class LoadJMEThread extends Thread
....@@ -2045,6 +2778,7 @@
20452778 //LoadFile0(filename, converter);
20462779 }
20472780 }
2781
+
20482782 LoadOBJThread loadObjThread;
20492783
20502784 class LoadOBJThread extends Thread
....@@ -2123,19 +2857,19 @@
21232857
21242858 void LoadObjFile(String fullname)
21252859 {
2126
- /*
2860
+ System.out.println("Loading " + fullname);
2861
+ /**/
21272862 //lastFilename = fullname;
21282863 if(loadObjThread == null)
21292864 {
2130
- loadObjThread = new LoadOBJThread();
2131
- loadObjThread.start();
2865
+ loadObjThread = new LoadOBJThread();
2866
+ loadObjThread.start();
21322867 }
21332868
21342869 loadObjThread.add(fullname);
2135
- */
2870
+ /**/
21362871
2137
- System.out.println("Loading " + fullname);
2138
- makeSomething(new FileObject(fullname, true), true);
2872
+ //makeSomething(new FileObject(fullname, true), true);
21392873 }
21402874
21412875 void LoadGFDFile(String fullname)
....@@ -2396,7 +3130,7 @@
23963130
23973131 void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
23983132 {
2399
- if (GrafreeD.standAlone)
3133
+ if (Grafreed.standAlone)
24003134 {
24013135 /**/
24023136 FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
....@@ -2511,6 +3245,7 @@
25113245 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
25123246 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
25133247 }
3248
+
25143249 //cJME.count++;
25153250 //cJME.count %= 12;
25163251 if (gc)
....@@ -2694,6 +3429,7 @@
26943429 }
26953430 }
26963431 }
3432
+
26973433 cFileSystemPane FSPane;
26983434
26993435 void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2703,7 +3439,7 @@
27033439
27043440 freezematerial = true;
27053441 colorField.setFloat(mat.color);
2706
- modulationField.setFloat(mat.modulation);
3442
+ saturationField.setFloat(mat.modulation);
27073443 metalnessField.setFloat(mat.metalness);
27083444 diffuseField.setFloat(mat.diffuse);
27093445 specularField.setFloat(mat.specular);
....@@ -2747,11 +3483,14 @@
27473483 }
27483484 }
27493485 }
3486
+
27503487 freezematerial = false;
27513488 }
27523489
27533490 void SetMaterial(Object3D object)
27543491 {
3492
+ latestObject = object;
3493
+
27553494 cMaterial mat = object.material;
27563495
27573496 if (mat == null)
....@@ -2863,12 +3602,17 @@
28633602 // }
28643603
28653604 /**/
2866
- if (deselect)
3605
+ if (deselect || child == null)
28673606 {
28683607 //group.deselectAll();
28693608 //freeze = true;
28703609 GetTree().clearSelection();
28713610 //freeze = false;
3611
+
3612
+ if (child == null)
3613
+ {
3614
+ return;
3615
+ }
28723616 }
28733617
28743618 //group.addSelectee(child);
....@@ -2902,6 +3646,17 @@
29023646 public void itemStateChanged(ItemEvent event)
29033647 {
29043648 // 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
29053660 if (event.getSource() == propagateToggle)
29063661 {
29073662 propagate ^= true;
....@@ -2937,7 +3692,7 @@
29373692 cameraView.ToggleDL();
29383693 cameraView.repaint();
29393694 return;
2940
- } else if (event.getSource() == toggleTextureItem)
3695
+ } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
29413696 {
29423697 cameraView.ToggleTexture();
29433698 // june 2013 copy.HardTouch();
....@@ -2976,9 +3731,9 @@
29763731 frame.validate();
29773732
29783733 return;
2979
- } else if (event.getSource() == toggleSwitchItem)
3734
+ } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
29803735 {
2981
- cameraView.ToggleRandom();
3736
+ cameraView.ToggleSwitch();
29823737 cameraView.repaint();
29833738 return;
29843739 } else if (event.getSource() == toggleHandleItem)
....@@ -3006,12 +3761,17 @@
30063761 } else if (event.getSource() == liveCB)
30073762 {
30083763 copy.live ^= true;
3764
+ objEditor.refreshContents(true); // To show item colors
3765
+ return;
3766
+ } else if (event.getSource() == selectableCB)
3767
+ {
3768
+ copy.dontselect ^= true;
30093769 return;
30103770 } else if (event.getSource() == hideCB)
30113771 {
30123772 copy.hide ^= true;
30133773 copy.Touch(); // display list issue
3014
- objEditor.refreshContents();
3774
+ objEditor.refreshContents(true); // To show item colors
30153775 return;
30163776 } else if (event.getSource() == link2masterCB)
30173777 {
....@@ -3045,8 +3805,9 @@
30453805
30463806 public void actionPerformed(ActionEvent event)
30473807 {
3808
+ Object source = event.getSource();
30483809 // SCRIPT DIALOG
3049
- if (event.getSource() == okbutton)
3810
+ if (source == okbutton)
30503811 {
30513812 textpanel.setVisible(false);
30523813 textpanel.remove(textarea);
....@@ -3058,7 +3819,7 @@
30583819 textarea = null;
30593820 textpanel = null;
30603821 }
3061
- if (event.getSource() == cancelbutton)
3822
+ if (source == cancelbutton)
30623823 {
30633824 textpanel.setVisible(false);
30643825 textpanel.remove(textarea);
....@@ -3070,50 +3831,50 @@
30703831 //applySelf();
30713832 //client.refreshEditWindow();
30723833 //refreshContents();
3073
- if (event.getSource() == nameField)
3834
+ if (source == nameField)
30743835 {
30753836 //System.out.println("ObjEditor " + event);
30763837 applySelf0(true);
30773838 //parent.applySelf();
30783839 objEditor.refreshContents();
3079
- } else if (event.getSource() == resetButton)
3840
+ } else if (source == resetButton)
30803841 {
30813842 CameraPane.fullreset = true;
30823843 copy.Reset(); // ResetMeshes();
30833844 copy.Touch();
30843845 objEditor.refreshContents();
3085
- } else if (event.getSource() == stepItem)
3846
+ } else if (source == stepItem)
30863847 {
30873848 //cameraView.ONESTEP = true;
30883849 Globals.ONESTEP = true;
30893850 cameraView.repaint();
30903851 return;
3091
- } else if (event.getSource() == stepButton)
3852
+ } else if (source == stepButton)
30923853 {
30933854 copy.Step();
30943855 copy.Touch();
30953856 objEditor.refreshContents();
3096
- } else if (event.getSource() == slowerButton)
3857
+ } else if (source == slowerButton)
30973858 {
30983859 copy.Slower();
30993860 copy.Touch();
31003861 objEditor.refreshContents();
3101
- } else if (event.getSource() == fasterButton)
3862
+ } else if (source == fasterButton)
31023863 {
31033864 copy.Faster();
31043865 copy.Touch();
31053866 objEditor.refreshContents();
3106
- } else if (event.getSource() == remarkButton)
3867
+ } else if (source == remarkButton)
31073868 {
31083869 copy.Remark();
31093870 copy.Touch();
31103871 objEditor.refreshContents();
3111
- } else if (event.getSource() == stepAllButton)
3872
+ } else if (source == stepAllButton)
31123873 {
31133874 copy.StepAll();
31143875 copy.Touch();
31153876 objEditor.refreshContents();
3116
- } else if (event.getSource() == resetAllButton)
3877
+ } else if (source == resetAllButton)
31173878 {
31183879 //CameraPane.fullreset = true;
31193880 copy.ResetAll(); // ResetMeshes();
....@@ -3146,53 +3907,79 @@
31463907 // Close();
31473908 // }
31483909 // else
3149
- if (event.getSource() == resetSlidersButton)
3910
+ if (source == resetSlidersButton)
31503911 {
31513912 ResetSliders();
3152
- } else if (event.getSource() == clearMaterialButton)
3913
+ } else if (source == clearMaterialButton)
31533914 {
31543915 ClearMaterial();
3155
- } else if (event.getSource() == createMaterialButton)
3916
+ } else if (source == createMaterialButton)
31563917 {
31573918 CreateMaterial();
3158
- } else if (event.getSource() == clearPanelButton)
3919
+ } else if (source == clearPanelButton)
31593920 {
31603921 copy.ClearUI();
31613922 refreshContents(true);
3162
- } /*
3163
- }
3164
-
3165
- public boolean action(Event event, Object arg)
3166
- {
3167
- */ 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)
31683948 {
31693949 Close();
31703950 //return true;
3171
- } else if (event.getSource() == loadItem)
3951
+ } else if (source == openItem)
31723952 {
3173
- load();
3953
+ Open();
31743954 //return true;
3175
- } else if (event.getSource() == saveItem)
3955
+ } else if (source == newItem)
3956
+ {
3957
+ New();
3958
+ } else if (source == saveItem)
31763959 {
31773960 save();
31783961 //return true;
3179
- } else if (event.getSource() == saveAsItem)
3962
+ } else if (source == saveAsItem)
31803963 {
31813964 saveAs();
31823965 //return true;
3183
- } else if (event.getSource() == reexportItem)
3966
+ } else if (source == reexportItem)
31843967 {
31853968 reexport();
31863969 //return true;
3187
- } else if (event.getSource() == exportAsItem)
3970
+ } else if (source == exportAsItem)
31883971 {
31893972 export();
31903973 //return true;
3191
- } else if (event.getSource() == povItem)
3974
+ } else if (source == povItem)
31923975 {
31933976 generatePOV();
31943977 //return true;
3195
- } else if (event.getSource() == zBufferItem)
3978
+ } else if (event.getSource() == archiveItem)
3979
+ {
3980
+ cTools.Archive(frame);
3981
+ return;
3982
+ } else if (source == zBufferItem)
31963983 {
31973984 try
31983985 {
....@@ -3214,21 +4001,8 @@
32144001 cameraView.repaint();
32154002 //return true;
32164003 }
3217
- */ else if (event.getSource() == editCameraItem)
3218
- {
3219
- cameraView.ProtectCamera();
3220
- cameraView.repaint();
3221
- return;
3222
- } else if (event.getSource() == revertCameraItem)
3223
- {
3224
- cameraView.RevertCamera();
3225
- cameraView.repaint();
3226
- return;
3227
-// } else if (event.getSource() == textureButton)
3228
-// {
3229
-// return; // true;
3230
- } else // combos...
3231
- if (event.getSource() == texresMenu)
4004
+ */ else // combos...
4005
+ if (source == texresMenu)
32324006 {
32334007 System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
32344008 copy.texres = texresMenu.getSelectedIndex();
....@@ -3240,6 +4014,471 @@
32404014 }
32414015 }
32424016
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
+
32434482 void ToggleAnimation()
32444483 {
32454484 if (!Globals.ANIMATION)
....@@ -3255,8 +4494,8 @@
32554494
32564495 Globals.ANIMATION ^= true;
32574496
3258
- GrafreeD.wav.cursor = 0;
3259
- GrafreeD.wav.loop = 0;
4497
+ Grafreed.wav.cursor = 0;
4498
+ Grafreed.wav.loop = 0;
32604499 }
32614500 } else
32624501 {
....@@ -3357,7 +4596,7 @@
33574596 assert false;
33584597 }
33594598
3360
- void EditSelection()
4599
+ void EditSelection(boolean newWindow)
33614600 {
33624601 }
33634602
....@@ -3416,7 +4655,7 @@
34164655 //copy.material = new cMaterial(copy.GetMaterial());
34174656
34184657 current.color = (float) colorField.getFloat();
3419
- current.modulation = (float) modulationField.getFloat();
4658
+ current.modulation = (float) saturationField.getFloat();
34204659 current.metalness = (float) metalnessField.getFloat();
34214660 current.diffuse = (float) diffuseField.getFloat();
34224661 current.specular = (float) specularField.getFloat();
....@@ -3443,6 +4682,36 @@
34434682 {
34444683 //System.out.println("Propagate = " + propagate);
34454684 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
+
34464715 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
34474716 {
34484717 copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
....@@ -3471,9 +4740,26 @@
34714740 //copy.Touch();
34724741 }
34734742
4743
+ cNumberSlider versionSlider;
4744
+
34744745 public void stateChanged(ChangeEvent e)
34754746 {
34764747 // 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
+ }
34774763
34784764 if (freezematerial)
34794765 {
....@@ -3509,6 +4795,12 @@
35094795 {
35104796 //System.out.println("stateChanged = " + this);
35114797 materialtouched = true;
4798
+
4799
+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
4800
+ {
4801
+ saturationField.setFloat(1);
4802
+ }
4803
+
35124804 applySelf();
35134805 //System.out.println("this = " + this);
35144806 //System.out.println("PARENT = " + parent);
....@@ -3558,7 +4850,7 @@
35584850 }
35594851
35604852 if (normalpushField != null)
3561
- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
4853
+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35624854 }
35634855
35644856 void SnapObject()
....@@ -3808,6 +5100,7 @@
38085100 {
38095101 if (GetTree() != null)
38105102 {
5103
+ GetTree().revalidate();
38115104 GetTree().repaint();
38125105 }
38135106
....@@ -3816,12 +5109,17 @@
38165109 ctrlPanel.validate(); // ? new
38175110 ctrlPanel.repaint();
38185111 }
5112
+
5113
+ if (previousVersionButton != null && copy.versionlist != null)
5114
+ SetUndoStates();
38195115 }
38205116
38215117 static TweenManager tweenManager = new TweenManager();
38225118
38235119 void makeSomething(Object3D thing, boolean resetmodel) // deselect)
38245120 {
5121
+ if (Globals.REPLACEONMAKE) // && resetmodel)
5122
+ Save();
38255123 //Tween.set(thing, 0).target(1).start(tweenManager);
38265124 //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
38275125 // if (thing instanceof GenericJointDemo)
....@@ -3908,6 +5206,12 @@
39085206 {
39095207 ResetModel();
39105208 Select(thing.GetTreePath(), true, false); // unselect... false);
5209
+
5210
+ if (thing.Size() == 0)
5211
+ {
5212
+ //EditSelection(false);
5213
+ }
5214
+
39115215 refreshContents();
39125216 }
39135217
....@@ -4025,6 +5329,7 @@
40255329 }
40265330 }
40275331 }
5332
+
40285333 LoadGFDThread loadGFDThread;
40295334
40305335 void ReadGFD(String fullname, iCallBack cb)
....@@ -4044,8 +5349,10 @@
40445349
40455350 try
40465351 {
5352
+ // Try compressed version first.
40475353 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4048
- 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);
40495356
40505357 readobj = (Object3D) p.readObject();
40515358 istream.close();
....@@ -4053,7 +5360,22 @@
40535360 readobj.ResetDisplayList();
40545361 } catch (Exception e)
40555362 {
4056
- 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
+ }
40575379 }
40585380 // catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
40595381 // catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4099,6 +5421,12 @@
40995421
41005422 void LoadIt(Object obj)
41015423 {
5424
+ if (obj == null)
5425
+ {
5426
+ // Invalid file
5427
+ return;
5428
+ }
5429
+
41025430 System.out.println("Loaded " + obj);
41035431 //new Exception().printStackTrace();
41045432 Object3D readobj = (Object3D) obj;
....@@ -4108,10 +5436,14 @@
41085436
41095437 if (readobj != null)
41105438 {
5439
+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
5440
+ // Save();
41115441 try
41125442 {
41135443 //readobj.deepCopySelf(copy);
41145444 copy.clear(); // june 2014
5445
+ copy.skyboxname = readobj.skyboxname;
5446
+ copy.skyboxext = readobj.skyboxext;
41155447 for (int i = 0; i < readobj.size(); i++)
41165448 {
41175449 Object3D child = readobj.get(i); // reserve(i);
....@@ -4152,6 +5484,7 @@
41525484 }
41535485 } catch (ClassCastException e)
41545486 {
5487
+ e.printStackTrace();
41555488 assert (false);
41565489 Composite c = (Composite) copy;
41575490 c.children.clear();
....@@ -4162,17 +5495,31 @@
41625495 c.addChild(csg);
41635496 }
41645497
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
+
41655512 ResetModel();
41665513 copy.HardTouch(); // recompile?
41675514 refreshContents();
41685515 }
41695516 }
41705517
4171
- void load() // throws ClassNotFoundException
5518
+ void Open() // throws ClassNotFoundException
41725519 {
4173
- if (GrafreeD.standAlone)
5520
+ if (Grafreed.standAlone)
41745521 {
4175
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5522
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
41765523 browser.show();
41775524 String filename = browser.getFile();
41785525 if (filename != null && filename.length() > 0)
....@@ -4257,11 +5604,13 @@
42575604 try
42585605 {
42595606 FileOutputStream ostream = new FileOutputStream(lastname);
4260
- ObjectOutputStream p = new ObjectOutputStream(ostream);
5607
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
5608
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
42615609
42625610 p.writeObject(copy);
42635611 p.flush();
42645612
5613
+ zstream.close();
42655614 ostream.close();
42665615
42675616 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4269,19 +5618,23 @@
42695618 //ps.print(buffer.toString());
42705619 } catch (IOException e)
42715620 {
5621
+ e.printStackTrace();
42725622 }
42735623 }
5624
+
42745625 String lastname;
42755626
42765627 void saveAs()
42775628 {
4278
- if (GrafreeD.standAlone)
5629
+ if (Grafreed.standAlone)
42795630 {
42805631 FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
42815632 browser.setVisible(true);
42825633 String filename = browser.getFile();
42835634 if (filename != null && filename.length() > 0)
42845635 {
5636
+ if (!filename.endsWith(".gfd"))
5637
+ filename += ".gfd";
42855638 lastname = browser.getDirectory() + filename;
42865639 save();
42875640 }
....@@ -4380,13 +5733,13 @@
43805733 try
43815734 {
43825735 FileOutputStream ostream = new FileOutputStream(filename);
4383
- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4384
- ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
5736
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
5737
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
43855738
43865739 Object3D objectparent = obj.parent;
43875740 obj.parent = null;
43885741
4389
- Object3D object = (Object3D) GrafreeD.clone(obj);
5742
+ Object3D object = (Object3D) Grafreed.clone(obj);
43905743
43915744 obj.parent = objectparent;
43925745
....@@ -4398,8 +5751,8 @@
43985751 p.writeObject(object);
43995752 p.flush();
44005753
5754
+ zstream.close();
44015755 ostream.close();
4402
- // zstream.close();
44035756
44045757 // group.selection.get(0).parent = parent;
44055758 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4420,7 +5773,7 @@
44205773 buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
44215774 cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
44225775 copy.generatePOV(buffer);
4423
- if (GrafreeD.standAlone)
5776
+ if (Grafreed.standAlone)
44245777 {
44255778 FileDialog browser = new FileDialog(frame, "Export POV", 1);
44265779 browser.show();
....@@ -4446,19 +5799,18 @@
44465799 Object3D client;
44475800 Object3D copy;
44485801 MenuBar menuBar;
4449
- Menu windowMenu;
4450
- MenuItem loadItem;
5802
+ Menu fileMenu;
5803
+ MenuItem newItem;
5804
+ MenuItem openItem;
44515805 MenuItem saveItem;
44525806 MenuItem saveAsItem;
44535807 MenuItem exportAsItem;
44545808 MenuItem reexportItem;
44555809 MenuItem povItem;
44565810 MenuItem closeItem;
4457
- Menu cameraMenu;
5811
+
44585812 CheckboxMenuItem zBufferItem;
44595813 //MenuItem normalLensItem;
4460
- MenuItem editCameraItem;
4461
- MenuItem revertCameraItem;
44625814 MenuItem stepItem;
44635815 CheckboxMenuItem toggleLiveItem;
44645816 CheckboxMenuItem toggleFullScreenItem;
....@@ -4472,22 +5824,37 @@
44725824 CheckboxMenuItem toggleSwitchItem;
44735825 CheckboxMenuItem toggleRootItem;
44745826 CheckboxMenuItem animationItem;
5827
+ MenuItem archiveItem;
44755828 CheckboxMenuItem toggleHandleItem;
44765829 CheckboxMenuItem togglePaintItem;
44775830 JSplitPane mainPanel;
44785831 JScrollPane scrollpane;
5832
+
44795833 JPanel toolbarPanel;
5834
+
44805835 cGridBag treePanel;
5836
+
44815837 JPanel radioPanel;
44825838 ButtonGroup buttonGroup;
4483
- cGridBag ctrlPanel;
5839
+
5840
+ cGridBag toolboxPanel;
5841
+ cGridBag skyboxPanel;
44845842 cGridBag materialPanel;
5843
+ cGridBag ctrlPanel;
5844
+
44855845 JScrollPane infoPanel;
5846
+
44865847 cGridBag optionsPanel;
5848
+
44875849 JTabbedPane objectPanel;
5850
+ boolean materialFlushed;
5851
+ Object3D latestObject;
5852
+
44885853 cGridBag XYZPanel;
5854
+
44895855 JSplitPane gridPanel;
44905856 JSplitPane bigPanel;
5857
+
44915858 cGridBag bigThree;
44925859 cGridBag scenePanel;
44935860 cGridBag centralPanel;
....@@ -4545,7 +5912,7 @@
45455912 JLabel colorLabel;
45465913 cNumberSlider colorField;
45475914 JLabel modulationLabel;
4548
- cNumberSlider modulationField;
5915
+ cNumberSlider saturationField;
45495916 JLabel metalnessLabel;
45505917 cNumberSlider metalnessField;
45515918 JLabel diffuseLabel;
....@@ -4576,6 +5943,7 @@
45765943 cNumberSlider anisoField;
45775944 JLabel anisoVLabel;
45785945 cNumberSlider anisoVField;
5946
+
45795947 JLabel cameraLabel;
45805948 cNumberSlider cameraField;
45815949 JLabel selfshadowLabel;
....@@ -4590,6 +5958,7 @@
45905958 cNumberSlider fakedepthField;
45915959 JLabel shadowbiasLabel;
45925960 cNumberSlider shadowbiasField;
5961
+
45935962 JLabel bumpLabel;
45945963 cNumberSlider bumpField;
45955964 JLabel noiseLabel;
....@@ -4602,8 +5971,13 @@
46025971 cNumberSlider fogField;
46035972 JLabel opacityPowerLabel;
46045973 cNumberSlider opacityPowerField;
4605
- JTree jTree;
5974
+ cTree jTree;
46065975 //ObjectUI parent;
46075976
46085977 cNumberSlider normalpushField;
5978
+
5979
+ private MenuItem importGFDItem;
5980
+ private MenuItem importVRMLX3DItem;
5981
+ private MenuItem import3DSItem;
5982
+ private MenuItem importOBJItem;
46095983 }