Normand Briere
2019-08-22 0c7b833be7d86598a6813cd1c6db0ca9e1b17966
ObjEditor.java
....@@ -34,6 +34,7 @@
3434 iSendInfo
3535 //KeyListener
3636 {
37
+ public cToggleButton pinButton;
3738 boolean timeline;
3839 boolean wasFullScreen;
3940
....@@ -41,6 +42,50 @@
4142 JFrame frame;
4243
4344 static ObjEditor theFrame;
45
+
46
+ public void AllocProjectedVertices(Object3D object)
47
+ {
48
+ assert (object.projectedVertices != null);
49
+
50
+ if (object.projectedVertices.length <= 2)
51
+ {
52
+ // Side effect...
53
+ Object3D.cVector2[] keep = object.projectedVertices;
54
+ object.projectedVertices = new Object3D.cVector2[3];
55
+ for (int i = 0; i < 3; i++)
56
+ {
57
+ if (i < keep.length)
58
+ {
59
+ object.projectedVertices[i] = keep[i];
60
+ } else
61
+ {
62
+ object.projectedVertices[i] = new Object3D.cVector2();
63
+ }
64
+ /*
65
+ if(keep.length == 0)
66
+ object.projectedVertices[0] = new Object3D.cVector2();
67
+ else
68
+ object.projectedVertices[0] = keep[0];
69
+ object.projectedVertices[1] = new Object3D.cVector2();
70
+ */
71
+ }
72
+ }
73
+ }
74
+
75
+ public Composite CreateCameras()
76
+ {
77
+ Composite cams = new cTemplate();
78
+ cams.name = "Cameras";
79
+ copy.insertElementAt(cams, 0);
80
+
81
+ cams.addChild(new Camera());
82
+ cams.addChild(new Camera(1));
83
+ cams.addChild(new Camera(2));
84
+ cams.addChild(new Camera(3));
85
+ cams.addChild(new Camera(4));
86
+
87
+ return cams;
88
+ }
4489
4590 public cGridBag GetSeparator()
4691 {
....@@ -53,7 +98,10 @@
5398 cButton GetButton(String name, boolean border)
5499 {
55100 ImageIcon icon = GetIcon(name);
56
- return new cButton(icon, border);
101
+ if (icon != null || name.contains("/"))
102
+ return new cButton(icon, border);
103
+ else
104
+ return new cButton(name, border);
57105 }
58106
59107 cLabel GetLabel(String name, boolean border)
....@@ -74,12 +122,26 @@
74122 return new cCheckBox(icon, border);
75123 }
76124
77
- ImageIcon GetIcon(String name)
125
+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
126
+
127
+ static ImageIcon GetIcon(String name)
78128 {
129
+ javax.swing.ImageIcon iconCache = icons.get(name);
130
+ if (iconCache != null)
131
+ {
132
+ return iconCache;
133
+ }
134
+
79135 try
80136 {
81
- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
82
-
137
+ BufferedImage image;
138
+
139
+ if (name.endsWith("jpg"))
140
+ // Much faster!
141
+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
142
+ else
143
+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
144
+
83145 // if (image.getWidth() > 48 && image.getHeight() > 48)
84146 // {
85147 // BufferedImage resized = new BufferedImage(48, 48, image.getType());
....@@ -93,10 +155,14 @@
93155 // }
94156
95157 javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
158
+
159
+ icons.put(name, icon);
160
+
96161 return icon;
97162 }
98163 catch (Exception e)
99164 {
165
+ //icons.put(name, null);
100166 return null;
101167 }
102168 }
....@@ -296,11 +362,13 @@
296362 client = inClient;
297363 copy = client;
298364
299
- if (copy.versions == null)
300
- {
301
- copy.versions = new byte[100][];
302
- copy.versionindex = -1;
303
- }
365
+// if (copy.versionlist == null)
366
+// {
367
+// copy.versionlist = new Object3D[100];
368
+// copy.versionindex = -1;
369
+//
370
+// callee.Save(true);
371
+// }
304372
305373 // "this" is not called: SetupUI2(objEditor);
306374 }
....@@ -315,12 +383,6 @@
315383 client = inClient;
316384 copy = client;
317385
318
- if (copy.versions == null)
319
- {
320
- copy.versions = new byte[100][];
321
- copy.versionindex = -1;
322
- }
323
-
324386 SetupUI2(callee.GetEditor());
325387 }
326388
....@@ -342,7 +404,8 @@
342404 //parent = p;
343405
344406 GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
345
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
407
+ if (Globals.DEBUG)
408
+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
346409 //gd.setFullScreenWindow(this);
347410 //setResizable(false);
348411 //if (!isDisplayable())
....@@ -353,11 +416,13 @@
353416 copy = localCopy;
354417 copy.editWindow = this;
355418
356
- if (copy.versions == null)
357
- {
358
-// copy.versions = new byte[100][];
419
+// if (copy.versionlist == null)
420
+// {
421
+// copy.versionlist = new Object3D[100];
359422 // copy.versionindex = -1;
360
- }
423
+//
424
+// Save(true);
425
+// }
361426
362427 SetupMenu();
363428
....@@ -377,6 +442,9 @@
377442
378443 static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
379444
445
+ // This is to refresh the UI of the material panel.
446
+ boolean patchMaterial;
447
+
380448 void SetupMenu()
381449 {
382450 frame.setMenuBar(menuBar = new MenuBar());
....@@ -390,8 +458,11 @@
390458 importOBJItem.addActionListener(this);
391459 import3DSItem = menu.add(new MenuItem("3DS file..."));
392460 import3DSItem.addActionListener(this);
461
+ if (Globals.ADVANCED)
462
+ {
393463 importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
394464 importVRMLX3DItem.addActionListener(this);
465
+ }
395466 menu.add("-");
396467 importGFDItem = menu.add(new MenuItem("Grafreed file..."));
397468 importGFDItem.addActionListener(this);
....@@ -426,6 +497,8 @@
426497
427498 ChangeListener changeListener = new ChangeListener()
428499 {
500
+ //String name;
501
+
429502 public void stateChanged(ChangeEvent changeEvent)
430503 {
431504 // if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -444,7 +517,37 @@
444517 // EditSelection(false);
445518 // }
446519
447
- refreshContents(false); // To refresh Info tab
520
+// if (objectPanel.getSelectedIndex() == 4)
521
+// {
522
+// name = copy.skyboxname;
523
+//
524
+// if (name == null)
525
+// {
526
+// name = "";
527
+// }
528
+//
529
+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
530
+// copy.skyboxext = "jpg";
531
+// }
532
+// else
533
+// {
534
+// if (name != null)
535
+// {
536
+// if (name.equals(""))
537
+// {
538
+// copy.skyboxname = null;
539
+// copy.skyboxext = null;
540
+// }
541
+// else
542
+// {
543
+// copy.skyboxname = name;
544
+// }
545
+// }
546
+// }
547
+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
548
+
549
+// refreshContents(false); // To refresh Info tab
550
+ cameraView.repaint();
448551 }
449552 };
450553 objectPanel.addChangeListener(changeListener);
....@@ -467,7 +570,9 @@
467570 toolboxPanel = new cGridBag().setVertical(true);
468571 //toolboxPanel.setName("Toolbox");
469572
470
- materialPanel = new cGridBag().setVertical(true);
573
+ skyboxPanel = new cGridBag().setVertical(true);
574
+
575
+ materialPanel = new cGridBag().setVertical(false);
471576 //materialPanel.setName("Material");
472577
473578 /*JTextPane*/
....@@ -751,6 +856,7 @@
751856 boolean maximized;
752857
753858 cButton fullscreenLayout;
859
+ cButton expandedLayout;
754860
755861 void Minimize()
756862 {
....@@ -790,10 +896,12 @@
790896 cButton minButton;
791897 cButton maxButton;
792898 cButton fullButton;
899
+ cButton collapseButton;
900
+ cButton maximize3DButton;
793901
794902 void ToggleFullScreen()
795903 {
796
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
904
+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797905
798906 cameraView.ToggleFullScreen();
799907
....@@ -814,13 +922,13 @@
814922 // X frame.getContentPane().remove(/*"Center",*/bigThree);
815923 // X framePanel.add(bigThree);
816924 // X frame.getContentPane().add(/*"Center",*/framePanel);
817
- framePanel.setDividerLocation(46);
925
+// framePanel.setDividerLocation(46); // icons are 24x24
818926
819927 //frame.setVisible(true);
820
- radio.layout = keepButton;
928
+// radio.layout = keepButton;
821929 //theFrame = null;
822930 keepButton = null;
823
- radio.layout.doClick();
931
+// radio.layout.doClick();
824932
825933 } else
826934 {
....@@ -841,31 +949,53 @@
841949 // X frame.getContentPane().remove(/*"Center",*/framePanel);
842950 // X framePanel.remove(bigThree);
843951 // X frame.getContentPane().add(/*"Center",*/bigThree);
844
- framePanel.setDividerLocation(0);
952
+// framePanel.setDividerLocation(0);
845953
846
- radio.layout = fullscreenLayout;
847
- radio.layout.doClick();
954
+// radio.layout = fullscreenLayout;
955
+// radio.layout.doClick();
848956 //frame.setVisible(true);
849957 }
850958 frame.validate();
959
+
960
+ cameraView.requestFocusInWindow();
851961 }
852962
853
- private byte[] CompressCopy()
963
+ void CollapseToolbar()
964
+ {
965
+ framePanel.setDividerLocation(0);
966
+ //frame.validate();
967
+
968
+ cameraView.requestFocusInWindow();
969
+ }
970
+
971
+ private Object3D Duplicate(Object3D object)
854972 {
855973 boolean temp = CameraPane.SWITCH;
856974 CameraPane.SWITCH = false;
857975
858
- copy.ExtractBigData(versiontable);
976
+ if (Grafreed.grafreed.universe.versiontable == null)
977
+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
978
+
979
+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
859980 // if (copy == client)
860981
861
- byte[] versions[] = copy.versions;
862
- copy.versions = null;
982
+ Object3D versions[] = object.versionlist;
983
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
984
+ object.versionlist = null;
985
+ object.versiontable = null;
863986
864
- byte[] compress = Compress(copy);
987
+ Object3D parent = object.parent;
988
+ object.parent = null;
865989
866
- copy.versions = versions;
990
+ //byte[] compress = Compress(copy);
991
+ Object3D compress = (Object3D)Grafreed.clone(object);
867992
868
- copy.RestoreBigData(versiontable);
993
+ object.parent = parent;
994
+
995
+ object.versionlist = versions;
996
+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
997
+
998
+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
869999
8701000 CameraPane.SWITCH = temp;
8711001
....@@ -993,6 +1123,7 @@
9931123 {
9941124 SetupMaterial(materialPanel);
9951125 }
1126
+
9961127 //SetupName();
9971128 //SetupViews();
9981129 }
....@@ -1201,6 +1332,18 @@
12011332
12021333 namePanel = new cGridBag();
12031334
1335
+ //if (copy.pinned)
1336
+ {
1337
+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1338
+ pinButton.setSelected(copy.pinned);
1339
+ cGridBag t = new cGridBag();
1340
+ t.preferredWidth = 2;
1341
+ t.add(pinButton);
1342
+ namePanel.add(t);
1343
+
1344
+ pinButton.addItemListener(this);
1345
+ }
1346
+
12041347 nameField = AddText(namePanel, copy.GetName());
12051348 namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
12061349 oe.ctrlPanel.add(namePanel);
....@@ -1214,14 +1357,14 @@
12141357
12151358 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12161359 liveCB.setToolTipText("Animate object");
1360
+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1361
+ markCB.setToolTipText("Set target transform");
12171362 selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12181363 selectableCB.setToolTipText("Make object selectable");
12191364 // Return();
12201365
12211366 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12221367 hideCB.setToolTipText("Hide object");
1223
- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1224
- markCB.setToolTipText("As animation target transform");
12251368
12261369 ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12271370
....@@ -1423,22 +1566,9 @@
14231566
14241567 if (cam == null || !(copy.get(0) instanceof cGroup))
14251568 {
1426
- System.out.println("CREATE CAMERAS");
1427
- cams = new cTemplate();
1428
- cams.name = "Cameras";
1429
- copy.insertElementAt(cams, 0);
1430
- //cams.parent = copy;
1431
-
1432
- cam = new Camera(); // LA.newVector(3, 2, 1));
1433
- cams.addChild(cam);
1434
- cam = new Camera(1);
1435
- cams.addChild(cam);
1436
- cam = new Camera(2);
1437
- cams.addChild(cam);
1438
- cam = new Camera(3);
1439
- cams.addChild(cam);
1440
- cam = new Camera(4); // Light
1441
- cams.addChild(cam);
1569
+ if (Globals.DEBUG)
1570
+ System.out.println("CREATE CAMERAS");
1571
+ cams = CreateCameras();
14421572 } else
14431573 {
14441574 cams = (cGroup) copy.get(0);
....@@ -1504,6 +1634,45 @@
15041634 //frontView.object = copy;
15051635 //sideView.object = copy;
15061636
1637
+ transformPanel = new cGridBag().setVertical(true);
1638
+
1639
+ cGridBag resetTransformPanel = new cGridBag();
1640
+
1641
+ resetTransformPanel.preferredHeight = 2;
1642
+
1643
+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
1644
+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
1645
+ resetTransform.addMouseListener(new MouseAdapter()
1646
+ {
1647
+ public void mouseClicked(MouseEvent e)
1648
+ {
1649
+ ResetTransform();
1650
+ }
1651
+ });
1652
+ resetTransformPanel.add(resetTransform);
1653
+
1654
+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
1655
+ resetTransform.setToolTipText("Reset Translation only");
1656
+ resetTransform.addMouseListener(new MouseAdapter()
1657
+ {
1658
+ public void mouseClicked(MouseEvent e)
1659
+ {
1660
+ ResetTransform(1);
1661
+ }
1662
+ });
1663
+ resetTransformPanel.add(resetTransform);
1664
+
1665
+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
1666
+ resetTransform.setToolTipText("Reset Rotation and Scale only");
1667
+ resetTransform.addMouseListener(new MouseAdapter()
1668
+ {
1669
+ public void mouseClicked(MouseEvent e)
1670
+ {
1671
+ ResetTransform(2);
1672
+ }
1673
+ });
1674
+ resetTransformPanel.add(resetTransform);
1675
+
15071676 XYZPanel = new cGridBag().setVertical(true);
15081677 //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
15091678
....@@ -1513,6 +1682,9 @@
15131682 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
15141683 //XYZPanel.setName("XYZ");
15151684
1685
+ transformPanel.add(resetTransformPanel);
1686
+ transformPanel.add(XYZPanel);
1687
+
15161688 /*
15171689 gridPanel = new JPanel(); //new BorderLayout());
15181690 gridPanel.setLayout(new GridLayout(1, 2));
....@@ -1520,12 +1692,12 @@
15201692 gridPanel.add(cameraView);
15211693 gridPanel.add(XYZPanel);
15221694 */
1523
- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1524
- gridPanel.setContinuousLayout(true);
1525
- gridPanel.setOneTouchExpandable(true);
1526
- gridPanel.setDividerLocation(1.0);
1527
- gridPanel.setDividerSize(9);
1528
- gridPanel.setResizeWeight(0.85);
1695
+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1696
+// gridPanel.setContinuousLayout(true);
1697
+// gridPanel.setOneTouchExpandable(true);
1698
+// gridPanel.setDividerLocation(1.0);
1699
+// gridPanel.setDividerSize(9);
1700
+// gridPanel.setResizeWeight(0.85);
15291701
15301702 // aConstraints.weighty = 0;
15311703 //System.out.println("THIS = " + this);
....@@ -1548,31 +1720,34 @@
15481720
15491721 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15501722 //tmp.setName("Edit");
1723
+ objectPanel.add(skyboxPanel);
1724
+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
1725
+ objectPanel.setToolTipTextAt(0, "Backgrounds");
1726
+
1727
+ objectPanel.add(toolboxPanel);
1728
+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1729
+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1730
+
15511731 objectPanel.add(materialPanel);
1552
- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1553
- objectPanel.setToolTipTextAt(0, "Material panel");
1732
+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
1733
+ objectPanel.setToolTipTextAt(2, "Material");
15541734
15551735 // JPanel north = new JPanel(new BorderLayout());
15561736 // north.setName("Edit");
15571737 // north.add(ctrlPanel, BorderLayout.NORTH);
15581738 // objectPanel.add(north);
15591739 objectPanel.add(editPanel);
1560
- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1561
- objectPanel.setToolTipTextAt(1, "Edit panel");
1740
+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1741
+ objectPanel.setToolTipTextAt(3, "Edit controls");
15621742
1563
- //if (Globals.ADVANCED)
1564
- objectPanel.add(infoPanel);
1565
- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1566
- objectPanel.setToolTipTextAt(2, "Info panel");
1743
+ objectPanel.add(transformPanel);
1744
+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1745
+ objectPanel.setToolTipTextAt(4, "TRS transform");
15671746
1568
- objectPanel.add(XYZPanel);
1569
- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1570
- objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
1571
-
1572
- objectPanel.add(toolboxPanel);
1573
- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1574
- objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1575
-
1747
+ patchMaterial = true;
1748
+ cameraView.patchMaterial = this;
1749
+ objectPanel.setSelectedIndex(2);
1750
+
15761751 /*
15771752 aConstraints.gridx = 0;
15781753 aConstraints.gridwidth = 1;
....@@ -1592,7 +1767,7 @@
15921767 scrollpane.addMouseWheelListener(this); // Default not fast enough
15931768
15941769 /*JTabbedPane*/ scenePanel = new cGridBag();
1595
- scenePanel.preferredWidth = 5;
1770
+ scenePanel.preferredWidth = 6;
15961771
15971772 JTabbedPane tabbedPane = new JTabbedPane();
15981773 tabbedPane.add(scrollpane);
....@@ -1603,11 +1778,108 @@
16031778
16041779 AddOptions(optionsPanel); //, aConstraints);
16051780
1606
- tabbedPane.add(optionsPanel);
1607
-
16081781 tabbedPane.add(FSPane = new cFileSystemPane(this));
16091782
1783
+ tabbedPane.add(optionsPanel);
1784
+
16101785 scenePanel.add(tabbedPane);
1786
+
1787
+ cGridBag creditsPanel = new cGridBag().setVertical(true);
1788
+ creditsPanel.setName("Credits");
1789
+
1790
+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
1791
+ creditsPanel.add(ogaLabel);
1792
+
1793
+ cButton creditButton;
1794
+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
1795
+ creditButton.setToolTipText("https://opengameart.org");
1796
+
1797
+ creditButton.addMouseListener(new MouseAdapter()
1798
+ {
1799
+ public void mouseClicked(MouseEvent e)
1800
+ {
1801
+ try
1802
+ {
1803
+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
1804
+ } catch (Exception e1)
1805
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
1806
+ {
1807
+ e1.printStackTrace();
1808
+ }
1809
+ }
1810
+ });
1811
+
1812
+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
1813
+ creditsPanel.add(ogaLabel);
1814
+
1815
+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
1816
+ creditButton.setToolTipText("https://3delicious.net");
1817
+
1818
+ creditButton.addMouseListener(new MouseAdapter()
1819
+ {
1820
+ public void mouseClicked(MouseEvent e)
1821
+ {
1822
+ try
1823
+ {
1824
+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
1825
+ } catch (Exception e1)
1826
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
1827
+ {
1828
+ e1.printStackTrace();
1829
+ }
1830
+ }
1831
+ });
1832
+
1833
+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
1834
+ creditButton.setToolTipText("https://archive3d.net");
1835
+
1836
+ creditButton.addMouseListener(new MouseAdapter()
1837
+ {
1838
+ public void mouseClicked(MouseEvent e)
1839
+ {
1840
+ try
1841
+ {
1842
+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
1843
+ } catch (Exception e1)
1844
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
1845
+ {
1846
+ e1.printStackTrace();
1847
+ }
1848
+ }
1849
+ });
1850
+
1851
+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
1852
+ creditButton.setToolTipText("https://turbosquid.com");
1853
+
1854
+ creditButton.addMouseListener(new MouseAdapter()
1855
+ {
1856
+ public void mouseClicked(MouseEvent e)
1857
+ {
1858
+ try
1859
+ {
1860
+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
1861
+ } catch (Exception e1)
1862
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
1863
+ {
1864
+ e1.printStackTrace();
1865
+ }
1866
+ }
1867
+ });
1868
+
1869
+ for (int i=6; --i>=0;)
1870
+ {
1871
+ creditsPanel.add(new cGridBag());
1872
+ }
1873
+
1874
+ tabbedPane.add(creditsPanel);
1875
+ tabbedPane.setToolTipTextAt(3, "Credits");
1876
+
1877
+ if (Globals.ADVANCED)
1878
+ {
1879
+ objectPanel.add(infoPanel);
1880
+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
1881
+ objectPanel.setToolTipTextAt(4, "Information");
1882
+ }
16111883
16121884 /*
16131885 cTree jTree = new cTree(null);
....@@ -1629,13 +1901,13 @@
16291901 jtp.add(tree);
16301902 */
16311903
1632
- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1633
- bigPanel.setContinuousLayout(true);
1634
- bigPanel.setOneTouchExpandable(true);
1635
- bigPanel.setDividerLocation(0.8);
1636
- bigPanel.setDividerSize(15);
1637
- bigPanel.setResizeWeight(0.15);
1638
- bigPanel.setName("Scene");
1904
+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1905
+// bigPanel.setContinuousLayout(true);
1906
+// bigPanel.setOneTouchExpandable(true);
1907
+// bigPanel.setDividerLocation(0.8);
1908
+// bigPanel.setDividerSize(15);
1909
+// bigPanel.setResizeWeight(0.15);
1910
+// bigPanel.setName("Scene");
16391911
16401912 //bigPanel.setLayout(new BorderLayout());
16411913 //bigPanel.setSize(new Dimension(10,10));
....@@ -1679,6 +1951,23 @@
16791951 // aConstraints.gridheight = 1;
16801952
16811953 framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1954
+
1955
+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1956
+ new java.beans.PropertyChangeListener()
1957
+ {
1958
+ public void propertyChange(java.beans.PropertyChangeEvent pce)
1959
+ {
1960
+ if ((Integer)pce.getOldValue() == 1)
1961
+ {
1962
+ if (radio.layout != expandedLayout)
1963
+ {
1964
+ radio.layout = expandedLayout;
1965
+ radio.layout.doClick();
1966
+ }
1967
+ }
1968
+ }
1969
+ });
1970
+
16821971 framePanel.setContinuousLayout(false);
16831972 framePanel.setOneTouchExpandable(false);
16841973 //.setDividerLocation(0.8);
....@@ -1688,7 +1977,7 @@
16881977
16891978 frame.getContentPane().setLayout(new BorderLayout());
16901979 /**/
1691
- JTabbedPane worldPane = new JTabbedPane();
1980
+ //JTabbedPane worldPane = new JTabbedPane();
16921981 //worldPane.add(bigPanel);
16931982 //worldPane.add(worldPanel);
16941983 /**/
....@@ -1702,7 +1991,7 @@
17021991
17031992 cameraView.requestFocusInWindow();
17041993
1705
- gridPanel.setDividerLocation(1.0);
1994
+// gridPanel.setDividerLocation(1.0);
17061995
17071996 frame.validate();
17081997
....@@ -1733,28 +2022,484 @@
17332022 ctrlPanel.removeAll();
17342023 }
17352024
1736
- void SetupMaterial(cGridBag panel)
2025
+ void SetupMaterial(cGridBag materialpanel)
17372026 {
1738
- /*
2027
+ cGridBag presetpanel = new cGridBag().setVertical(true);
2028
+
2029
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
2030
+ skin.setToolTipText("Skin");
2031
+ skin.addMouseListener(new MouseAdapter()
2032
+ {
2033
+ public void mouseClicked(MouseEvent e)
2034
+ {
2035
+ Object3D object = Grafreed.materials.versionlist[0].get(0);
2036
+ cMaterial material = object.material;
2037
+
2038
+ // Skin
2039
+ colorField.setFloat(material.color);
2040
+ float saturation = material.modulation;
2041
+
2042
+ if (!cameraView.Skinshader)
2043
+ {
2044
+ saturation /= 1.5;
2045
+ }
2046
+
2047
+ saturationField.setFloat(saturation);
2048
+
2049
+ subsurfaceField.setFloat(material.subsurface);
2050
+ selfshadowField.setFloat(material.diffuseness);
2051
+ diffusenessField.setFloat(material.factor);
2052
+ shininessField.setFloat(material.shininess);
2053
+ shadowbiasField.setFloat(material.shadowbias);
2054
+ diffuseField.setFloat(material.diffuse);
2055
+ specularField.setFloat(material.specular);
2056
+
2057
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2058
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2059
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2060
+
2061
+ materialtouched = true;
2062
+ applySelf();
2063
+ }
2064
+ });
2065
+ presetpanel.add(skin);
2066
+
2067
+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
2068
+ lambert.setToolTipText("Diffuse");
2069
+ lambert.addMouseListener(new MouseAdapter()
2070
+ {
2071
+ public void mouseClicked(MouseEvent e)
2072
+ {
2073
+ Object3D object = Grafreed.materials.versionlist[2].get(0);
2074
+ cMaterial material = object.material;
2075
+
2076
+ diffusenessField.setFloat(material.factor);
2077
+ selfshadowField.setFloat(material.diffuseness);
2078
+
2079
+ materialtouched = true;
2080
+ applySelf();
2081
+ }
2082
+ });
2083
+ presetpanel.add(lambert);
2084
+
2085
+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
2086
+ diffuse2.setToolTipText("Diffuse2");
2087
+ diffuse2.addMouseListener(new MouseAdapter()
2088
+ {
2089
+ public void mouseClicked(MouseEvent e)
2090
+ {
2091
+ Object3D object = Grafreed.materials.versionlist[3].get(0);
2092
+ cMaterial material = object.material;
2093
+
2094
+ diffusenessField.setFloat(material.factor);
2095
+ selfshadowField.setFloat(material.diffuseness);
2096
+
2097
+ materialtouched = true;
2098
+ applySelf();
2099
+ }
2100
+ });
2101
+ presetpanel.add(diffuse2);
2102
+
2103
+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
2104
+ diffusemoon.setToolTipText("Moon");
2105
+ diffusemoon.addMouseListener(new MouseAdapter()
2106
+ {
2107
+ public void mouseClicked(MouseEvent e)
2108
+ {
2109
+ Object3D object = Grafreed.materials.versionlist[4].get(0);
2110
+ cMaterial material = object.material;
2111
+
2112
+ diffusenessField.setFloat(material.factor);
2113
+ selfshadowField.setFloat(material.diffuseness);
2114
+
2115
+ materialtouched = true;
2116
+ applySelf();
2117
+ }
2118
+ });
2119
+ presetpanel.add(diffusemoon);
2120
+
2121
+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
2122
+ diffusemoon2.setToolTipText("Moon2");
2123
+ diffusemoon2.addMouseListener(new MouseAdapter()
2124
+ {
2125
+ public void mouseClicked(MouseEvent e)
2126
+ {
2127
+ Object3D object = Grafreed.materials.versionlist[5].get(0);
2128
+ cMaterial material = object.material;
2129
+
2130
+ diffusenessField.setFloat(material.factor);
2131
+ selfshadowField.setFloat(material.diffuseness);
2132
+
2133
+ materialtouched = true;
2134
+ applySelf();
2135
+ }
2136
+ });
2137
+ presetpanel.add(diffusemoon2);
2138
+
2139
+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
2140
+ diffusemoon3.setToolTipText("Moon3");
2141
+ diffusemoon3.addMouseListener(new MouseAdapter()
2142
+ {
2143
+ public void mouseClicked(MouseEvent e)
2144
+ {
2145
+ Object3D object = Grafreed.materials.versionlist[6].get(0);
2146
+ cMaterial material = object.material;
2147
+
2148
+ diffusenessField.setFloat(material.factor);
2149
+ selfshadowField.setFloat(material.diffuseness);
2150
+
2151
+ materialtouched = true;
2152
+ applySelf();
2153
+ }
2154
+ });
2155
+ presetpanel.add(diffusemoon3);
2156
+
2157
+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
2158
+ diffusesheen.setToolTipText("Sheen");
2159
+ diffusesheen.addMouseListener(new MouseAdapter()
2160
+ {
2161
+ public void mouseClicked(MouseEvent e)
2162
+ {
2163
+ Object3D object = Grafreed.materials.versionlist[7].get(0);
2164
+ cMaterial material = object.material;
2165
+
2166
+ sheenField.setFloat(material.sheen);
2167
+
2168
+ materialtouched = true;
2169
+ applySelf();
2170
+ }
2171
+ });
2172
+ presetpanel.add(diffusesheen);
2173
+
2174
+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
2175
+ rough.setToolTipText("Rough metal");
2176
+ rough.addMouseListener(new MouseAdapter()
2177
+ {
2178
+ public void mouseClicked(MouseEvent e)
2179
+ {
2180
+ Object3D object = Grafreed.materials.versionlist[1].get(0);
2181
+ cMaterial material = object.material;
2182
+
2183
+ shininessField.setFloat(material.shininess);
2184
+ velvetField.setFloat(material.velvet);
2185
+
2186
+ materialtouched = true;
2187
+ applySelf();
2188
+ }
2189
+ });
2190
+ presetpanel.add(rough);
2191
+
2192
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
2193
+ rough2.setToolTipText("Medium metal");
2194
+ rough2.addMouseListener(new MouseAdapter()
2195
+ {
2196
+ public void mouseClicked(MouseEvent e)
2197
+ {
2198
+ Object3D object = Grafreed.materials.versionlist[13].get(0);
2199
+ cMaterial material = object.material;
2200
+
2201
+ shininessField.setFloat(material.shininess);
2202
+ lightareaField.setFloat(material.lightarea);
2203
+
2204
+ materialtouched = true;
2205
+ applySelf();
2206
+ }
2207
+ });
2208
+ presetpanel.add(rough2);
2209
+
2210
+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2211
+ shini0.setToolTipText("Shiny");
2212
+ shini0.addMouseListener(new MouseAdapter()
2213
+ {
2214
+ public void mouseClicked(MouseEvent e)
2215
+ {
2216
+ Object3D object = Grafreed.materials.versionlist[14].get(0);
2217
+ cMaterial material = object.material;
2218
+
2219
+ shininessField.setFloat(material.shininess);
2220
+ lightareaField.setFloat(material.lightarea);
2221
+
2222
+ materialtouched = true;
2223
+ applySelf();
2224
+ }
2225
+ });
2226
+ presetpanel.add(shini0);
2227
+
2228
+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2229
+ shini1.setToolTipText("Shiny2");
2230
+ shini1.addMouseListener(new MouseAdapter()
2231
+ {
2232
+ public void mouseClicked(MouseEvent e)
2233
+ {
2234
+ Object3D object = Grafreed.materials.versionlist[11].get(0);
2235
+ cMaterial material = object.material;
2236
+
2237
+ shininessField.setFloat(material.shininess);
2238
+ lightareaField.setFloat(material.lightarea);
2239
+
2240
+ materialtouched = true;
2241
+ applySelf();
2242
+ }
2243
+ });
2244
+ presetpanel.add(shini1);
2245
+
2246
+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2247
+ shini2.setToolTipText("Shiny3");
2248
+ shini2.addMouseListener(new MouseAdapter()
2249
+ {
2250
+ public void mouseClicked(MouseEvent e)
2251
+ {
2252
+ Object3D object = Grafreed.materials.versionlist[12].get(0);
2253
+ cMaterial material = object.material;
2254
+
2255
+ shininessField.setFloat(material.shininess);
2256
+ lightareaField.setFloat(material.lightarea);
2257
+
2258
+ materialtouched = true;
2259
+ applySelf();
2260
+ }
2261
+ });
2262
+ presetpanel.add(shini2);
2263
+
2264
+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2265
+ aniso.setToolTipText("AnisoU");
2266
+ aniso.addMouseListener(new MouseAdapter()
2267
+ {
2268
+ public void mouseClicked(MouseEvent e)
2269
+ {
2270
+ Object3D object = Grafreed.materials.versionlist[8].get(0);
2271
+ cMaterial material = object.material;
2272
+
2273
+ anisoField.setFloat(material.aniso);
2274
+ anisoVField.setFloat(material.anisoV);
2275
+
2276
+ materialtouched = true;
2277
+ applySelf();
2278
+ }
2279
+ });
2280
+ presetpanel.add(aniso);
2281
+
2282
+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2283
+ aniso2.setToolTipText("AnisoV");
2284
+ aniso2.addMouseListener(new MouseAdapter()
2285
+ {
2286
+ public void mouseClicked(MouseEvent e)
2287
+ {
2288
+ Object3D object = Grafreed.materials.versionlist[9].get(0);
2289
+ cMaterial material = object.material;
2290
+
2291
+ anisoField.setFloat(material.aniso);
2292
+ anisoVField.setFloat(material.anisoV);
2293
+
2294
+ materialtouched = true;
2295
+ applySelf();
2296
+ }
2297
+ });
2298
+ presetpanel.add(aniso2);
2299
+
2300
+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2301
+ aniso3.setToolTipText("AnisoUV");
2302
+ aniso3.addMouseListener(new MouseAdapter()
2303
+ {
2304
+ public void mouseClicked(MouseEvent e)
2305
+ {
2306
+ Object3D object = Grafreed.materials.versionlist[10].get(0);
2307
+ cMaterial material = object.material;
2308
+
2309
+ anisoField.setFloat(material.aniso);
2310
+ anisoVField.setFloat(material.anisoV);
2311
+
2312
+ materialtouched = true;
2313
+ applySelf();
2314
+ }
2315
+ });
2316
+ presetpanel.add(aniso3);
2317
+
2318
+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2319
+ velvet0.setToolTipText("Velvet");
2320
+ velvet0.addMouseListener(new MouseAdapter()
2321
+ {
2322
+ public void mouseClicked(MouseEvent e)
2323
+ {
2324
+ Object3D object = Grafreed.materials.versionlist[15].get(0);
2325
+ cMaterial material = object.material;
2326
+
2327
+ diffusenessField.setFloat(material.factor);
2328
+ selfshadowField.setFloat(material.diffuseness);
2329
+ sheenField.setFloat(material.sheen);
2330
+ shininessField.setFloat(material.shininess);
2331
+ velvetField.setFloat(material.velvet);
2332
+ shiftField.setFloat(material.shift);
2333
+
2334
+ materialtouched = true;
2335
+ applySelf();
2336
+ }
2337
+ });
2338
+ presetpanel.add(velvet0);
2339
+
2340
+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2341
+ bump0.setToolTipText("Bump texture");
2342
+ bump0.addMouseListener(new MouseAdapter()
2343
+ {
2344
+ public void mouseClicked(MouseEvent e)
2345
+ {
2346
+ Object3D object = Grafreed.materials.versionlist[16].get(0);
2347
+ cMaterial material = object.material;
2348
+
2349
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2350
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2351
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2352
+
2353
+ materialtouched = true;
2354
+ applySelf();
2355
+ }
2356
+ });
2357
+ presetpanel.add(bump0);
2358
+
2359
+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2360
+ borderShader.setToolTipText("Border fade");
2361
+ borderShader.addMouseListener(new MouseAdapter()
2362
+ {
2363
+ public void mouseClicked(MouseEvent e)
2364
+ {
2365
+ borderfadeField.setFloat(0.4);
2366
+ opacityField.setFloat(0.75);
2367
+
2368
+ materialtouched = true;
2369
+ applySelf();
2370
+ }
2371
+ });
2372
+ presetpanel.add(borderShader);
2373
+
2374
+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2375
+ halo.setToolTipText("Halo");
2376
+ halo.addMouseListener(new MouseAdapter()
2377
+ {
2378
+ public void mouseClicked(MouseEvent e)
2379
+ {
2380
+ Object3D object = Grafreed.materials.versionlist[17].get(0);
2381
+ cMaterial material = object.material;
2382
+
2383
+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2384
+
2385
+ materialtouched = true;
2386
+ applySelf();
2387
+ }
2388
+ });
2389
+ presetpanel.add(halo);
2390
+
2391
+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2392
+ candle.setToolTipText("Candle");
2393
+ candle.addMouseListener(new MouseAdapter()
2394
+ {
2395
+ public void mouseClicked(MouseEvent e)
2396
+ {
2397
+ Object3D object = Grafreed.materials.versionlist[18].get(0);
2398
+ cMaterial material = object.material;
2399
+
2400
+ subsurfaceField.setFloat(material.subsurface);
2401
+ shadowbiasField.setFloat(material.shadowbias);
2402
+ ambientField.setFloat(material.ambient);
2403
+ specularField.setFloat(material.specular);
2404
+ lightareaField.setFloat(material.lightarea);
2405
+ shininessField.setFloat(material.shininess);
2406
+
2407
+ materialtouched = true;
2408
+ applySelf();
2409
+ }
2410
+ });
2411
+ presetpanel.add(candle);
2412
+
2413
+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2414
+ shadowShader.setToolTipText("Shadow");
2415
+ shadowShader.addMouseListener(new MouseAdapter()
2416
+ {
2417
+ public void mouseClicked(MouseEvent e)
2418
+ {
2419
+ diffuseField.setFloat(0.001);
2420
+ ambientField.setFloat(0.001);
2421
+ cameraField.setFloat(0.001);
2422
+ specularField.setFloat(0.001);
2423
+ fakedepthField.setFloat(0.001);
2424
+ opacityField.setFloat(0.6);
2425
+
2426
+ materialtouched = true;
2427
+ applySelf();
2428
+ }
2429
+ });
2430
+ presetpanel.add(shadowShader);
2431
+
2432
+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
2433
+ para0.setToolTipText("No parallax");
2434
+ para0.addMouseListener(new MouseAdapter()
2435
+ {
2436
+ public void mouseClicked(MouseEvent e)
2437
+ {
2438
+ parallaxField.setFloat(0.125);
2439
+
2440
+ materialtouched = true;
2441
+ applySelf();
2442
+ }
2443
+ });
2444
+ presetpanel.add(para0);
2445
+
2446
+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
2447
+ para1.setToolTipText("With parallax");
2448
+ para1.addMouseListener(new MouseAdapter()
2449
+ {
2450
+ public void mouseClicked(MouseEvent e)
2451
+ {
2452
+ parallaxField.setFloat(0.13);
2453
+
2454
+ materialtouched = true;
2455
+ applySelf();
2456
+ }
2457
+ });
2458
+ presetpanel.add(para1);
2459
+
2460
+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
2461
+ para2.setToolTipText("Reset parallax");
2462
+ para2.addMouseListener(new MouseAdapter()
2463
+ {
2464
+ public void mouseClicked(MouseEvent e)
2465
+ {
2466
+ parallaxField.setFloat(0.14);
2467
+
2468
+ materialtouched = true;
2469
+ applySelf();
2470
+ }
2471
+ });
2472
+ presetpanel.add(para2);
2473
+
2474
+ cGridBag panel = new cGridBag().setVertical(true);
2475
+
2476
+ presetpanel.preferredWidth = 1;
2477
+
2478
+ materialpanel.add(presetpanel);
2479
+ materialpanel.add(panel);
2480
+
2481
+ panel.preferredWidth = 8;
2482
+
2483
+ /*
17392484 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
17402485 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1741
- */
2486
+ */
17422487
17432488 cGridBag editBar = new cGridBag().setVertical(false);
17442489
1745
- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
2490
+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
17462491 createMaterialButton.setToolTipText("Create material");
17472492
17482493 /*
17492494 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
17502495 */
17512496
1752
- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
2497
+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
17532498 clearMaterialButton.setToolTipText("Clear material");
17542499
17552500 if (Globals.ADVANCED)
17562501 {
1757
- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
2502
+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
17582503 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
17592504 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
17602505 }
....@@ -1775,7 +2520,20 @@
17752520
17762521 cGridBag huepanel = new cGridBag();
17772522 cGridBag huelabel = new cGridBag();
1778
- huelabel.add(GetLabel("icons/hue.png", false));
2523
+ cLabel hue = GetLabel("icons/hue.png", false);
2524
+ hue.fit = true;
2525
+
2526
+ hue.addMouseListener(new MouseAdapter()
2527
+ {
2528
+ public void mousePressed(MouseEvent e)
2529
+ {
2530
+ int x = e.getX();
2531
+
2532
+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2533
+ }
2534
+ });
2535
+
2536
+ huelabel.add(hue);
17792537 huelabel.preferredWidth = 20;
17802538 huepanel.add(new cGridBag()); // Label
17812539 huepanel.add(huelabel); // Field/slider
....@@ -1796,7 +2554,7 @@
17962554 cGridBag modulation = new cGridBag();
17972555 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
17982556 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1799
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2557
+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
18002558 colorSection.add(modulation);
18012559
18022560 cGridBag opacity = new cGridBag();
....@@ -1958,6 +2716,12 @@
19582716 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
19592717 colorSection.add(backlit);
19602718
2719
+ cGridBag parallax = new cGridBag();
2720
+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
2721
+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2722
+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
2723
+ colorSection.add(parallax);
2724
+
19612725 //panel.add(new JSeparator());
19622726
19632727 //panel.add(globalSection);
....@@ -2989,7 +3753,7 @@
29893753
29903754 freezematerial = true;
29913755 colorField.setFloat(mat.color);
2992
- modulationField.setFloat(mat.modulation);
3756
+ saturationField.setFloat(mat.modulation);
29933757 metalnessField.setFloat(mat.metalness);
29943758 diffuseField.setFloat(mat.diffuse);
29953759 specularField.setFloat(mat.specular);
....@@ -3009,6 +3773,7 @@
30093773 shadowField.setFloat(mat.shadow);
30103774 textureField.setFloat(mat.texture);
30113775 opacityField.setFloat(mat.opacity);
3776
+ parallaxField.setFloat(mat.parallax + 0.125f);
30123777 fakedepthField.setFloat(mat.fakedepth);
30133778 shadowbiasField.setFloat(mat.shadowbias);
30143779 bumpField.setInteger(1); // dec 2013
....@@ -3051,32 +3816,8 @@
30513816
30523817 if (multiplyToggle != null)
30533818 multiplyToggle.setSelected(mat.multiply);
3054
-
3055
- assert (object.projectedVertices != null);
3056
-
3057
- if (object.projectedVertices.length <= 2)
3058
- {
3059
- // Side effect...
3060
- Object3D.cVector2[] keep = object.projectedVertices;
3061
- object.projectedVertices = new Object3D.cVector2[3];
3062
- for (int i = 0; i < 3; i++)
3063
- {
3064
- if (i < keep.length)
3065
- {
3066
- object.projectedVertices[i] = keep[i];
3067
- } else
3068
- {
3069
- object.projectedVertices[i] = new Object3D.cVector2();
3070
- }
3071
- /*
3072
- if(keep.length == 0)
3073
- object.projectedVertices[0] = new Object3D.cVector2();
3074
- else
3075
- object.projectedVertices[0] = keep[0];
3076
- object.projectedVertices[1] = new Object3D.cVector2();
3077
- */
3078
- }
3079
- }
3819
+
3820
+ AllocProjectedVertices(object);
30803821
30813822 SetMaterial(mat, object.projectedVertices);
30823823 }
....@@ -3196,6 +3937,17 @@
31963937 public void itemStateChanged(ItemEvent event)
31973938 {
31983939 // System.out.println("Propagate = " + propagate);
3940
+ if (event.getSource() == pinButton)
3941
+ {
3942
+ copy.pinned ^= true;
3943
+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3944
+ {
3945
+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
3946
+ copy.CloseUI();
3947
+ //copy.editWindow.refreshContents();
3948
+ }
3949
+ }
3950
+ else
31993951 if (event.getSource() == propagateToggle)
32003952 {
32013953 propagate ^= true;
....@@ -3300,6 +4052,7 @@
33004052 } else if (event.getSource() == liveCB)
33014053 {
33024054 copy.live ^= true;
4055
+ objEditor.refreshContents(true); // To show item colors
33034056 return;
33044057 } else if (event.getSource() == selectableCB)
33054058 {
....@@ -3309,7 +4062,7 @@
33094062 {
33104063 copy.hide ^= true;
33114064 copy.Touch(); // display list issue
3312
- objEditor.refreshContents();
4065
+ objEditor.refreshContents(true); // To show item colors
33134066 return;
33144067 } else if (event.getSource() == link2masterCB)
33154068 {
....@@ -3374,7 +4127,7 @@
33744127 //System.out.println("ObjEditor " + event);
33754128 applySelf0(true);
33764129 //parent.applySelf();
3377
- objEditor.refreshContents();
4130
+ // conflicts with requestFocus objEditor.refreshContents();
33784131 } else if (source == resetButton)
33794132 {
33804133 CameraPane.fullreset = true;
....@@ -3554,17 +4307,25 @@
35544307
35554308 void New()
35564309 {
3557
- while (copy.Size() > 1)
4310
+ while (copy.Size() > 0)
35584311 {
3559
- copy.remove(1);
4312
+ copy.remove(0);
35604313 }
35614314
4315
+ copy.selection.clear();
4316
+
4317
+ if (copy == Grafreed.grafreed.universe)
4318
+ {
4319
+ CreateCameras();
4320
+ cameraView.SetCamera(GetCamera(copy, 0));
4321
+ }
35624322 ResetModel();
35634323 objEditor.refreshContents();
35644324 }
35654325
35664326 static public byte[] Compress(Object3D o)
35674327 {
4328
+ // Slower to actually compress.
35684329 try
35694330 {
35704331 ByteArrayOutputStream baos = new ByteArrayOutputStream();
....@@ -3666,6 +4427,7 @@
36664427 {
36674428 //Save(true);
36684429 Replace();
4430
+ SetVersionStates();
36694431 }
36704432
36714433 private boolean Equal(byte[] compress, byte[] name)
....@@ -3684,31 +4446,54 @@
36844446 return true;
36854447 }
36864448
3687
- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4449
+ void DeleteVersion()
4450
+ {
4451
+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
4452
+ {
4453
+ copy.versionlist[i] = copy.versionlist[i+1];
4454
+ }
4455
+
4456
+ if (copy.versionlist[copy.versionindex] == null)
4457
+ copy.versionindex -= 1;
4458
+
4459
+ if (copy.versionindex != -1)
4460
+ CopyChanged();
4461
+
4462
+ SetVersionStates();
4463
+ }
36884464
36894465 public boolean Save(boolean user)
36904466 {
36914467 System.err.println("Save");
4468
+ Replace();
36924469
3693
- cRadio tab = GetCurrentTab();
4470
+ if (copy.versionlist == null)
4471
+ {
4472
+ copy.versionlist = new Object3D[100];
4473
+ copy.versionindex = -1;
4474
+ }
36944475
3695
- byte[] compress = CompressCopy(); // Saved version. No need for "Replace".
4476
+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
36964477
36974478 boolean thesame = false;
36984479
3699
- // Quick heuristic using length. Works only when stream is compressed.
3700
- if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3701
- {
3702
- thesame = true;
3703
- }
4480
+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
4481
+// {
4482
+// thesame = true;
4483
+// }
37044484
37054485 //EditorFrame.m_MainFrame.requestFocusInWindow();
37064486 if (!thesame)
37074487 {
4488
+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
4489
+ {
4490
+ copy.versionlist[i] = copy.versionlist[i-1];
4491
+ }
4492
+
37084493 //tab.user[tab.versionindex] = user;
37094494 //boolean increment = true; // tab.graphs[tab.versionindex] == null;
37104495
3711
- copy.versions[++copy.versionindex] = compress;
4496
+ copy.versionlist[++copy.versionindex] = compress;
37124497
37134498 // if (increment)
37144499 // tab.versionindex++;
....@@ -3718,13 +4503,13 @@
37184503
37194504 //assert(hashtable.isEmpty());
37204505
3721
- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3722
- {
3723
- //tab.user[i] = false;
3724
- copy.versions[i] = null;
3725
- }
4506
+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
4507
+// {
4508
+// //tab.user[i] = false;
4509
+// copy.versionlist[i] = null;
4510
+// }
37264511
3727
- SetUndoStates();
4512
+ SetVersionStates();
37284513
37294514 // test save
37304515 if (false)
....@@ -3747,15 +4532,49 @@
37474532
37484533 return !thesame;
37494534 }
3750
-
3751
- void CopyChanged(Object3D obj)
4535
+
4536
+ boolean flashIt = true;
4537
+
4538
+ void RefreshSelection()
37524539 {
3753
- SetUndoStates();
4540
+ Object3D selection = new Object3D();
4541
+
4542
+ for (int i = 0; i < copy.selection.size(); i++)
4543
+ {
4544
+ Object3D elem = copy.selection.elementAt(i);
4545
+
4546
+ Object3D obj = copy.GetObject(elem.GetUUID());
4547
+
4548
+ if (obj == null)
4549
+ {
4550
+ copy.selection.remove(i--);
4551
+ }
4552
+ else
4553
+ {
4554
+ selection.add(obj);
4555
+ copy.selection.setElementAt(obj, i);
4556
+ }
4557
+ }
4558
+
4559
+ flashIt = false;
4560
+ GetTree().clearSelection();
4561
+ for (int i = 0; i < selection.size(); i++)
4562
+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
4563
+ flashIt = true;
4564
+
4565
+ //refreshContents(false);
4566
+ }
4567
+
4568
+ void CopyChanged()
4569
+ {
4570
+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4571
+
4572
+ SetVersionStates();
37544573
37554574 boolean temp = CameraPane.SWITCH;
37564575 CameraPane.SWITCH = false;
37574576
3758
- copy.ExtractBigData(versiontable);
4577
+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
37594578
37604579 copy.clear();
37614580
....@@ -3767,10 +4586,11 @@
37674586 copy.add(obj.get(i));
37684587 }
37694588
3770
- copy.RestoreBigData(versiontable);
4589
+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
37714590
37724591 CameraPane.SWITCH = temp;
37734592
4593
+ RefreshSelection();
37744594 //assert(hashtable.isEmpty());
37754595
37764596 copy.Touch();
....@@ -3791,13 +4611,15 @@
37914611 }
37924612 }
37934613
3794
- refreshContents();
4614
+ refreshContents(true);
37954615 }
37964616
3797
- cButton undoButton;
4617
+ cButton previousVersionButton;
37984618 cButton restoreButton;
37994619 cButton replaceButton;
3800
- cButton redoButton;
4620
+ cButton nextVersionButton;
4621
+ cButton saveVersionButton;
4622
+ cButton deleteVersionButton;
38014623
38024624 boolean muteSlider;
38034625
....@@ -3805,39 +4627,64 @@
38054627 {
38064628 int count = 0;
38074629
3808
- for (int i = copy.versions.length; --i >= 0;)
4630
+ for (int i = copy.versionlist.length; --i >= 0;)
38094631 {
3810
- if (copy.versions[i] != null)
4632
+ if (copy.versionlist[i] != null)
38114633 count++;
38124634 }
38134635
38144636 return count;
38154637 }
38164638
3817
- void SetUndoStates()
4639
+ public cGridBag versionSliderPane;
4640
+
4641
+ void SetVersionStates()
38184642 {
3819
- cRadio tab = GetCurrentTab();
4643
+ //if (true)
4644
+ // return;
4645
+
4646
+ //cRadio tab = GetCurrentTab();
38204647
3821
- restoreButton.setEnabled(copy.versionindex != -1);
3822
- replaceButton.setEnabled(copy.versionindex != -1);
3823
-
3824
- undoButton.setEnabled(copy.versionindex > 0);
3825
- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3826
-
3827
- muteSlider = true;
3828
- versionSlider.setMaximum(VersionCount() - 1);
3829
- versionSlider.setInteger(copy.versionindex);
3830
- muteSlider = false;
4648
+ if (copy.versionindex == -2)
4649
+ {
4650
+ saveVersionButton.setEnabled(false);
4651
+ restoreButton.setEnabled(false);
4652
+ replaceButton.setEnabled(false);
4653
+ previousVersionButton.setEnabled(false);
4654
+ nextVersionButton.setEnabled(false);
4655
+ deleteVersionButton.setEnabled(false);
4656
+ versionSliderPane.setVisible(false);
4657
+ }
4658
+ else
4659
+ {
4660
+ restoreButton.setEnabled(copy.versionindex != -1);
4661
+ replaceButton.setEnabled(copy.versionindex != -1);
4662
+
4663
+ previousVersionButton.setEnabled(copy.versionindex > 0);
4664
+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4665
+
4666
+ deleteVersionButton.setEnabled(copy.versionindex != -1);
4667
+ //copy.versionlist[copy.versionindex + 1] != null);
4668
+
4669
+ muteSlider = true;
4670
+ versionSlider.setMinimum(0);
4671
+ versionSlider.setMaximum(VersionCount() - 1);
4672
+ versionSlider.setInteger(copy.versionindex);
4673
+ versionSlider.setEnabled(copy.versionindex != -1);
4674
+ muteSlider = false;
4675
+
4676
+ versionSliderPane.setVisible(true);
4677
+ }
38314678 }
38324679
3833
- public boolean Undo()
4680
+ public boolean PreviousVersion()
38344681 {
38354682 // Option?
38364683 Replace();
38374684
38384685 System.err.println("Undo");
38394686
3840
- cRadio tab = GetCurrentTab();
4687
+ //cRadio tab = GetCurrentTab();
38414688
38424689 if (copy.versionindex == 0)
38434690 {
....@@ -3860,7 +4707,7 @@
38604707
38614708 copy.versionindex -= 1;
38624709
3863
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4710
+ CopyChanged();
38644711
38654712 return true;
38664713 }
....@@ -3869,44 +4716,45 @@
38694716 {
38704717 System.err.println("Restore");
38714718
3872
- cRadio tab = GetCurrentTab();
4719
+ //cRadio tab = GetCurrentTab();
38734720
3874
- if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
4721
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
38754722 {
38764723 java.awt.Toolkit.getDefaultToolkit().beep();
38774724 return false;
38784725 }
38794726
3880
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4727
+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4728
+ CopyChanged();
38814729
38824730 return true;
38834731 }
38844732
38854733 public boolean Replace()
38864734 {
3887
- System.err.println("Replace");
4735
+ //System.err.println("Replace");
38884736
3889
- cRadio tab = GetCurrentTab();
4737
+ //cRadio tab = GetCurrentTab();
38904738
3891
- if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
4739
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
38924740 {
38934741 // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
38944742 return false;
38954743 }
38964744
3897
- copy.versions[copy.versionindex] = CompressCopy();
4745
+ copy.versionlist[copy.versionindex] = Duplicate(copy);
38984746
38994747 return true;
39004748 }
39014749
3902
- public void Redo()
4750
+ public void NextVersion()
39034751 {
39044752 // Option?
39054753 Replace();
39064754
3907
- cRadio tab = GetCurrentTab();
4755
+ //cRadio tab = GetCurrentTab();
39084756
3909
- if (copy.versions[copy.versionindex + 1] == null)
4757
+ if (copy.versionlist[copy.versionindex + 1] == null)
39104758 {
39114759 java.awt.Toolkit.getDefaultToolkit().beep();
39124760 return;
....@@ -3914,7 +4762,7 @@
39144762
39154763 copy.versionindex += 1;
39164764
3917
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4765
+ CopyChanged();
39184766
39194767 //if (!tab.user[tab.versionindex])
39204768 // tab.graphs[tab.versionindex] = null;
....@@ -4111,6 +4959,12 @@
41114959 // else
41124960 // applySelf(true);
41134961 // }
4962
+
4963
+ boolean Equal(double a, double b)
4964
+ {
4965
+ return Math.abs(a - b) < 0.001;
4966
+ }
4967
+
41144968 void applySelf0(boolean name)
41154969 {
41164970 if (name)
....@@ -4128,7 +4982,7 @@
41284982 //copy.material = new cMaterial(copy.GetMaterial());
41294983
41304984 current.color = (float) colorField.getFloat();
4131
- current.modulation = (float) modulationField.getFloat();
4985
+ current.modulation = (float) saturationField.getFloat();
41324986 current.metalness = (float) metalnessField.getFloat();
41334987 current.diffuse = (float) diffuseField.getFloat();
41344988 current.specular = (float) specularField.getFloat();
....@@ -4148,6 +5002,7 @@
41485002 current.shadow = (float) shadowField.getFloat();
41495003 current.texture = (float) textureField.getFloat();
41505004 current.opacity = (float) opacityField.getFloat();
5005
+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
41515006 current.fakedepth = (float) fakedepthField.getFloat();
41525007 current.shadowbias = (float) shadowbiasField.getFloat();
41535008
....@@ -4160,29 +5015,54 @@
41605015 {
41615016 cMaterial mat = copy.material;
41625017
4163
- colorField.SetToolTipValue((mat.color));
4164
- modulationField.SetToolTipValue((mat.modulation));
4165
- metalnessField.SetToolTipValue((mat.metalness));
4166
- diffuseField.SetToolTipValue((mat.diffuse));
4167
- specularField.SetToolTipValue((mat.specular));
4168
- shininessField.SetToolTipValue((mat.shininess));
4169
- shiftField.SetToolTipValue((mat.shift));
4170
- ambientField.SetToolTipValue((mat.ambient));
4171
- lightareaField.SetToolTipValue((mat.lightarea));
4172
- diffusenessField.SetToolTipValue((mat.factor));
4173
- velvetField.SetToolTipValue((mat.velvet));
4174
- sheenField.SetToolTipValue((mat.sheen));
4175
- subsurfaceField.SetToolTipValue((mat.subsurface));
4176
- backlitField.SetToolTipValue((mat.bump));
4177
- anisoField.SetToolTipValue((mat.aniso));
4178
- anisoVField.SetToolTipValue((mat.anisoV));
4179
- cameraField.SetToolTipValue((mat.cameralight));
4180
- selfshadowField.SetToolTipValue((mat.diffuseness));
4181
- shadowField.SetToolTipValue((mat.shadow));
4182
- textureField.SetToolTipValue((mat.texture));
4183
- opacityField.SetToolTipValue((mat.opacity));
4184
- fakedepthField.SetToolTipValue((mat.fakedepth));
4185
- shadowbiasField.SetToolTipValue((mat.shadowbias));
5018
+ if (!Equal(colorField.getFloat(), mat.color))
5019
+ colorField.SetToolTipValue((mat.color));
5020
+ if (!Equal(saturationField.getFloat(), mat.modulation))
5021
+ saturationField.SetToolTipValue((mat.modulation));
5022
+ if (!Equal(metalnessField.getFloat(), mat.metalness))
5023
+ metalnessField.SetToolTipValue((mat.metalness));
5024
+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
5025
+ diffuseField.SetToolTipValue((mat.diffuse));
5026
+ if (!Equal(specularField.getFloat(), mat.specular))
5027
+ specularField.SetToolTipValue((mat.specular));
5028
+ if (!Equal(shininessField.getFloat(), mat.shininess))
5029
+ shininessField.SetToolTipValue((mat.shininess));
5030
+ if (!Equal(shiftField.getFloat(), mat.shift))
5031
+ shiftField.SetToolTipValue((mat.shift));
5032
+ if (!Equal(ambientField.getFloat(), mat.ambient))
5033
+ ambientField.SetToolTipValue((mat.ambient));
5034
+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
5035
+ lightareaField.SetToolTipValue((mat.lightarea));
5036
+ if (!Equal(diffusenessField.getFloat(), mat.factor))
5037
+ diffusenessField.SetToolTipValue((mat.factor));
5038
+ if (!Equal(velvetField.getFloat(), mat.velvet))
5039
+ velvetField.SetToolTipValue((mat.velvet));
5040
+ if (!Equal(sheenField.getFloat(), mat.sheen))
5041
+ sheenField.SetToolTipValue((mat.sheen));
5042
+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
5043
+ subsurfaceField.SetToolTipValue((mat.subsurface));
5044
+ if (!Equal(backlitField.getFloat(), mat.bump))
5045
+ backlitField.SetToolTipValue((mat.bump));
5046
+ if (!Equal(anisoField.getFloat(), mat.aniso))
5047
+ anisoField.SetToolTipValue((mat.aniso));
5048
+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
5049
+ anisoVField.SetToolTipValue((mat.anisoV));
5050
+ if (!Equal(cameraField.getFloat(), mat.cameralight))
5051
+ cameraField.SetToolTipValue((mat.cameralight));
5052
+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
5053
+ selfshadowField.SetToolTipValue((mat.diffuseness));
5054
+ if (!Equal(shadowField.getFloat(), mat.shadow))
5055
+ shadowField.SetToolTipValue((mat.shadow));
5056
+ if (!Equal(textureField.getFloat(), mat.texture))
5057
+ textureField.SetToolTipValue((mat.texture));
5058
+ if (!Equal(opacityField.getFloat(), mat.opacity))
5059
+ opacityField.SetToolTipValue((mat.opacity));
5060
+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
5061
+ parallaxField.SetToolTipValue((mat.parallax));
5062
+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
5063
+ fakedepthField.SetToolTipValue((mat.fakedepth));
5064
+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
5065
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
41865066 }
41875067
41885068 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
....@@ -4217,17 +5097,20 @@
42175097
42185098 public void stateChanged(ChangeEvent e)
42195099 {
4220
- // assert(false);
5100
+ // assert(false);
42215101 if (e.getSource() == versionSlider)
42225102 {
42235103 if (muteSlider)
42245104 return;
42255105
5106
+ Replace();
5107
+
42265108 int version = versionSlider.getInteger();
42275109
4228
- if (copy.versions[version] != null)
5110
+ if (version != -1 && copy.versionlist[version] != null)
42295111 {
4230
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
5112
+ copy.versionindex = version;
5113
+ CopyChanged();
42315114 }
42325115
42335116 return;
....@@ -4267,6 +5150,12 @@
42675150 {
42685151 //System.out.println("stateChanged = " + this);
42695152 materialtouched = true;
5153
+
5154
+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
5155
+ {
5156
+ saturationField.setFloat(1);
5157
+ }
5158
+
42705159 applySelf();
42715160 //System.out.println("this = " + this);
42725161 //System.out.println("PARENT = " + parent);
....@@ -4566,6 +5455,7 @@
45665455 {
45675456 if (GetTree() != null)
45685457 {
5458
+ GetTree().revalidate();
45695459 GetTree().repaint();
45705460 }
45715461
....@@ -4574,6 +5464,11 @@
45745464 ctrlPanel.validate(); // ? new
45755465 ctrlPanel.repaint();
45765466 }
5467
+
5468
+ if (previousVersionButton != null && copy.versionlist != null)
5469
+ SetVersionStates();
5470
+
5471
+ cameraView.requestFocusInWindow();
45775472 }
45785473
45795474 static TweenManager tweenManager = new TweenManager();
....@@ -4605,7 +5500,7 @@
46055500 // group = (Composite) group.get(0);
46065501 // }
46075502
4608
- System.out.println("makeSomething of " + thing);
5503
+ //System.out.println("makeSomething of " + thing);
46095504
46105505 /*
46115506 if (deselect && jList != null)
....@@ -4957,13 +5852,17 @@
49575852 c.addChild(csg);
49585853 }
49595854
4960
- copy.versions = readobj.versions;
5855
+ copy.versionlist = readobj.versionlist;
49615856 copy.versionindex = readobj.versionindex;
5857
+ copy.versiontable = readobj.versiontable;
49625858
4963
- if (copy.versions == null)
5859
+ if (copy.versionlist == null)
49645860 {
4965
- copy.versions = new byte[100][];
5861
+ // Backward compatibility
5862
+ copy.versionlist = new Object3D[100];
49665863 copy.versionindex = -1;
5864
+
5865
+ //Save(true);
49675866 }
49685867
49695868 //? SetUndoStates();
....@@ -4978,7 +5877,7 @@
49785877 {
49795878 if (Grafreed.standAlone)
49805879 {
4981
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5880
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
49825881 browser.show();
49835882 String filename = browser.getFile();
49845883 if (filename != null && filename.length() > 0)
....@@ -5055,6 +5954,8 @@
50555954
50565955 void save()
50575956 {
5957
+ Replace();
5958
+
50585959 if (lastname == null)
50595960 {
50605961 return;
....@@ -5297,6 +6198,7 @@
52976198 ButtonGroup buttonGroup;
52986199
52996200 cGridBag toolboxPanel;
6201
+ cGridBag skyboxPanel;
53006202 cGridBag materialPanel;
53016203 cGridBag ctrlPanel;
53026204
....@@ -5308,6 +6210,7 @@
53086210 boolean materialFlushed;
53096211 Object3D latestObject;
53106212
6213
+ cGridBag transformPanel;
53116214 cGridBag XYZPanel;
53126215
53136216 JSplitPane gridPanel;
....@@ -5370,7 +6273,7 @@
53706273 JLabel colorLabel;
53716274 cNumberSlider colorField;
53726275 JLabel modulationLabel;
5373
- cNumberSlider modulationField;
6276
+ cNumberSlider saturationField;
53746277 JLabel metalnessLabel;
53756278 cNumberSlider metalnessField;
53766279 JLabel diffuseLabel;
....@@ -5401,6 +6304,7 @@
54016304 cNumberSlider anisoField;
54026305 JLabel anisoVLabel;
54036306 cNumberSlider anisoVField;
6307
+
54046308 JLabel cameraLabel;
54056309 cNumberSlider cameraField;
54066310 JLabel selfshadowLabel;
....@@ -5411,10 +6315,13 @@
54116315 cNumberSlider textureField;
54126316 JLabel opacityLabel;
54136317 cNumberSlider opacityField;
6318
+ JLabel parallaxLabel;
6319
+ cNumberSlider parallaxField;
54146320 JLabel fakedepthLabel;
54156321 cNumberSlider fakedepthField;
54166322 JLabel shadowbiasLabel;
54176323 cNumberSlider shadowbiasField;
6324
+
54186325 JLabel bumpLabel;
54196326 cNumberSlider bumpField;
54206327 JLabel noiseLabel;