Normand Briere
2019-08-13 c67de8aca04d988179191ccb52461af00125920e
ObjEditor.java
....@@ -15,6 +15,9 @@
1515 //import javax.swing.plaf.ColorUIResource;
1616 //import javax.swing.plaf.metal.DefaultMetalTheme;
1717
18
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
19
+import javax.swing.plaf.basic.BasicSplitPaneUI;
20
+
1821 //import javax.media.opengl.GLCanvas;
1922
2023 import //weka.core.
....@@ -31,6 +34,7 @@
3134 iSendInfo
3235 //KeyListener
3336 {
37
+ public cToggleButton pinButton;
3438 boolean timeline;
3539 boolean wasFullScreen;
3640
....@@ -38,64 +42,78 @@
3842 JFrame frame;
3943
4044 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
+ }
4153
4254 cButton GetButton(String name, boolean border)
4355 {
44
- try
45
- {
46
- ImageIcon icon = GetIcon(name);
47
- return new cButton(icon, border);
48
- }
49
- catch (Exception e)
50
- {
51
- return new cButton(name, border);
52
- }
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);
5364 }
5465
5566 cToggleButton GetToggleButton(String name, boolean border)
5667 {
57
- try
58
- {
59
- ImageIcon icon = GetIcon(name);
60
- return new cToggleButton(icon, border);
61
- }
62
- catch (Exception e)
63
- {
64
- return new cToggleButton(name, border);
65
- }
68
+ ImageIcon icon = GetIcon(name);
69
+ return new cToggleButton(icon, border);
6670 }
6771
6872 cCheckBox GetCheckBox(String name, boolean border)
6973 {
74
+ ImageIcon icon = GetIcon(name);
75
+ return new cCheckBox(icon, border);
76
+ }
77
+
78
+ ImageIcon GetIcon(String name)
79
+ {
7080 try
7181 {
72
- ImageIcon icon = GetIcon(name);
73
- return new cCheckBox(icon, border);
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;
7498 }
7599 catch (Exception e)
76100 {
77
- return new cCheckBox(name, border);
101
+ return null;
78102 }
79103 }
80
-
81
- private ImageIcon GetIcon(String name) throws IOException
104
+
105
+ BufferedImage GetImage(String name)
82106 {
83
- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84
-
85
- if (image.getWidth() != 24 && image.getHeight() != 24)
107
+ try
86108 {
87
- BufferedImage resized = new BufferedImage(24, 24, image.getType());
88
- Graphics2D g = resized.createGraphics();
89
- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
90
- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
91
- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
92
- g.dispose();
93
-
94
- image = resized;
109
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
110
+
111
+ return image;
95112 }
96
-
97
- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98
- return icon;
113
+ catch (Exception e)
114
+ {
115
+ return null;
116
+ }
99117 }
100118
101119 // SCRIPT
....@@ -279,6 +297,14 @@
279297 client = inClient;
280298 copy = client;
281299
300
+// if (copy.versionlist == null)
301
+// {
302
+// copy.versionlist = new Object3D[100];
303
+// copy.versionindex = -1;
304
+//
305
+// callee.Save(true);
306
+// }
307
+
282308 // "this" is not called: SetupUI2(objEditor);
283309 }
284310
....@@ -292,6 +318,14 @@
292318 client = inClient;
293319 copy = client;
294320
321
+ if (copy.versionlist == null)
322
+ {
323
+ copy.versionlist = new Object3D[100];
324
+ copy.versionindex = -1;
325
+
326
+// Save(true);
327
+ }
328
+
295329 SetupUI2(callee.GetEditor());
296330 }
297331
....@@ -306,7 +340,7 @@
306340 //localCopy.parent = null;
307341
308342 frame = new JFrame();
309
- frame.setUndecorated(true);
343
+ frame.setUndecorated(false);
310344 objEditor = this;
311345 this.callee = callee;
312346
....@@ -324,6 +358,14 @@
324358 copy = localCopy;
325359 copy.editWindow = this;
326360
361
+// if (copy.versionlist == null)
362
+// {
363
+// copy.versionlist = new Object3D[100];
364
+// copy.versionindex = -1;
365
+//
366
+// Save(true);
367
+// }
368
+
327369 SetupMenu();
328370
329371 //SetupName(objEditor); // new
....@@ -347,7 +389,7 @@
347389 frame.setMenuBar(menuBar = new MenuBar());
348390 menuBar.add(fileMenu = new Menu("File"));
349391 fileMenu.add(newItem = new MenuItem("New"));
350
- fileMenu.add(loadItem = new MenuItem("Open..."));
392
+ fileMenu.add(openItem = new MenuItem("Open..."));
351393
352394 //oe.menuBar.add(menu = new Menu("Include"));
353395 Menu menu = new Menu("Import");
....@@ -379,7 +421,7 @@
379421 }
380422
381423 newItem.addActionListener(this);
382
- loadItem.addActionListener(this);
424
+ openItem.addActionListener(this);
383425 saveItem.addActionListener(this);
384426 saveAsItem.addActionListener(this);
385427 exportAsItem.addActionListener(this);
....@@ -391,6 +433,8 @@
391433
392434 ChangeListener changeListener = new ChangeListener()
393435 {
436
+ String name;
437
+
394438 public void stateChanged(ChangeEvent changeEvent)
395439 {
396440 // if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -409,18 +453,48 @@
409453 // EditSelection(false);
410454 // }
411455
412
- refreshContents(false); // To refresh Info tab
456
+ if (objectPanel.getSelectedIndex() == 4)
457
+ {
458
+ name = copy.skyboxname;
459
+
460
+ if (name == null)
461
+ {
462
+ name = "";
463
+ }
464
+
465
+ copy.skyboxname = "cubemaps/default-skyboxes/rgb";
466
+ copy.skyboxext = "jpg";
467
+ }
468
+ else
469
+ {
470
+ if (name != null)
471
+ {
472
+ if (name.equals(""))
473
+ {
474
+ copy.skyboxname = null;
475
+ copy.skyboxext = null;
476
+ }
477
+ else
478
+ {
479
+ copy.skyboxname = name;
480
+ }
481
+ }
482
+ }
483
+
484
+// refreshContents(false); // To refresh Info tab
485
+ cameraView.repaint();
413486 }
414487 };
415488 objectPanel.addChangeListener(changeListener);
416489
417490 toolbarPanel = new JPanel();
418491 toolbarPanel.setName("Toolbar");
492
+
419493 treePanel = new cGridBag();
420494 treePanel.setName("Tree");
421495
422496 editPanel = new cGridBag().setVertical(true);
423
- editPanel.setName("Edit");
497
+ //editPanel.setName("Edit");
424498
425499 ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
426500
....@@ -428,11 +502,13 @@
428502 editPanel.add(editCommandsPanel);
429503 editPanel.add(ctrlPanel);
430504
431
- toolboxPanel = new cGridBag().setVertical(false);
432
- toolboxPanel.setName("Toolbox");
505
+ toolboxPanel = new cGridBag().setVertical(true);
506
+ //toolboxPanel.setName("Toolbox");
433507
434
- materialPanel = new cGridBag().setVertical(true);
435
- materialPanel.setName("Material");
508
+ skyboxPanel = new cGridBag().setVertical(true);
509
+
510
+ materialPanel = new cGridBag().setVertical(false);
511
+ //materialPanel.setName("Material");
436512
437513 /*JTextPane*/
438514 infoarea = createTextPane();
....@@ -440,14 +516,15 @@
440516
441517 infoarea.setEditable(true);
442518 SetText();
519
+
443520 // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
444521 // infoarea.setOpaque(false);
445522 // //infoarea.setForeground(textcolor);
446523 // TEXTAREA infoarea.setLineWrap(true);
447524 // TEXTAREA infoarea.setWrapStyleWord(true);
448525 infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
449
- infoPanel.setPreferredSize(new Dimension(50, 200));
450
- infoPanel.setName("Info");
526
+ infoPanel.setPreferredSize(new Dimension(1, 1));
527
+ //infoPanel.setName("Info");
451528 //infoPanel.setLayout(new BorderLayout());
452529 //infoPanel.add(createTextPane());
453530
....@@ -458,7 +535,14 @@
458535 mainPanel.setDividerSize(9);
459536 mainPanel.setDividerLocation(0.5); //1.0);
460537 mainPanel.setResizeWeight(0.5);
461
-
538
+
539
+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
540
+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
541
+ divider.setDividerSize(15);
542
+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
543
+
544
+ mainPanel.setUI(new BasicSplitPaneUI());
545
+
462546 //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
463547 //mainPanel.setLayout(new GridBagLayout());
464548 toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -689,8 +773,8 @@
689773 }
690774 }
691775
692
-static GraphicsDevice device = GraphicsEnvironment
693
- .getLocalGraphicsEnvironment().getScreenDevices()[0];
776
+//static GraphicsDevice device = GraphicsEnvironment
777
+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
694778
695779 Rectangle keeprect;
696780 cRadio radio;
....@@ -707,14 +791,24 @@
707791 boolean maximized;
708792
709793 cButton fullscreenLayout;
794
+ cButton expandedLayout;
710795
711796 void Minimize()
712797 {
713798 frame.setState(Frame.ICONIFIED);
799
+ frame.validate();
714800 }
715801
802
+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
803
+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
804
+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
716805 void Maximize()
717806 {
807
+ if (CameraPane.FULLSCREEN)
808
+ {
809
+ ToggleFullScreen();
810
+ }
811
+
718812 if (maximized)
719813 {
720814 frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
....@@ -722,22 +816,38 @@
722816 else
723817 {
724818 keeprect = frame.getBounds();
725
- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
726
- Dimension rect2 = frame.getToolkit().getScreenSize();
727
- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
819
+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
820
+// Dimension rect2 = frame.getToolkit().getScreenSize();
821
+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
728822 // frame.setState(Frame.MAXIMIZED_BOTH);
823
+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
729824 }
730825
731826 maximized ^= true;
827
+
828
+ frame.validate();
732829 }
830
+
831
+ cButton minButton;
832
+ cButton maxButton;
833
+ cButton fullButton;
834
+ cButton collapseButton;
835
+ cButton maximize3DButton;
733836
734837 void ToggleFullScreen()
735838 {
839
+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
840
+
736841 cameraView.ToggleFullScreen();
737842
738843 if (!CameraPane.FULLSCREEN)
739844 {
740845 device.setFullScreenWindow(null);
846
+ frame.dispose();
847
+ frame.setUndecorated(false);
848
+ frame.validate();
849
+ frame.setVisible(true);
850
+
741851 //frame.setVisible(false);
742852 // frame.removeNotify();
743853 // frame.setUndecorated(false);
....@@ -747,13 +857,13 @@
747857 // X frame.getContentPane().remove(/*"Center",*/bigThree);
748858 // X framePanel.add(bigThree);
749859 // X frame.getContentPane().add(/*"Center",*/framePanel);
750
- framePanel.setDividerLocation(1);
860
+// framePanel.setDividerLocation(46); // icons are 24x24
751861
752862 //frame.setVisible(true);
753
- radio.layout = keepButton;
863
+// radio.layout = keepButton;
754864 //theFrame = null;
755865 keepButton = null;
756
- radio.layout.doClick();
866
+// radio.layout.doClick();
757867
758868 } else
759869 {
....@@ -762,20 +872,59 @@
762872 // frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
763873 // frame.getToolkit().getScreenSize().height);
764874 //frame.setVisible(false);
875
+
876
+ frame.dispose();
877
+ frame.setUndecorated(true);
765878 device.setFullScreenWindow(frame);
879
+ frame.validate();
880
+ frame.setVisible(true);
766881 // frame.removeNotify();
767882 // frame.setUndecorated(true);
768883 // frame.addNotify();
769884 // X frame.getContentPane().remove(/*"Center",*/framePanel);
770885 // X framePanel.remove(bigThree);
771886 // X frame.getContentPane().add(/*"Center",*/bigThree);
772
- framePanel.setDividerLocation(0);
887
+// framePanel.setDividerLocation(0);
773888
774
- radio.layout = fullscreenLayout;
775
- radio.layout.doClick();
889
+// radio.layout = fullscreenLayout;
890
+// radio.layout.doClick();
776891 //frame.setVisible(true);
777892 }
893
+ frame.validate();
894
+
895
+ cameraView.requestFocusInWindow();
778896 }
897
+
898
+ void CollapseToolbar()
899
+ {
900
+ framePanel.setDividerLocation(0);
901
+ //frame.validate();
902
+
903
+ cameraView.requestFocusInWindow();
904
+ }
905
+
906
+ private Object3D Duplicate(Object3D object)
907
+ {
908
+ boolean temp = CameraPane.SWITCH;
909
+ CameraPane.SWITCH = false;
910
+
911
+ object.ExtractBigData(versiontable);
912
+ // if (copy == client)
913
+
914
+ Object3D versions[] = object.versionlist;
915
+ object.versionlist = null;
916
+
917
+ //byte[] compress = Compress(copy);
918
+ Object3D compress = (Object3D)Grafreed.clone(object);
919
+
920
+ object.versionlist = versions;
921
+
922
+ object.RestoreBigData(versiontable);
923
+
924
+ CameraPane.SWITCH = temp;
925
+
926
+ return compress;
927
+ }
779928
780929 private JTextPane createTextPane()
781930 {
....@@ -898,6 +1047,7 @@
8981047 {
8991048 SetupMaterial(materialPanel);
9001049 }
1050
+
9011051 //SetupName();
9021052 //SetupViews();
9031053 }
....@@ -907,7 +1057,7 @@
9071057 // NumberSlider vDivsField;
9081058 // JCheckBox endcaps;
9091059 JCheckBox liveCB;
910
- JCheckBox selectCB;
1060
+ JCheckBox selectableCB;
9111061 JCheckBox hideCB;
9121062 JCheckBox link2masterCB;
9131063 JCheckBox markCB;
....@@ -1106,8 +1256,20 @@
11061256
11071257 namePanel = new cGridBag();
11081258
1259
+ //if (copy.pinned)
1260
+ {
1261
+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1262
+ pinButton.setSelected(copy.pinned);
1263
+ cGridBag t = new cGridBag();
1264
+ t.preferredWidth = 2;
1265
+ t.add(pinButton);
1266
+ namePanel.add(t);
1267
+
1268
+ pinButton.addItemListener(this);
1269
+ }
1270
+
11091271 nameField = AddText(namePanel, copy.GetName());
1110
- namePanel.add(nameField);
1272
+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
11111273 oe.ctrlPanel.add(namePanel);
11121274
11131275 oe.ctrlPanel.Return();
....@@ -1119,26 +1281,30 @@
11191281
11201282 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
11211283 liveCB.setToolTipText("Animate object");
1122
- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1123
- selectCB.setToolTipText("Make object selectable");
1284
+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1285
+ selectableCB.setToolTipText("Make object selectable");
11241286 // Return();
1287
+
11251288 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
11261289 hideCB.setToolTipText("Hide object");
11271290 markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1128
- markCB.setToolTipText("Set the animation target transform");
1291
+ markCB.setToolTipText("As animation target transform");
1292
+
1293
+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
11291294
11301295 setupPanel2 = new cGridBag().setVertical(false);
11311296
11321297 rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
11331298 rewindCB.setToolTipText("Rewind animation");
11341299
1135
- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1136
- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
1300
+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1301
+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11371302
1303
+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1304
+ link2masterCB.setToolTipText("Attach to support");
1305
+
11381306 if (Globals.ADVANCED)
11391307 {
1140
- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1141
- link2masterCB.setToolTipText("Attach to support");
11421308 speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
11431309 speedupCB.setToolTipText("Option motion capture");
11441310 }
....@@ -1412,6 +1578,7 @@
14121578 XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
14131579 XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
14141580 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1581
+ //XYZPanel.setName("XYZ");
14151582
14161583 /*
14171584 gridPanel = new JPanel(); //new BorderLayout());
....@@ -1449,14 +1616,29 @@
14491616 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
14501617 //tmp.setName("Edit");
14511618 objectPanel.add(materialPanel);
1619
+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1620
+ objectPanel.setToolTipTextAt(0, "Material");
1621
+
1622
+ objectPanel.add(toolboxPanel);
1623
+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1624
+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1625
+
1626
+ objectPanel.add(skyboxPanel);
1627
+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1628
+ objectPanel.setToolTipTextAt(2, "Backgrounds");
1629
+
14521630 // JPanel north = new JPanel(new BorderLayout());
14531631 // north.setName("Edit");
14541632 // north.add(ctrlPanel, BorderLayout.NORTH);
14551633 // objectPanel.add(north);
14561634 objectPanel.add(editPanel);
1457
- objectPanel.add(infoPanel);
1458
- objectPanel.add(toolboxPanel);
1459
-
1635
+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1636
+ objectPanel.setToolTipTextAt(3, "Edit controls");
1637
+
1638
+ objectPanel.add(XYZPanel);
1639
+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1640
+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1641
+
14601642 /*
14611643 aConstraints.gridx = 0;
14621644 aConstraints.gridwidth = 1;
....@@ -1476,7 +1658,7 @@
14761658 scrollpane.addMouseWheelListener(this); // Default not fast enough
14771659
14781660 /*JTabbedPane*/ scenePanel = new cGridBag();
1479
- scenePanel.preferredWidth = 6;
1661
+ scenePanel.preferredWidth = 5;
14801662
14811663 JTabbedPane tabbedPane = new JTabbedPane();
14821664 tabbedPane.add(scrollpane);
....@@ -1493,6 +1675,11 @@
14931675
14941676 scenePanel.add(tabbedPane);
14951677
1678
+ //if (Globals.ADVANCED)
1679
+ tabbedPane.add(infoPanel);
1680
+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1681
+ tabbedPane.setToolTipTextAt(3, "Information");
1682
+
14961683 /*
14971684 cTree jTree = new cTree(null);
14981685 ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1554,7 +1741,7 @@
15541741 bigThree = new cGridBag();
15551742 bigThree.addComponent(scenePanel);
15561743 bigThree.addComponent(centralPanel);
1557
- bigThree.addComponent(XYZPanel);
1744
+ //bigThree.addComponent(XYZPanel);
15581745
15591746 // // SIDE EFFECT!!!
15601747 // aConstraints.gridx = 0;
....@@ -1563,9 +1750,26 @@
15631750 // aConstraints.gridheight = 1;
15641751
15651752 framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1566
- framePanel.setContinuousLayout(true);
1567
- framePanel.setOneTouchExpandable(true);
1568
- framePanel.setDividerLocation(0.8);
1753
+
1754
+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1755
+ new java.beans.PropertyChangeListener()
1756
+ {
1757
+ public void propertyChange(java.beans.PropertyChangeEvent pce)
1758
+ {
1759
+ if ((Integer)pce.getOldValue() == 1)
1760
+ {
1761
+ if (radio.layout != expandedLayout)
1762
+ {
1763
+ radio.layout = expandedLayout;
1764
+ radio.layout.doClick();
1765
+ }
1766
+ }
1767
+ }
1768
+ });
1769
+
1770
+ framePanel.setContinuousLayout(false);
1771
+ framePanel.setOneTouchExpandable(false);
1772
+ //.setDividerLocation(0.8);
15691773 //framePanel.setDividerSize(15);
15701774 //framePanel.setResizeWeight(0.15);
15711775 framePanel.setName("Frame");
....@@ -1584,17 +1788,17 @@
15841788
15851789 frame.setSize(1280, 860);
15861790
1587
- frame.validate();
1588
- frame.setVisible(true);
1589
-
15901791 cameraView.requestFocusInWindow();
15911792
15921793 gridPanel.setDividerLocation(1.0);
1794
+
1795
+ frame.validate();
1796
+
1797
+ frame.setVisible(true);
15931798
15941799 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
15951800 frame.addWindowListener(new WindowAdapter()
15961801 {
1597
-
15981802 public void windowClosing(WindowEvent e)
15991803 {
16001804 Close();
....@@ -1617,12 +1821,403 @@
16171821 ctrlPanel.removeAll();
16181822 }
16191823
1620
- void SetupMaterial(cGridBag panel)
1824
+ void SetupMaterial(cGridBag materialpanel)
16211825 {
1622
- /*
1826
+ cGridBag presetpanel = new cGridBag().setVertical(true);
1827
+
1828
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1829
+ skin.setToolTipText("Skin");
1830
+ skin.addMouseListener(new MouseAdapter()
1831
+ {
1832
+ public void mouseClicked(MouseEvent e)
1833
+ {
1834
+ Object3D object = Grafreed.materials.versionlist[0].get(0);
1835
+ cMaterial material = object.material;
1836
+
1837
+ // Skin
1838
+ colorField.setFloat(material.color);
1839
+ saturationField.setFloat(material.modulation);
1840
+ subsurfaceField.setFloat(material.subsurface);
1841
+ selfshadowField.setFloat(material.diffuseness);
1842
+ diffusenessField.setFloat(material.factor);
1843
+ shininessField.setFloat(material.shininess);
1844
+ shadowbiasField.setFloat(material.shadowbias);
1845
+ diffuseField.setFloat(material.diffuse);
1846
+ specularField.setFloat(material.specular);
1847
+
1848
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
1849
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
1850
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
1851
+
1852
+ materialtouched = true;
1853
+ applySelf();
1854
+ }
1855
+ });
1856
+ presetpanel.add(skin);
1857
+
1858
+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
1859
+ lambert.setToolTipText("Diffuse");
1860
+ lambert.addMouseListener(new MouseAdapter()
1861
+ {
1862
+ public void mouseClicked(MouseEvent e)
1863
+ {
1864
+ Object3D object = Grafreed.materials.versionlist[2].get(0);
1865
+ cMaterial material = object.material;
1866
+
1867
+ diffusenessField.setFloat(material.factor);
1868
+ selfshadowField.setFloat(material.diffuseness);
1869
+
1870
+ materialtouched = true;
1871
+ applySelf();
1872
+ }
1873
+ });
1874
+ presetpanel.add(lambert);
1875
+
1876
+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
1877
+ diffuse2.setToolTipText("Diffuse2");
1878
+ diffuse2.addMouseListener(new MouseAdapter()
1879
+ {
1880
+ public void mouseClicked(MouseEvent e)
1881
+ {
1882
+ Object3D object = Grafreed.materials.versionlist[3].get(0);
1883
+ cMaterial material = object.material;
1884
+
1885
+ diffusenessField.setFloat(material.factor);
1886
+ selfshadowField.setFloat(material.diffuseness);
1887
+
1888
+ materialtouched = true;
1889
+ applySelf();
1890
+ }
1891
+ });
1892
+ presetpanel.add(diffuse2);
1893
+
1894
+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
1895
+ diffusemoon.setToolTipText("Moon");
1896
+ diffusemoon.addMouseListener(new MouseAdapter()
1897
+ {
1898
+ public void mouseClicked(MouseEvent e)
1899
+ {
1900
+ Object3D object = Grafreed.materials.versionlist[4].get(0);
1901
+ cMaterial material = object.material;
1902
+
1903
+ diffusenessField.setFloat(material.factor);
1904
+ selfshadowField.setFloat(material.diffuseness);
1905
+
1906
+ materialtouched = true;
1907
+ applySelf();
1908
+ }
1909
+ });
1910
+ presetpanel.add(diffusemoon);
1911
+
1912
+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
1913
+ diffusemoon2.setToolTipText("Moon2");
1914
+ diffusemoon2.addMouseListener(new MouseAdapter()
1915
+ {
1916
+ public void mouseClicked(MouseEvent e)
1917
+ {
1918
+ Object3D object = Grafreed.materials.versionlist[5].get(0);
1919
+ cMaterial material = object.material;
1920
+
1921
+ diffusenessField.setFloat(material.factor);
1922
+ selfshadowField.setFloat(material.diffuseness);
1923
+
1924
+ materialtouched = true;
1925
+ applySelf();
1926
+ }
1927
+ });
1928
+ presetpanel.add(diffusemoon2);
1929
+
1930
+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
1931
+ diffusemoon3.setToolTipText("Moon3");
1932
+ diffusemoon3.addMouseListener(new MouseAdapter()
1933
+ {
1934
+ public void mouseClicked(MouseEvent e)
1935
+ {
1936
+ Object3D object = Grafreed.materials.versionlist[6].get(0);
1937
+ cMaterial material = object.material;
1938
+
1939
+ diffusenessField.setFloat(material.factor);
1940
+ selfshadowField.setFloat(material.diffuseness);
1941
+
1942
+ materialtouched = true;
1943
+ applySelf();
1944
+ }
1945
+ });
1946
+ presetpanel.add(diffusemoon3);
1947
+
1948
+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
1949
+ diffusesheen.setToolTipText("Sheen");
1950
+ diffusesheen.addMouseListener(new MouseAdapter()
1951
+ {
1952
+ public void mouseClicked(MouseEvent e)
1953
+ {
1954
+ Object3D object = Grafreed.materials.versionlist[7].get(0);
1955
+ cMaterial material = object.material;
1956
+
1957
+ sheenField.setFloat(material.sheen);
1958
+
1959
+ materialtouched = true;
1960
+ applySelf();
1961
+ }
1962
+ });
1963
+ presetpanel.add(diffusesheen);
1964
+
1965
+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1966
+ rough.setToolTipText("Rough metal");
1967
+ rough.addMouseListener(new MouseAdapter()
1968
+ {
1969
+ public void mouseClicked(MouseEvent e)
1970
+ {
1971
+ Object3D object = Grafreed.materials.versionlist[1].get(0);
1972
+ cMaterial material = object.material;
1973
+
1974
+ shininessField.setFloat(material.shininess);
1975
+ velvetField.setFloat(material.velvet);
1976
+
1977
+ materialtouched = true;
1978
+ applySelf();
1979
+ }
1980
+ });
1981
+ presetpanel.add(rough);
1982
+
1983
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
1984
+ rough2.setToolTipText("Medium metal");
1985
+ rough2.addMouseListener(new MouseAdapter()
1986
+ {
1987
+ public void mouseClicked(MouseEvent e)
1988
+ {
1989
+ Object3D object = Grafreed.materials.versionlist[13].get(0);
1990
+ cMaterial material = object.material;
1991
+
1992
+ shininessField.setFloat(material.shininess);
1993
+ lightareaField.setFloat(material.lightarea);
1994
+
1995
+ materialtouched = true;
1996
+ applySelf();
1997
+ }
1998
+ });
1999
+ presetpanel.add(rough2);
2000
+
2001
+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
2002
+ shini0.setToolTipText("Shiny");
2003
+ shini0.addMouseListener(new MouseAdapter()
2004
+ {
2005
+ public void mouseClicked(MouseEvent e)
2006
+ {
2007
+ Object3D object = Grafreed.materials.versionlist[14].get(0);
2008
+ cMaterial material = object.material;
2009
+
2010
+ shininessField.setFloat(material.shininess);
2011
+ lightareaField.setFloat(material.lightarea);
2012
+
2013
+ materialtouched = true;
2014
+ applySelf();
2015
+ }
2016
+ });
2017
+ presetpanel.add(shini0);
2018
+
2019
+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
2020
+ shini1.setToolTipText("Shiny2");
2021
+ shini1.addMouseListener(new MouseAdapter()
2022
+ {
2023
+ public void mouseClicked(MouseEvent e)
2024
+ {
2025
+ Object3D object = Grafreed.materials.versionlist[11].get(0);
2026
+ cMaterial material = object.material;
2027
+
2028
+ shininessField.setFloat(material.shininess);
2029
+ lightareaField.setFloat(material.lightarea);
2030
+
2031
+ materialtouched = true;
2032
+ applySelf();
2033
+ }
2034
+ });
2035
+ presetpanel.add(shini1);
2036
+
2037
+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2038
+ shini2.setToolTipText("Shiny3");
2039
+ shini2.addMouseListener(new MouseAdapter()
2040
+ {
2041
+ public void mouseClicked(MouseEvent e)
2042
+ {
2043
+ Object3D object = Grafreed.materials.versionlist[12].get(0);
2044
+ cMaterial material = object.material;
2045
+
2046
+ shininessField.setFloat(material.shininess);
2047
+ lightareaField.setFloat(material.lightarea);
2048
+
2049
+ materialtouched = true;
2050
+ applySelf();
2051
+ }
2052
+ });
2053
+ presetpanel.add(shini2);
2054
+
2055
+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2056
+ aniso.setToolTipText("AnisoU");
2057
+ aniso.addMouseListener(new MouseAdapter()
2058
+ {
2059
+ public void mouseClicked(MouseEvent e)
2060
+ {
2061
+ Object3D object = Grafreed.materials.versionlist[8].get(0);
2062
+ cMaterial material = object.material;
2063
+
2064
+ anisoField.setFloat(material.aniso);
2065
+ anisoVField.setFloat(material.anisoV);
2066
+
2067
+ materialtouched = true;
2068
+ applySelf();
2069
+ }
2070
+ });
2071
+ presetpanel.add(aniso);
2072
+
2073
+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2074
+ aniso2.setToolTipText("AnisoV");
2075
+ aniso2.addMouseListener(new MouseAdapter()
2076
+ {
2077
+ public void mouseClicked(MouseEvent e)
2078
+ {
2079
+ Object3D object = Grafreed.materials.versionlist[9].get(0);
2080
+ cMaterial material = object.material;
2081
+
2082
+ anisoField.setFloat(material.aniso);
2083
+ anisoVField.setFloat(material.anisoV);
2084
+
2085
+ materialtouched = true;
2086
+ applySelf();
2087
+ }
2088
+ });
2089
+ presetpanel.add(aniso2);
2090
+
2091
+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2092
+ aniso3.setToolTipText("AnisoUV");
2093
+ aniso3.addMouseListener(new MouseAdapter()
2094
+ {
2095
+ public void mouseClicked(MouseEvent e)
2096
+ {
2097
+ Object3D object = Grafreed.materials.versionlist[10].get(0);
2098
+ cMaterial material = object.material;
2099
+
2100
+ anisoField.setFloat(material.aniso);
2101
+ anisoVField.setFloat(material.anisoV);
2102
+
2103
+ materialtouched = true;
2104
+ applySelf();
2105
+ }
2106
+ });
2107
+ presetpanel.add(aniso3);
2108
+
2109
+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2110
+ velvet0.setToolTipText("Velvet");
2111
+ velvet0.addMouseListener(new MouseAdapter()
2112
+ {
2113
+ public void mouseClicked(MouseEvent e)
2114
+ {
2115
+ Object3D object = Grafreed.materials.versionlist[15].get(0);
2116
+ cMaterial material = object.material;
2117
+
2118
+ diffusenessField.setFloat(material.factor);
2119
+ selfshadowField.setFloat(material.diffuseness);
2120
+ sheenField.setFloat(material.sheen);
2121
+ shininessField.setFloat(material.shininess);
2122
+ velvetField.setFloat(material.velvet);
2123
+ shiftField.setFloat(material.shift);
2124
+
2125
+ materialtouched = true;
2126
+ applySelf();
2127
+ }
2128
+ });
2129
+ presetpanel.add(velvet0);
2130
+
2131
+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2132
+ bump0.setToolTipText("Bump texture");
2133
+ bump0.addMouseListener(new MouseAdapter()
2134
+ {
2135
+ public void mouseClicked(MouseEvent e)
2136
+ {
2137
+ Object3D object = Grafreed.materials.versionlist[16].get(0);
2138
+ cMaterial material = object.material;
2139
+
2140
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2141
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2142
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2143
+
2144
+ materialtouched = true;
2145
+ applySelf();
2146
+ }
2147
+ });
2148
+ presetpanel.add(bump0);
2149
+
2150
+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2151
+ halo.setToolTipText("Halo");
2152
+ halo.addMouseListener(new MouseAdapter()
2153
+ {
2154
+ public void mouseClicked(MouseEvent e)
2155
+ {
2156
+ Object3D object = Grafreed.materials.versionlist[17].get(0);
2157
+ cMaterial material = object.material;
2158
+
2159
+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2160
+
2161
+ materialtouched = true;
2162
+ applySelf();
2163
+ }
2164
+ });
2165
+ presetpanel.add(halo);
2166
+
2167
+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2168
+ candle.setToolTipText("Candle");
2169
+ candle.addMouseListener(new MouseAdapter()
2170
+ {
2171
+ public void mouseClicked(MouseEvent e)
2172
+ {
2173
+ Object3D object = Grafreed.materials.versionlist[18].get(0);
2174
+ cMaterial material = object.material;
2175
+
2176
+ subsurfaceField.setFloat(material.subsurface);
2177
+ shadowbiasField.setFloat(material.shadowbias);
2178
+ ambientField.setFloat(material.ambient);
2179
+ specularField.setFloat(material.specular);
2180
+ lightareaField.setFloat(material.lightarea);
2181
+ shininessField.setFloat(material.shininess);
2182
+
2183
+ materialtouched = true;
2184
+ applySelf();
2185
+ }
2186
+ });
2187
+ presetpanel.add(candle);
2188
+
2189
+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2190
+ shadowShader.setToolTipText("Shadow");
2191
+ shadowShader.addMouseListener(new MouseAdapter()
2192
+ {
2193
+ public void mouseClicked(MouseEvent e)
2194
+ {
2195
+ diffuseField.setFloat(0.001);
2196
+ ambientField.setFloat(0.001);
2197
+ cameraField.setFloat(0.001);
2198
+ specularField.setFloat(0.001);
2199
+ fakedepthField.setFloat(0.001);
2200
+ opacityField.setFloat(0.6);
2201
+
2202
+ materialtouched = true;
2203
+ applySelf();
2204
+ }
2205
+ });
2206
+ presetpanel.add(shadowShader);
2207
+
2208
+ cGridBag panel = new cGridBag().setVertical(true);
2209
+
2210
+ presetpanel.preferredWidth = 1;
2211
+
2212
+ materialpanel.add(presetpanel);
2213
+ materialpanel.add(panel);
2214
+
2215
+ panel.preferredWidth = 8;
2216
+
2217
+ /*
16232218 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
16242219 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1625
- */
2220
+ */
16262221
16272222 cGridBag editBar = new cGridBag().setVertical(false);
16282223
....@@ -1656,45 +2251,50 @@
16562251 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
16572252
16582253 cGridBag colorSection = new cGridBag().setVertical(true);
2254
+
2255
+ cGridBag huepanel = new cGridBag();
2256
+ cGridBag huelabel = new cGridBag();
2257
+ skin = GetLabel("icons/hue.png", false);
2258
+ skin.fit = true;
2259
+ huelabel.add(skin);
2260
+ huelabel.preferredWidth = 20;
2261
+ huepanel.add(new cGridBag()); // Label
2262
+ huepanel.add(huelabel); // Field/slider
2263
+
2264
+ huepanel.preferredHeight = 7;
2265
+
2266
+ colorSection.add(huepanel);
16592267
16602268 cGridBag color = new cGridBag();
1661
- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1662
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663
- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2269
+
2270
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
2271
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2272
+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2273
+
16642274 //colorField.preferredWidth = 200;
16652275 colorSection.add(color);
16662276
16672277 cGridBag modulation = new cGridBag();
16682278 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
16692279 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1670
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2280
+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
16712281 colorSection.add(modulation);
16722282
2283
+ cGridBag opacity = new cGridBag();
2284
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
2285
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2286
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2287
+ colorSection.add(opacity);
2288
+
2289
+ colorSection.add(GetSeparator());
2290
+
16732291 cGridBag texture = new cGridBag();
16742292 texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
16752293 textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16762294 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
16772295 colorSection.add(texture);
16782296
1679
- cGridBag anisoU = new cGridBag();
1680
- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1681
- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682
- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1683
- colorSection.add(anisoU);
1684
-
1685
- cGridBag anisoV = new cGridBag();
1686
- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1687
- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1688
- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1689
- colorSection.add(anisoV);
1690
-
1691
- cGridBag shadowbias = new cGridBag();
1692
- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1693
- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1694
- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1695
- colorSection.add(shadowbias);
1696
-
1697
- panel.add(new JSeparator());
2297
+ panel.add(GetSeparator());
16982298
16992299 panel.add(colorSection);
17002300
....@@ -1744,7 +2344,13 @@
17442344 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
17452345 diffuseSection.add(fakedepth);
17462346
1747
- panel.add(new JSeparator());
2347
+ cGridBag shadowbias = new cGridBag();
2348
+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
2349
+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2350
+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2351
+ diffuseSection.add(shadowbias);
2352
+
2353
+ panel.add(GetSeparator());
17482354
17492355 panel.add(diffuseSection);
17502356
....@@ -1794,42 +2400,48 @@
17942400 // aConstraints.gridy += 1;
17952401 // aConstraints.gridwidth = 1;
17962402
2403
+ cGridBag anisoU = new cGridBag();
2404
+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
2405
+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2406
+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2407
+ specularSection.add(anisoU);
17972408
1798
- panel.add(new JSeparator());
2409
+ cGridBag anisoV = new cGridBag();
2410
+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
2411
+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2412
+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2413
+ specularSection.add(anisoV);
2414
+
2415
+
2416
+ panel.add(GetSeparator());
17992417
18002418 panel.add(specularSection);
18012419
18022420 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
18032421
1804
- cGridBag globalSection = new cGridBag().setVertical(true);
2422
+ //cGridBag globalSection = new cGridBag().setVertical(true);
18052423
18062424 cGridBag camera = new cGridBag();
18072425 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
18082426 cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18092427 camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1810
- globalSection.add(camera);
2428
+ colorSection.add(camera);
18112429
18122430 cGridBag ambient = new cGridBag();
18132431 ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
18142432 ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18152433 ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1816
- globalSection.add(ambient);
2434
+ colorSection.add(ambient);
18172435
18182436 cGridBag backlit = new cGridBag();
18192437 backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
18202438 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18212439 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1822
- globalSection.add(backlit);
2440
+ colorSection.add(backlit);
18232441
1824
- cGridBag opacity = new cGridBag();
1825
- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1826
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1827
- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1828
- globalSection.add(opacity);
1829
-
1830
- panel.add(new JSeparator());
2442
+ //panel.add(new JSeparator());
18312443
1832
- panel.add(globalSection);
2444
+ //panel.add(globalSection);
18332445
18342446 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
18352447
....@@ -1871,7 +2483,7 @@
18712483 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
18722484 textureSection.add(opacityPower);
18732485
1874
- panel.add(new JSeparator());
2486
+ panel.add(GetSeparator());
18752487
18762488 panel.add(textureSection);
18772489
....@@ -1936,8 +2548,9 @@
19362548 // 3D models
19372549 if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
19382550 {
1939
- lastConverter = new com.jmex.model.converters.MaxToJme();
1940
- LoadFile(filename, lastConverter);
2551
+ //lastConverter = new com.jmex.model.converters.MaxToJme();
2552
+ //LoadFile(filename, lastConverter);
2553
+ LoadObjFile(filename); // New 3ds loader
19412554 continue;
19422555 }
19432556 if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -2663,6 +3276,7 @@
26633276 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
26643277 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
26653278 }
3279
+
26663280 //cJME.count++;
26673281 //cJME.count %= 12;
26683282 if (gc)
....@@ -2846,6 +3460,7 @@
28463460 }
28473461 }
28483462 }
3463
+
28493464 cFileSystemPane FSPane;
28503465
28513466 void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2855,7 +3470,7 @@
28553470
28563471 freezematerial = true;
28573472 colorField.setFloat(mat.color);
2858
- modulationField.setFloat(mat.modulation);
3473
+ saturationField.setFloat(mat.modulation);
28593474 metalnessField.setFloat(mat.metalness);
28603475 diffuseField.setFloat(mat.diffuse);
28613476 specularField.setFloat(mat.specular);
....@@ -2899,6 +3514,7 @@
28993514 }
29003515 }
29013516 }
3517
+
29023518 freezematerial = false;
29033519 }
29043520
....@@ -3017,12 +3633,17 @@
30173633 // }
30183634
30193635 /**/
3020
- if (deselect)
3636
+ if (deselect || child == null)
30213637 {
30223638 //group.deselectAll();
30233639 //freeze = true;
30243640 GetTree().clearSelection();
30253641 //freeze = false;
3642
+
3643
+ if (child == null)
3644
+ {
3645
+ return;
3646
+ }
30263647 }
30273648
30283649 //group.addSelectee(child);
....@@ -3056,6 +3677,17 @@
30563677 public void itemStateChanged(ItemEvent event)
30573678 {
30583679 // System.out.println("Propagate = " + propagate);
3680
+ if (event.getSource() == pinButton)
3681
+ {
3682
+ copy.pinned ^= true;
3683
+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3684
+ {
3685
+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
3686
+ copy.CloseUI();
3687
+ //copy.editWindow.refreshContents();
3688
+ }
3689
+ }
3690
+ else
30593691 if (event.getSource() == propagateToggle)
30603692 {
30613693 propagate ^= true;
....@@ -3160,8 +3792,9 @@
31603792 } else if (event.getSource() == liveCB)
31613793 {
31623794 copy.live ^= true;
3795
+ objEditor.refreshContents(true); // To show item colors
31633796 return;
3164
- } else if (event.getSource() == selectCB)
3797
+ } else if (event.getSource() == selectableCB)
31653798 {
31663799 copy.dontselect ^= true;
31673800 return;
....@@ -3169,7 +3802,7 @@
31693802 {
31703803 copy.hide ^= true;
31713804 copy.Touch(); // display list issue
3172
- objEditor.refreshContents();
3805
+ objEditor.refreshContents(true); // To show item colors
31733806 return;
31743807 } else if (event.getSource() == link2masterCB)
31753808 {
....@@ -3346,9 +3979,9 @@
33463979 {
33473980 Close();
33483981 //return true;
3349
- } else if (source == loadItem)
3982
+ } else if (source == openItem)
33503983 {
3351
- load();
3984
+ Open();
33523985 //return true;
33533986 } else if (source == newItem)
33543987 {
....@@ -3373,6 +4006,10 @@
33734006 {
33744007 generatePOV();
33754008 //return true;
4009
+ } else if (event.getSource() == archiveItem)
4010
+ {
4011
+ cTools.Archive(frame);
4012
+ return;
33764013 } else if (source == zBufferItem)
33774014 {
33784015 try
....@@ -3421,11 +4058,12 @@
34214058
34224059 static public byte[] Compress(Object3D o)
34234060 {
4061
+ // Slower to actually compress.
34244062 try
34254063 {
34264064 ByteArrayOutputStream baos = new ByteArrayOutputStream();
3427
- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3428
- ObjectOutputStream out = new ObjectOutputStream(zstream);
4065
+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
4066
+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
34294067
34304068 Object3D parent = o.parent;
34314069 o.parent = null;
....@@ -3436,10 +4074,14 @@
34364074
34374075 out.flush();
34384076
3439
- zstream.close();
4077
+ baos //zstream
4078
+ .close();
34404079 out.close();
34414080
3442
- return baos.toByteArray();
4081
+ byte[] bytes = baos.toByteArray();
4082
+
4083
+ System.out.println("save #bytes = " + bytes.length);
4084
+ return bytes;
34434085 } catch (Exception e)
34444086 {
34454087 System.err.println(e);
....@@ -3449,13 +4091,16 @@
34494091
34504092 static public Object Uncompress(byte[] bytes)
34514093 {
3452
- System.out.println("#bytes = " + bytes.length);
4094
+ System.out.println("restore #bytes = " + bytes.length);
34534095 try
34544096 {
34554097 ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3456
- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3457
- ObjectInputStream in = new ObjectInputStream(istream);
4098
+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
4099
+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
34584100 Object obj = in.readObject();
4101
+
4102
+ bais //istream
4103
+ .close();
34594104 in.close();
34604105
34614106 return obj;
....@@ -3510,41 +4155,95 @@
35104155 return null;
35114156 }
35124157
3513
- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35144158
35154159 public void Save()
35164160 {
4161
+ //Save(true);
4162
+ Replace();
4163
+ SetVersionStates();
4164
+ }
4165
+
4166
+ private boolean Equal(byte[] compress, byte[] name)
4167
+ {
4168
+ if (compress.length != name.length)
4169
+ {
4170
+ return false;
4171
+ }
4172
+
4173
+ for (int i=compress.length; --i>=0;)
4174
+ {
4175
+ if (compress[i] != name[i])
4176
+ return false;
4177
+ }
4178
+
4179
+ return true;
4180
+ }
4181
+
4182
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4183
+
4184
+ void DeleteVersion()
4185
+ {
4186
+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
4187
+ {
4188
+ copy.versionlist[i] = copy.versionlist[i+1];
4189
+ }
4190
+
4191
+ CopyChanged();
4192
+
4193
+ SetVersionStates();
4194
+ }
4195
+
4196
+ public boolean Save(boolean user)
4197
+ {
35174198 System.err.println("Save");
4199
+ Replace();
35184200
3519
- cRadio tab = GetCurrentTab();
4201
+ //cRadio tab = GetCurrentTab();
35204202
3521
- boolean temp = CameraPane.SWITCH;
3522
- CameraPane.SWITCH = false;
4203
+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
35234204
3524
- copy.ExtractBigData(hashtable);
4205
+ boolean thesame = false;
4206
+
4207
+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
4208
+// {
4209
+// thesame = true;
4210
+// }
35254211
35264212 //EditorFrame.m_MainFrame.requestFocusInWindow();
3527
- tab.graphs[tab.undoindex++] = Compress(copy);
3528
-
3529
- copy.RestoreBigData(hashtable);
3530
-
3531
- CameraPane.SWITCH = temp;
3532
-
3533
- //assert(hashtable.isEmpty());
3534
-
3535
- for (int i = tab.undoindex; i < tab.graphs.length; i++)
4213
+ if (!thesame)
35364214 {
3537
- tab.graphs[i] = null;
4215
+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
4216
+ {
4217
+ copy.versionlist[i] = copy.versionlist[i-1];
4218
+ }
4219
+
4220
+ //tab.user[tab.versionindex] = user;
4221
+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
4222
+
4223
+ copy.versionlist[++copy.versionindex] = compress;
4224
+
4225
+ // if (increment)
4226
+ // tab.versionindex++;
35384227 }
35394228
3540
- SetUndoStates();
4229
+ //copy.RestoreBigData(versiontable);
4230
+
4231
+ //assert(hashtable.isEmpty());
4232
+
4233
+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
4234
+// {
4235
+// //tab.user[i] = false;
4236
+// copy.versionlist[i] = null;
4237
+// }
4238
+
4239
+ SetVersionStates();
35414240
35424241 // test save
35434242 if (false)
35444243 {
35454244 try
35464245 {
3547
- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
4246
+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
35484247 ObjectOutputStream p = new ObjectOutputStream(ostream);
35494248
35504249 p.writeObject(copy);
....@@ -3557,28 +4256,68 @@
35574256 e.printStackTrace();
35584257 }
35594258 }
4259
+
4260
+ return !thesame;
4261
+ }
4262
+
4263
+ boolean flashIt = true;
4264
+
4265
+ void RefreshSelection()
4266
+ {
4267
+ Object3D selection = new Object3D();
4268
+
4269
+ for (int i = 0; i < copy.selection.size(); i++)
4270
+ {
4271
+ Object3D elem = copy.selection.elementAt(i);
4272
+
4273
+ Object3D obj = copy.GetObject(elem.GetUUID());
4274
+
4275
+ if (obj == null)
4276
+ {
4277
+ copy.selection.remove(i--);
4278
+ }
4279
+ else
4280
+ {
4281
+ selection.add(obj);
4282
+ copy.selection.setElementAt(obj, i);
4283
+ }
4284
+ }
4285
+
4286
+ flashIt = false;
4287
+ GetTree().clearSelection();
4288
+ for (int i = 0; i < selection.size(); i++)
4289
+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
4290
+ flashIt = true;
4291
+
4292
+ //refreshContents(false);
35604293 }
35614294
3562
- void CopyChanged(Object3D obj)
4295
+ void CopyChanged()
35634296 {
3564
- SetUndoStates();
4297
+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4298
+
4299
+ SetVersionStates();
35654300
35664301 boolean temp = CameraPane.SWITCH;
35674302 CameraPane.SWITCH = false;
35684303
3569
- copy.ExtractBigData(hashtable);
4304
+ copy.ExtractBigData(versiontable);
35704305
35714306 copy.clear();
35724307
4308
+ copy.skyboxname = obj.skyboxname;
4309
+ copy.skyboxext = obj.skyboxext;
4310
+
35734311 for (int i=0; i<obj.Size(); i++)
35744312 {
35754313 copy.add(obj.get(i));
35764314 }
35774315
3578
- copy.RestoreBigData(hashtable);
4316
+ copy.RestoreBigData(versiontable);
35794317
35804318 CameraPane.SWITCH = temp;
35814319
4320
+ RefreshSelection();
35824321 //assert(hashtable.isEmpty());
35834322
35844323 copy.Touch();
....@@ -3599,56 +4338,144 @@
35994338 }
36004339 }
36014340
3602
- refreshContents();
4341
+ refreshContents(true);
36034342 }
36044343
3605
- cButton undoButton;
3606
- cButton redoButton;
4344
+ cButton previousVersionButton;
4345
+ cButton restoreButton;
4346
+ cButton replaceButton;
4347
+ cButton nextVersionButton;
4348
+ cButton saveVersionButton;
4349
+ cButton deleteVersionButton;
36074350
3608
- void SetUndoStates()
4351
+ boolean muteSlider;
4352
+
4353
+ int VersionCount()
36094354 {
3610
- cRadio tab = GetCurrentTab();
4355
+ int count = 0;
36114356
3612
- undoButton.setEnabled(tab.undoindex > 0);
3613
- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
4357
+ for (int i = copy.versionlist.length; --i >= 0;)
4358
+ {
4359
+ if (copy.versionlist[i] != null)
4360
+ count++;
4361
+ }
4362
+
4363
+ return count;
36144364 }
36154365
3616
- public void Undo()
4366
+ void SetVersionStates()
36174367 {
4368
+ //if (true)
4369
+ // return;
4370
+
4371
+ //cRadio tab = GetCurrentTab();
4372
+
4373
+ restoreButton.setEnabled(copy.versionindex != -1);
4374
+ replaceButton.setEnabled(copy.versionindex != -1);
4375
+
4376
+ previousVersionButton.setEnabled(copy.versionindex > 0);
4377
+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4378
+
4379
+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4380
+ copy.versionlist[copy.versionindex + 1] != null);
4381
+
4382
+ muteSlider = true;
4383
+ versionSlider.setMinimum(0);
4384
+ versionSlider.setMaximum(VersionCount() - 1);
4385
+ versionSlider.setInteger(copy.versionindex);
4386
+ versionSlider.setEnabled(copy.versionindex != -1);
4387
+ muteSlider = false;
4388
+ }
4389
+
4390
+ public boolean PreviousVersion()
4391
+ {
4392
+ // Option?
4393
+ Replace();
4394
+
36184395 System.err.println("Undo");
36194396
3620
- cRadio tab = GetCurrentTab();
4397
+ //cRadio tab = GetCurrentTab();
36214398
3622
- if (tab.undoindex == 0)
4399
+ if (copy.versionindex == 0)
36234400 {
36244401 java.awt.Toolkit.getDefaultToolkit().beep();
3625
- return;
4402
+ return false;
36264403 }
36274404
3628
- if (tab.graphs[tab.undoindex] == null)
3629
- {
3630
- Save();
3631
- tab.undoindex -= 1;
3632
- }
4405
+// if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
4406
+// {
4407
+// if (Save(false))
4408
+// tab.versionindex -= 1;
4409
+// else
4410
+// {
4411
+// if (tab.versionindex <= 0)
4412
+// return false;
4413
+// else
4414
+// tab.versionindex -= 1;
4415
+// }
4416
+// }
36334417
3634
- tab.undoindex -= 1;
4418
+ copy.versionindex -= 1;
36354419
3636
- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
4420
+ CopyChanged();
4421
+
4422
+ return true;
36374423 }
36384424
3639
- public void Redo()
4425
+ public boolean Restore()
36404426 {
3641
- cRadio tab = GetCurrentTab();
4427
+ System.err.println("Restore");
36424428
3643
- if (tab.graphs[tab.undoindex + 1] == null)
4429
+ //cRadio tab = GetCurrentTab();
4430
+
4431
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4432
+ {
4433
+ java.awt.Toolkit.getDefaultToolkit().beep();
4434
+ return false;
4435
+ }
4436
+
4437
+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4438
+ CopyChanged();
4439
+
4440
+ return true;
4441
+ }
4442
+
4443
+ public boolean Replace()
4444
+ {
4445
+ System.err.println("Replace");
4446
+
4447
+ //cRadio tab = GetCurrentTab();
4448
+
4449
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4450
+ {
4451
+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
4452
+ return false;
4453
+ }
4454
+
4455
+ copy.versionlist[copy.versionindex] = Duplicate(copy);
4456
+
4457
+ return true;
4458
+ }
4459
+
4460
+ public void NextVersion()
4461
+ {
4462
+ // Option?
4463
+ Replace();
4464
+
4465
+ //cRadio tab = GetCurrentTab();
4466
+
4467
+ if (copy.versionlist[copy.versionindex + 1] == null)
36444468 {
36454469 java.awt.Toolkit.getDefaultToolkit().beep();
36464470 return;
36474471 }
36484472
3649
- tab.undoindex += 1;
4473
+ copy.versionindex += 1;
36504474
3651
- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
4475
+ CopyChanged();
4476
+
4477
+ //if (!tab.user[tab.versionindex])
4478
+ // tab.graphs[tab.versionindex] = null;
36524479 }
36534480
36544481 void ImportGFD()
....@@ -3859,7 +4686,7 @@
38594686 //copy.material = new cMaterial(copy.GetMaterial());
38604687
38614688 current.color = (float) colorField.getFloat();
3862
- current.modulation = (float) modulationField.getFloat();
4689
+ current.modulation = (float) saturationField.getFloat();
38634690 current.metalness = (float) metalnessField.getFloat();
38644691 current.diffuse = (float) diffuseField.getFloat();
38654692 current.specular = (float) specularField.getFloat();
....@@ -3892,7 +4719,7 @@
38924719 cMaterial mat = copy.material;
38934720
38944721 colorField.SetToolTipValue((mat.color));
3895
- modulationField.SetToolTipValue((mat.modulation));
4722
+ saturationField.SetToolTipValue((mat.modulation));
38964723 metalnessField.SetToolTipValue((mat.metalness));
38974724 diffuseField.SetToolTipValue((mat.diffuse));
38984725 specularField.SetToolTipValue((mat.specular));
....@@ -3944,9 +4771,26 @@
39444771 //copy.Touch();
39454772 }
39464773
4774
+ cNumberSlider versionSlider;
4775
+
39474776 public void stateChanged(ChangeEvent e)
39484777 {
39494778 // assert(false);
4779
+ if (e.getSource() == versionSlider)
4780
+ {
4781
+ if (muteSlider)
4782
+ return;
4783
+
4784
+ int version = versionSlider.getInteger();
4785
+
4786
+ if (version != -1 && copy.versionlist[version] != null)
4787
+ {
4788
+ copy.versionindex = version;
4789
+ CopyChanged();
4790
+ }
4791
+
4792
+ return;
4793
+ }
39504794
39514795 if (freezematerial)
39524796 {
....@@ -3982,6 +4826,12 @@
39824826 {
39834827 //System.out.println("stateChanged = " + this);
39844828 materialtouched = true;
4829
+
4830
+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
4831
+ {
4832
+ saturationField.setFloat(1);
4833
+ }
4834
+
39854835 applySelf();
39864836 //System.out.println("this = " + this);
39874837 //System.out.println("PARENT = " + parent);
....@@ -4281,6 +5131,7 @@
42815131 {
42825132 if (GetTree() != null)
42835133 {
5134
+ GetTree().revalidate();
42845135 GetTree().repaint();
42855136 }
42865137
....@@ -4289,13 +5140,16 @@
42895140 ctrlPanel.validate(); // ? new
42905141 ctrlPanel.repaint();
42915142 }
5143
+
5144
+ if (previousVersionButton != null && copy.versionlist != null)
5145
+ SetVersionStates();
42925146 }
42935147
42945148 static TweenManager tweenManager = new TweenManager();
42955149
42965150 void makeSomething(Object3D thing, boolean resetmodel) // deselect)
42975151 {
4298
- if (Globals.SAVEONMAKE) // && resetmodel)
5152
+ if (Globals.REPLACEONMAKE) // && resetmodel)
42995153 Save();
43005154 //Tween.set(thing, 0).target(1).start(tweenManager);
43015155 //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4537,7 +5391,9 @@
45375391 readobj.ResetDisplayList();
45385392 } catch (Exception e)
45395393 {
4540
- //e.printStackTrace();
5394
+ if (!e.toString().contains("GZIP"))
5395
+ e.printStackTrace();
5396
+
45415397 try
45425398 {
45435399 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4611,12 +5467,14 @@
46115467
46125468 if (readobj != null)
46135469 {
4614
- if (Globals.SAVEONMAKE)
4615
- Save();
5470
+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
5471
+ // Save();
46165472 try
46175473 {
46185474 //readobj.deepCopySelf(copy);
46195475 copy.clear(); // june 2014
5476
+ copy.skyboxname = readobj.skyboxname;
5477
+ copy.skyboxext = readobj.skyboxext;
46205478 for (int i = 0; i < readobj.size(); i++)
46215479 {
46225480 Object3D child = readobj.get(i); // reserve(i);
....@@ -4657,6 +5515,7 @@
46575515 }
46585516 } catch (ClassCastException e)
46595517 {
5518
+ e.printStackTrace();
46605519 assert (false);
46615520 Composite c = (Composite) copy;
46625521 c.children.clear();
....@@ -4667,17 +5526,31 @@
46675526 c.addChild(csg);
46685527 }
46695528
5529
+ copy.versionlist = readobj.versionlist;
5530
+ copy.versionindex = readobj.versionindex;
5531
+
5532
+ if (copy.versionlist == null)
5533
+ {
5534
+ // Backward compatibility
5535
+ copy.versionlist = new Object3D[100];
5536
+ copy.versionindex = -1;
5537
+
5538
+ Save(true);
5539
+ }
5540
+
5541
+ //? SetUndoStates();
5542
+
46705543 ResetModel();
46715544 copy.HardTouch(); // recompile?
46725545 refreshContents();
46735546 }
46745547 }
46755548
4676
- void load() // throws ClassNotFoundException
5549
+ void Open() // throws ClassNotFoundException
46775550 {
46785551 if (Grafreed.standAlone)
46795552 {
4680
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5553
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
46815554 browser.show();
46825555 String filename = browser.getFile();
46835556 if (filename != null && filename.length() > 0)
....@@ -4754,6 +5627,8 @@
47545627
47555628 void save()
47565629 {
5630
+ Replace();
5631
+
47575632 if (lastname == null)
47585633 {
47595634 return;
....@@ -4776,6 +5651,7 @@
47765651 //ps.print(buffer.toString());
47775652 } catch (IOException e)
47785653 {
5654
+ e.printStackTrace();
47795655 }
47805656 }
47815657
....@@ -4958,7 +5834,7 @@
49585834 MenuBar menuBar;
49595835 Menu fileMenu;
49605836 MenuItem newItem;
4961
- MenuItem loadItem;
5837
+ MenuItem openItem;
49625838 MenuItem saveItem;
49635839 MenuItem saveAsItem;
49645840 MenuItem exportAsItem;
....@@ -4981,6 +5857,7 @@
49815857 CheckboxMenuItem toggleSwitchItem;
49825858 CheckboxMenuItem toggleRootItem;
49835859 CheckboxMenuItem animationItem;
5860
+ MenuItem archiveItem;
49845861 CheckboxMenuItem toggleHandleItem;
49855862 CheckboxMenuItem togglePaintItem;
49865863 JSplitPane mainPanel;
....@@ -4994,6 +5871,7 @@
49945871 ButtonGroup buttonGroup;
49955872
49965873 cGridBag toolboxPanel;
5874
+ cGridBag skyboxPanel;
49975875 cGridBag materialPanel;
49985876 cGridBag ctrlPanel;
49995877
....@@ -5067,7 +5945,7 @@
50675945 JLabel colorLabel;
50685946 cNumberSlider colorField;
50695947 JLabel modulationLabel;
5070
- cNumberSlider modulationField;
5948
+ cNumberSlider saturationField;
50715949 JLabel metalnessLabel;
50725950 cNumberSlider metalnessField;
50735951 JLabel diffuseLabel;
....@@ -5098,6 +5976,7 @@
50985976 cNumberSlider anisoField;
50995977 JLabel anisoVLabel;
51005978 cNumberSlider anisoVField;
5979
+
51015980 JLabel cameraLabel;
51025981 cNumberSlider cameraField;
51035982 JLabel selfshadowLabel;
....@@ -5112,6 +5991,7 @@
51125991 cNumberSlider fakedepthField;
51135992 JLabel shadowbiasLabel;
51145993 cNumberSlider shadowbiasField;
5994
+
51155995 JLabel bumpLabel;
51165996 cNumberSlider bumpField;
51175997 JLabel noiseLabel;