Normand Briere
2019-08-20 564f4d12d93813b5d680fc24d4f118c3886d96ed
ObjEditor.java
....@@ -43,6 +43,50 @@
4343
4444 static ObjEditor theFrame;
4545
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
+ }
89
+
4690 public cGridBag GetSeparator()
4791 {
4892 cGridBag separator = new cGridBag();
....@@ -54,7 +98,10 @@
5498 cButton GetButton(String name, boolean border)
5599 {
56100 ImageIcon icon = GetIcon(name);
57
- 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);
58105 }
59106
60107 cLabel GetLabel(String name, boolean border)
....@@ -75,12 +122,26 @@
75122 return new cCheckBox(icon, border);
76123 }
77124
78
- 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)
79128 {
129
+ javax.swing.ImageIcon iconCache = icons.get(name);
130
+ if (iconCache != null)
131
+ {
132
+ return iconCache;
133
+ }
134
+
80135 try
81136 {
82
- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
83
-
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
+
84145 // if (image.getWidth() > 48 && image.getHeight() > 48)
85146 // {
86147 // BufferedImage resized = new BufferedImage(48, 48, image.getType());
....@@ -94,10 +155,14 @@
94155 // }
95156
96157 javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
158
+
159
+ icons.put(name, icon);
160
+
97161 return icon;
98162 }
99163 catch (Exception e)
100164 {
165
+ //icons.put(name, null);
101166 return null;
102167 }
103168 }
....@@ -297,11 +362,13 @@
297362 client = inClient;
298363 copy = client;
299364
300
- if (copy.versionlist == null)
301
- {
302
- copy.versionlist = new Object3D[100];
303
- copy.versionindex = -1;
304
- }
365
+// if (copy.versionlist == null)
366
+// {
367
+// copy.versionlist = new Object3D[100];
368
+// copy.versionindex = -1;
369
+//
370
+// callee.Save(true);
371
+// }
305372
306373 // "this" is not called: SetupUI2(objEditor);
307374 }
....@@ -320,6 +387,8 @@
320387 {
321388 copy.versionlist = new Object3D[100];
322389 copy.versionindex = -1;
390
+
391
+// Save(true);
323392 }
324393
325394 SetupUI2(callee.GetEditor());
....@@ -343,7 +412,8 @@
343412 //parent = p;
344413
345414 GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
346
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
415
+ if (Globals.DEBUG)
416
+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
347417 //gd.setFullScreenWindow(this);
348418 //setResizable(false);
349419 //if (!isDisplayable())
....@@ -354,11 +424,13 @@
354424 copy = localCopy;
355425 copy.editWindow = this;
356426
357
- if (copy.versionlist == null)
358
- {
359
-// copy.versions = new byte[100][];
427
+// if (copy.versionlist == null)
428
+// {
429
+// copy.versionlist = new Object3D[100];
360430 // copy.versionindex = -1;
361
- }
431
+//
432
+// Save(true);
433
+// }
362434
363435 SetupMenu();
364436
....@@ -378,6 +450,9 @@
378450
379451 static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
380452
453
+ // This is to refresh the UI of the material panel.
454
+ boolean patchMaterial;
455
+
381456 void SetupMenu()
382457 {
383458 frame.setMenuBar(menuBar = new MenuBar());
....@@ -391,8 +466,11 @@
391466 importOBJItem.addActionListener(this);
392467 import3DSItem = menu.add(new MenuItem("3DS file..."));
393468 import3DSItem.addActionListener(this);
469
+ if (Globals.ADVANCED)
470
+ {
394471 importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
395472 importVRMLX3DItem.addActionListener(this);
473
+ }
396474 menu.add("-");
397475 importGFDItem = menu.add(new MenuItem("Grafreed file..."));
398476 importGFDItem.addActionListener(this);
....@@ -427,6 +505,8 @@
427505
428506 ChangeListener changeListener = new ChangeListener()
429507 {
508
+ //String name;
509
+
430510 public void stateChanged(ChangeEvent changeEvent)
431511 {
432512 // if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -445,7 +525,37 @@
445525 // EditSelection(false);
446526 // }
447527
448
- refreshContents(false); // To refresh Info tab
528
+// if (objectPanel.getSelectedIndex() == 4)
529
+// {
530
+// name = copy.skyboxname;
531
+//
532
+// if (name == null)
533
+// {
534
+// name = "";
535
+// }
536
+//
537
+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
538
+// copy.skyboxext = "jpg";
539
+// }
540
+// else
541
+// {
542
+// if (name != null)
543
+// {
544
+// if (name.equals(""))
545
+// {
546
+// copy.skyboxname = null;
547
+// copy.skyboxext = null;
548
+// }
549
+// else
550
+// {
551
+// copy.skyboxname = name;
552
+// }
553
+// }
554
+// }
555
+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
556
+
557
+// refreshContents(false); // To refresh Info tab
558
+ cameraView.repaint();
449559 }
450560 };
451561 objectPanel.addChangeListener(changeListener);
....@@ -871,18 +981,29 @@
871981 boolean temp = CameraPane.SWITCH;
872982 CameraPane.SWITCH = false;
873983
874
- object.ExtractBigData(versiontable);
984
+ if (Grafreed.grafreed.universe.versiontable == null)
985
+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
986
+
987
+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
875988 // if (copy == client)
876989
877990 Object3D versions[] = object.versionlist;
991
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
878992 object.versionlist = null;
993
+ object.versiontable = null;
994
+
995
+ Object3D parent = object.parent;
996
+ object.parent = null;
879997
880998 //byte[] compress = Compress(copy);
881999 Object3D compress = (Object3D)Grafreed.clone(object);
8821000
883
- object.versionlist = versions;
1001
+ object.parent = parent;
8841002
885
- object.RestoreBigData(versiontable);
1003
+ object.versionlist = versions;
1004
+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
1005
+
1006
+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
8861007
8871008 CameraPane.SWITCH = temp;
8881009
....@@ -1221,7 +1342,7 @@
12211342
12221343 //if (copy.pinned)
12231344 {
1224
- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1345
+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
12251346 pinButton.setSelected(copy.pinned);
12261347 cGridBag t = new cGridBag();
12271348 t.preferredWidth = 2;
....@@ -1244,14 +1365,14 @@
12441365
12451366 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12461367 liveCB.setToolTipText("Animate object");
1368
+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1369
+ markCB.setToolTipText("Set target transform");
12471370 selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12481371 selectableCB.setToolTipText("Make object selectable");
12491372 // Return();
12501373
12511374 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12521375 hideCB.setToolTipText("Hide object");
1253
- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1254
- markCB.setToolTipText("As animation target transform");
12551376
12561377 ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12571378
....@@ -1453,22 +1574,9 @@
14531574
14541575 if (cam == null || !(copy.get(0) instanceof cGroup))
14551576 {
1456
- System.out.println("CREATE CAMERAS");
1457
- cams = new cTemplate();
1458
- cams.name = "Cameras";
1459
- copy.insertElementAt(cams, 0);
1460
- //cams.parent = copy;
1461
-
1462
- cam = new Camera(); // LA.newVector(3, 2, 1));
1463
- cams.addChild(cam);
1464
- cam = new Camera(1);
1465
- cams.addChild(cam);
1466
- cam = new Camera(2);
1467
- cams.addChild(cam);
1468
- cam = new Camera(3);
1469
- cams.addChild(cam);
1470
- cam = new Camera(4); // Light
1471
- cams.addChild(cam);
1577
+ if (Globals.DEBUG)
1578
+ System.out.println("CREATE CAMERAS");
1579
+ cams = CreateCameras();
14721580 } else
14731581 {
14741582 cams = (cGroup) copy.get(0);
....@@ -1534,6 +1642,45 @@
15341642 //frontView.object = copy;
15351643 //sideView.object = copy;
15361644
1645
+ transformPanel = new cGridBag().setVertical(true);
1646
+
1647
+ cGridBag resetTransformPanel = new cGridBag();
1648
+
1649
+ resetTransformPanel.preferredHeight = 2;
1650
+
1651
+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
1652
+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
1653
+ resetTransform.addMouseListener(new MouseAdapter()
1654
+ {
1655
+ public void mouseClicked(MouseEvent e)
1656
+ {
1657
+ ResetTransform();
1658
+ }
1659
+ });
1660
+ resetTransformPanel.add(resetTransform);
1661
+
1662
+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
1663
+ resetTransform.setToolTipText("Reset Translation only");
1664
+ resetTransform.addMouseListener(new MouseAdapter()
1665
+ {
1666
+ public void mouseClicked(MouseEvent e)
1667
+ {
1668
+ ResetTransform(1);
1669
+ }
1670
+ });
1671
+ resetTransformPanel.add(resetTransform);
1672
+
1673
+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
1674
+ resetTransform.setToolTipText("Reset Rotation and Scale only");
1675
+ resetTransform.addMouseListener(new MouseAdapter()
1676
+ {
1677
+ public void mouseClicked(MouseEvent e)
1678
+ {
1679
+ ResetTransform(2);
1680
+ }
1681
+ });
1682
+ resetTransformPanel.add(resetTransform);
1683
+
15371684 XYZPanel = new cGridBag().setVertical(true);
15381685 //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
15391686
....@@ -1543,6 +1690,9 @@
15431690 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
15441691 //XYZPanel.setName("XYZ");
15451692
1693
+ transformPanel.add(resetTransformPanel);
1694
+ transformPanel.add(XYZPanel);
1695
+
15461696 /*
15471697 gridPanel = new JPanel(); //new BorderLayout());
15481698 gridPanel.setLayout(new GridLayout(1, 2));
....@@ -1550,12 +1700,12 @@
15501700 gridPanel.add(cameraView);
15511701 gridPanel.add(XYZPanel);
15521702 */
1553
- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1554
- gridPanel.setContinuousLayout(true);
1555
- gridPanel.setOneTouchExpandable(true);
1556
- gridPanel.setDividerLocation(1.0);
1557
- gridPanel.setDividerSize(9);
1558
- gridPanel.setResizeWeight(0.85);
1703
+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1704
+// gridPanel.setContinuousLayout(true);
1705
+// gridPanel.setOneTouchExpandable(true);
1706
+// gridPanel.setDividerLocation(1.0);
1707
+// gridPanel.setDividerSize(9);
1708
+// gridPanel.setResizeWeight(0.85);
15591709
15601710 // aConstraints.weighty = 0;
15611711 //System.out.println("THIS = " + this);
....@@ -1578,30 +1728,34 @@
15781728
15791729 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15801730 //tmp.setName("Edit");
1581
- objectPanel.add(materialPanel);
1582
- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1583
- objectPanel.setToolTipTextAt(0, "Material");
1584
-
1731
+ objectPanel.add(skyboxPanel);
1732
+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
1733
+ objectPanel.setToolTipTextAt(0, "Backgrounds");
1734
+
15851735 objectPanel.add(toolboxPanel);
15861736 objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
15871737 objectPanel.setToolTipTextAt(1, "Objects & textures");
15881738
1589
- objectPanel.add(skyboxPanel);
1590
- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1591
- objectPanel.setToolTipTextAt(2, "Backgrounds");
1592
-
1739
+ objectPanel.add(materialPanel);
1740
+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
1741
+ objectPanel.setToolTipTextAt(2, "Material");
1742
+
15931743 // JPanel north = new JPanel(new BorderLayout());
15941744 // north.setName("Edit");
15951745 // north.add(ctrlPanel, BorderLayout.NORTH);
15961746 // objectPanel.add(north);
15971747 objectPanel.add(editPanel);
1598
- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1748
+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
15991749 objectPanel.setToolTipTextAt(3, "Edit controls");
16001750
1601
- objectPanel.add(XYZPanel);
1751
+ objectPanel.add(transformPanel);
16021752 objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1603
- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1753
+ objectPanel.setToolTipTextAt(4, "TRS transform");
16041754
1755
+ patchMaterial = true;
1756
+ cameraView.patchMaterial = this;
1757
+ objectPanel.setSelectedIndex(2);
1758
+
16051759 /*
16061760 aConstraints.gridx = 0;
16071761 aConstraints.gridwidth = 1;
....@@ -1621,7 +1775,7 @@
16211775 scrollpane.addMouseWheelListener(this); // Default not fast enough
16221776
16231777 /*JTabbedPane*/ scenePanel = new cGridBag();
1624
- scenePanel.preferredWidth = 5;
1778
+ scenePanel.preferredWidth = 6;
16251779
16261780 JTabbedPane tabbedPane = new JTabbedPane();
16271781 tabbedPane.add(scrollpane);
....@@ -1632,17 +1786,109 @@
16321786
16331787 AddOptions(optionsPanel); //, aConstraints);
16341788
1635
- tabbedPane.add(optionsPanel);
1636
-
16371789 tabbedPane.add(FSPane = new cFileSystemPane(this));
16381790
1791
+ tabbedPane.add(optionsPanel);
1792
+
16391793 scenePanel.add(tabbedPane);
16401794
1641
- //if (Globals.ADVANCED)
1642
- tabbedPane.add(infoPanel);
1643
- tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1644
- tabbedPane.setToolTipTextAt(3, "Information");
1795
+ cGridBag creditsPanel = new cGridBag().setVertical(true);
1796
+ creditsPanel.setName("Credits");
16451797
1798
+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
1799
+ creditsPanel.add(ogaLabel);
1800
+
1801
+ cButton creditButton;
1802
+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
1803
+ creditButton.setToolTipText("https://opengameart.org");
1804
+
1805
+ creditButton.addMouseListener(new MouseAdapter()
1806
+ {
1807
+ public void mouseClicked(MouseEvent e)
1808
+ {
1809
+ try
1810
+ {
1811
+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
1812
+ } catch (Exception e1)
1813
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
1814
+ {
1815
+ e1.printStackTrace();
1816
+ }
1817
+ }
1818
+ });
1819
+
1820
+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
1821
+ creditsPanel.add(ogaLabel);
1822
+
1823
+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
1824
+ creditButton.setToolTipText("https://3delicious.net");
1825
+
1826
+ creditButton.addMouseListener(new MouseAdapter()
1827
+ {
1828
+ public void mouseClicked(MouseEvent e)
1829
+ {
1830
+ try
1831
+ {
1832
+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
1833
+ } catch (Exception e1)
1834
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
1835
+ {
1836
+ e1.printStackTrace();
1837
+ }
1838
+ }
1839
+ });
1840
+
1841
+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
1842
+ creditButton.setToolTipText("https://archive3d.net");
1843
+
1844
+ creditButton.addMouseListener(new MouseAdapter()
1845
+ {
1846
+ public void mouseClicked(MouseEvent e)
1847
+ {
1848
+ try
1849
+ {
1850
+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
1851
+ } catch (Exception e1)
1852
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
1853
+ {
1854
+ e1.printStackTrace();
1855
+ }
1856
+ }
1857
+ });
1858
+
1859
+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
1860
+ creditButton.setToolTipText("https://turbosquid.com");
1861
+
1862
+ creditButton.addMouseListener(new MouseAdapter()
1863
+ {
1864
+ public void mouseClicked(MouseEvent e)
1865
+ {
1866
+ try
1867
+ {
1868
+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
1869
+ } catch (Exception e1)
1870
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
1871
+ {
1872
+ e1.printStackTrace();
1873
+ }
1874
+ }
1875
+ });
1876
+
1877
+ for (int i=6; --i>=0;)
1878
+ {
1879
+ creditsPanel.add(new cGridBag());
1880
+ }
1881
+
1882
+ tabbedPane.add(creditsPanel);
1883
+ tabbedPane.setToolTipTextAt(3, "Credits");
1884
+
1885
+ if (Globals.ADVANCED)
1886
+ {
1887
+ tabbedPane.add(infoPanel);
1888
+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
1889
+ tabbedPane.setToolTipTextAt(4, "Information");
1890
+ }
1891
+
16461892 /*
16471893 cTree jTree = new cTree(null);
16481894 ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1663,13 +1909,13 @@
16631909 jtp.add(tree);
16641910 */
16651911
1666
- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1667
- bigPanel.setContinuousLayout(true);
1668
- bigPanel.setOneTouchExpandable(true);
1669
- bigPanel.setDividerLocation(0.8);
1670
- bigPanel.setDividerSize(15);
1671
- bigPanel.setResizeWeight(0.15);
1672
- bigPanel.setName("Scene");
1912
+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1913
+// bigPanel.setContinuousLayout(true);
1914
+// bigPanel.setOneTouchExpandable(true);
1915
+// bigPanel.setDividerLocation(0.8);
1916
+// bigPanel.setDividerSize(15);
1917
+// bigPanel.setResizeWeight(0.15);
1918
+// bigPanel.setName("Scene");
16731919
16741920 //bigPanel.setLayout(new BorderLayout());
16751921 //bigPanel.setSize(new Dimension(10,10));
....@@ -1739,7 +1985,7 @@
17391985
17401986 frame.getContentPane().setLayout(new BorderLayout());
17411987 /**/
1742
- JTabbedPane worldPane = new JTabbedPane();
1988
+ //JTabbedPane worldPane = new JTabbedPane();
17431989 //worldPane.add(bigPanel);
17441990 //worldPane.add(worldPanel);
17451991 /**/
....@@ -1753,7 +1999,7 @@
17531999
17542000 cameraView.requestFocusInWindow();
17552001
1756
- gridPanel.setDividerLocation(1.0);
2002
+// gridPanel.setDividerLocation(1.0);
17572003
17582004 frame.validate();
17592005
....@@ -1788,7 +2034,7 @@
17882034 {
17892035 cGridBag presetpanel = new cGridBag().setVertical(true);
17902036
1791
- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
2037
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
17922038 skin.setToolTipText("Skin");
17932039 skin.addMouseListener(new MouseAdapter()
17942040 {
....@@ -1799,7 +2045,15 @@
17992045
18002046 // Skin
18012047 colorField.setFloat(material.color);
1802
- saturationField.setFloat(material.modulation);
2048
+ float saturation = material.modulation;
2049
+
2050
+ if (!cameraView.Skinshader)
2051
+ {
2052
+ saturation /= 1.5;
2053
+ }
2054
+
2055
+ saturationField.setFloat(saturation);
2056
+
18032057 subsurfaceField.setFloat(material.subsurface);
18042058 selfshadowField.setFloat(material.diffuseness);
18052059 diffusenessField.setFloat(material.factor);
....@@ -1818,7 +2072,7 @@
18182072 });
18192073 presetpanel.add(skin);
18202074
1821
- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
2075
+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
18222076 lambert.setToolTipText("Diffuse");
18232077 lambert.addMouseListener(new MouseAdapter()
18242078 {
....@@ -1836,7 +2090,7 @@
18362090 });
18372091 presetpanel.add(lambert);
18382092
1839
- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
2093
+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
18402094 diffuse2.setToolTipText("Diffuse2");
18412095 diffuse2.addMouseListener(new MouseAdapter()
18422096 {
....@@ -1854,7 +2108,7 @@
18542108 });
18552109 presetpanel.add(diffuse2);
18562110
1857
- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
2111
+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
18582112 diffusemoon.setToolTipText("Moon");
18592113 diffusemoon.addMouseListener(new MouseAdapter()
18602114 {
....@@ -1872,7 +2126,7 @@
18722126 });
18732127 presetpanel.add(diffusemoon);
18742128
1875
- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
2129
+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
18762130 diffusemoon2.setToolTipText("Moon2");
18772131 diffusemoon2.addMouseListener(new MouseAdapter()
18782132 {
....@@ -1890,7 +2144,7 @@
18902144 });
18912145 presetpanel.add(diffusemoon2);
18922146
1893
- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
2147
+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
18942148 diffusemoon3.setToolTipText("Moon3");
18952149 diffusemoon3.addMouseListener(new MouseAdapter()
18962150 {
....@@ -1908,7 +2162,7 @@
19082162 });
19092163 presetpanel.add(diffusemoon3);
19102164
1911
- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
2165
+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
19122166 diffusesheen.setToolTipText("Sheen");
19132167 diffusesheen.addMouseListener(new MouseAdapter()
19142168 {
....@@ -1925,7 +2179,7 @@
19252179 });
19262180 presetpanel.add(diffusesheen);
19272181
1928
- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
2182
+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
19292183 rough.setToolTipText("Rough metal");
19302184 rough.addMouseListener(new MouseAdapter()
19312185 {
....@@ -1943,7 +2197,7 @@
19432197 });
19442198 presetpanel.add(rough);
19452199
1946
- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
2200
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
19472201 rough2.setToolTipText("Medium metal");
19482202 rough2.addMouseListener(new MouseAdapter()
19492203 {
....@@ -1961,7 +2215,7 @@
19612215 });
19622216 presetpanel.add(rough2);
19632217
1964
- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
2218
+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
19652219 shini0.setToolTipText("Shiny");
19662220 shini0.addMouseListener(new MouseAdapter()
19672221 {
....@@ -1979,7 +2233,7 @@
19792233 });
19802234 presetpanel.add(shini0);
19812235
1982
- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
2236
+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
19832237 shini1.setToolTipText("Shiny2");
19842238 shini1.addMouseListener(new MouseAdapter()
19852239 {
....@@ -1997,7 +2251,7 @@
19972251 });
19982252 presetpanel.add(shini1);
19992253
2000
- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2254
+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
20012255 shini2.setToolTipText("Shiny3");
20022256 shini2.addMouseListener(new MouseAdapter()
20032257 {
....@@ -2015,7 +2269,7 @@
20152269 });
20162270 presetpanel.add(shini2);
20172271
2018
- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2272
+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
20192273 aniso.setToolTipText("AnisoU");
20202274 aniso.addMouseListener(new MouseAdapter()
20212275 {
....@@ -2033,7 +2287,7 @@
20332287 });
20342288 presetpanel.add(aniso);
20352289
2036
- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2290
+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
20372291 aniso2.setToolTipText("AnisoV");
20382292 aniso2.addMouseListener(new MouseAdapter()
20392293 {
....@@ -2051,7 +2305,7 @@
20512305 });
20522306 presetpanel.add(aniso2);
20532307
2054
- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2308
+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
20552309 aniso3.setToolTipText("AnisoUV");
20562310 aniso3.addMouseListener(new MouseAdapter()
20572311 {
....@@ -2069,7 +2323,7 @@
20692323 });
20702324 presetpanel.add(aniso3);
20712325
2072
- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2326
+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
20732327 velvet0.setToolTipText("Velvet");
20742328 velvet0.addMouseListener(new MouseAdapter()
20752329 {
....@@ -2091,7 +2345,7 @@
20912345 });
20922346 presetpanel.add(velvet0);
20932347
2094
- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2348
+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
20952349 bump0.setToolTipText("Bump texture");
20962350 bump0.addMouseListener(new MouseAdapter()
20972351 {
....@@ -2110,7 +2364,22 @@
21102364 });
21112365 presetpanel.add(bump0);
21122366
2113
- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2367
+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2368
+ borderShader.setToolTipText("Border fade");
2369
+ borderShader.addMouseListener(new MouseAdapter()
2370
+ {
2371
+ public void mouseClicked(MouseEvent e)
2372
+ {
2373
+ borderfadeField.setFloat(0.5);
2374
+ opacityField.setFloat(0.75);
2375
+
2376
+ materialtouched = true;
2377
+ applySelf();
2378
+ }
2379
+ });
2380
+ presetpanel.add(borderShader);
2381
+
2382
+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
21142383 halo.setToolTipText("Halo");
21152384 halo.addMouseListener(new MouseAdapter()
21162385 {
....@@ -2127,7 +2396,7 @@
21272396 });
21282397 presetpanel.add(halo);
21292398
2130
- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2399
+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
21312400 candle.setToolTipText("Candle");
21322401 candle.addMouseListener(new MouseAdapter()
21332402 {
....@@ -2149,7 +2418,7 @@
21492418 });
21502419 presetpanel.add(candle);
21512420
2152
- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2421
+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
21532422 shadowShader.setToolTipText("Shadow");
21542423 shadowShader.addMouseListener(new MouseAdapter()
21552424 {
....@@ -2184,19 +2453,19 @@
21842453
21852454 cGridBag editBar = new cGridBag().setVertical(false);
21862455
2187
- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
2456
+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
21882457 createMaterialButton.setToolTipText("Create material");
21892458
21902459 /*
21912460 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
21922461 */
21932462
2194
- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
2463
+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
21952464 clearMaterialButton.setToolTipText("Clear material");
21962465
21972466 if (Globals.ADVANCED)
21982467 {
2199
- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
2468
+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
22002469 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
22012470 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
22022471 }
....@@ -2217,9 +2486,20 @@
22172486
22182487 cGridBag huepanel = new cGridBag();
22192488 cGridBag huelabel = new cGridBag();
2220
- skin = GetLabel("icons/hue.png", false);
2221
- skin.fit = true;
2222
- huelabel.add(skin);
2489
+ cLabel hue = GetLabel("icons/hue.png", false);
2490
+ hue.fit = true;
2491
+
2492
+ hue.addMouseListener(new MouseAdapter()
2493
+ {
2494
+ public void mousePressed(MouseEvent e)
2495
+ {
2496
+ int x = e.getX();
2497
+
2498
+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2499
+ }
2500
+ });
2501
+
2502
+ huelabel.add(hue);
22232503 huelabel.preferredWidth = 20;
22242504 huepanel.add(new cGridBag()); // Label
22252505 huepanel.add(huelabel); // Field/slider
....@@ -2402,6 +2682,12 @@
24022682 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
24032683 colorSection.add(backlit);
24042684
2685
+ cGridBag parallax = new cGridBag();
2686
+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
2687
+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2688
+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.5, -0.25)); // , aConstraints);
2689
+ colorSection.add(parallax);
2690
+
24052691 //panel.add(new JSeparator());
24062692
24072693 //panel.add(globalSection);
....@@ -3453,6 +3739,7 @@
34533739 shadowField.setFloat(mat.shadow);
34543740 textureField.setFloat(mat.texture);
34553741 opacityField.setFloat(mat.opacity);
3742
+ parallaxField.setFloat(mat.parallax + 0.25f);
34563743 fakedepthField.setFloat(mat.fakedepth);
34573744 shadowbiasField.setFloat(mat.shadowbias);
34583745 bumpField.setInteger(1); // dec 2013
....@@ -3495,32 +3782,8 @@
34953782
34963783 if (multiplyToggle != null)
34973784 multiplyToggle.setSelected(mat.multiply);
3498
-
3499
- assert (object.projectedVertices != null);
3500
-
3501
- if (object.projectedVertices.length <= 2)
3502
- {
3503
- // Side effect...
3504
- Object3D.cVector2[] keep = object.projectedVertices;
3505
- object.projectedVertices = new Object3D.cVector2[3];
3506
- for (int i = 0; i < 3; i++)
3507
- {
3508
- if (i < keep.length)
3509
- {
3510
- object.projectedVertices[i] = keep[i];
3511
- } else
3512
- {
3513
- object.projectedVertices[i] = new Object3D.cVector2();
3514
- }
3515
- /*
3516
- if(keep.length == 0)
3517
- object.projectedVertices[0] = new Object3D.cVector2();
3518
- else
3519
- object.projectedVertices[0] = keep[0];
3520
- object.projectedVertices[1] = new Object3D.cVector2();
3521
- */
3522
- }
3523
- }
3785
+
3786
+ AllocProjectedVertices(object);
35243787
35253788 SetMaterial(mat, object.projectedVertices);
35263789 }
....@@ -3830,7 +4093,7 @@
38304093 //System.out.println("ObjEditor " + event);
38314094 applySelf0(true);
38324095 //parent.applySelf();
3833
- objEditor.refreshContents();
4096
+ // conflicts with requestFocus objEditor.refreshContents();
38344097 } else if (source == resetButton)
38354098 {
38364099 CameraPane.fullreset = true;
....@@ -4010,11 +4273,18 @@
40104273
40114274 void New()
40124275 {
4013
- while (copy.Size() > 1)
4276
+ while (copy.Size() > 0)
40144277 {
4015
- copy.remove(1);
4278
+ copy.remove(0);
40164279 }
40174280
4281
+ copy.selection.clear();
4282
+
4283
+ if (copy == Grafreed.grafreed.universe)
4284
+ {
4285
+ CreateCameras();
4286
+ cameraView.SetCamera(GetCamera(copy, 0));
4287
+ }
40184288 ResetModel();
40194289 objEditor.refreshContents();
40204290 }
....@@ -4123,7 +4393,7 @@
41234393 {
41244394 //Save(true);
41254395 Replace();
4126
- SetUndoStates();
4396
+ SetVersionStates();
41274397 }
41284398
41294399 private boolean Equal(byte[] compress, byte[] name)
....@@ -4142,8 +4412,6 @@
41424412 return true;
41434413 }
41444414
4145
- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4146
-
41474415 void DeleteVersion()
41484416 {
41494417 for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4151,9 +4419,13 @@
41514419 copy.versionlist[i] = copy.versionlist[i+1];
41524420 }
41534421
4154
- CopyChanged();
4422
+ if (copy.versionlist[copy.versionindex] == null)
4423
+ copy.versionindex -= 1;
41554424
4156
- SetUndoStates();
4425
+ if (copy.versionindex != -1)
4426
+ CopyChanged();
4427
+
4428
+ SetVersionStates();
41574429 }
41584430
41594431 public boolean Save(boolean user)
....@@ -4161,7 +4433,7 @@
41614433 System.err.println("Save");
41624434 Replace();
41634435
4164
- cRadio tab = GetCurrentTab();
4436
+ //cRadio tab = GetCurrentTab();
41654437
41664438 Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
41674439
....@@ -4199,7 +4471,7 @@
41994471 // copy.versionlist[i] = null;
42004472 // }
42014473
4202
- SetUndoStates();
4474
+ SetVersionStates();
42034475
42044476 // test save
42054477 if (false)
....@@ -4259,12 +4531,12 @@
42594531 {
42604532 Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
42614533
4262
- SetUndoStates();
4534
+ SetVersionStates();
42634535
42644536 boolean temp = CameraPane.SWITCH;
42654537 CameraPane.SWITCH = false;
42664538
4267
- copy.ExtractBigData(versiontable);
4539
+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
42684540
42694541 copy.clear();
42704542
....@@ -4276,7 +4548,7 @@
42764548 copy.add(obj.get(i));
42774549 }
42784550
4279
- copy.RestoreBigData(versiontable);
4551
+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
42804552
42814553 CameraPane.SWITCH = temp;
42824554
....@@ -4326,23 +4598,45 @@
43264598 return count;
43274599 }
43284600
4329
- void SetUndoStates()
4601
+ public cGridBag versionSliderPane;
4602
+
4603
+ void SetVersionStates()
43304604 {
4331
- cRadio tab = GetCurrentTab();
4605
+ //if (true)
4606
+ // return;
4607
+
4608
+ //cRadio tab = GetCurrentTab();
43324609
4333
- restoreButton.setEnabled(true); // copy.versionindex != -1);
4334
- replaceButton.setEnabled(true); // copy.versionindex != -1);
4335
-
4336
- previousVersionButton.setEnabled(copy.versionindex > 0);
4337
- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4338
-
4339
- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4340
- copy.versionlist[copy.versionindex + 1] != null);
4341
-
4342
- muteSlider = true;
4343
- versionSlider.setMaximum(VersionCount() - 1);
4344
- versionSlider.setInteger(copy.versionindex);
4345
- muteSlider = false;
4610
+ if (copy.versionlist == null)
4611
+ {
4612
+ saveVersionButton.setEnabled(false);
4613
+ restoreButton.setEnabled(false);
4614
+ replaceButton.setEnabled(false);
4615
+ previousVersionButton.setEnabled(false);
4616
+ nextVersionButton.setEnabled(false);
4617
+ deleteVersionButton.setEnabled(false);
4618
+ versionSliderPane.setVisible(false);
4619
+ }
4620
+ else
4621
+ {
4622
+ restoreButton.setEnabled(copy.versionindex != -1);
4623
+ replaceButton.setEnabled(copy.versionindex != -1);
4624
+
4625
+ previousVersionButton.setEnabled(copy.versionindex > 0);
4626
+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4627
+
4628
+ deleteVersionButton.setEnabled(copy.versionindex != -1);
4629
+ //copy.versionlist[copy.versionindex + 1] != null);
4630
+
4631
+ muteSlider = true;
4632
+ versionSlider.setMinimum(0);
4633
+ versionSlider.setMaximum(VersionCount() - 1);
4634
+ versionSlider.setInteger(copy.versionindex);
4635
+ versionSlider.setEnabled(copy.versionindex != -1);
4636
+ muteSlider = false;
4637
+
4638
+ versionSliderPane.setVisible(true);
4639
+ }
43464640 }
43474641
43484642 public boolean PreviousVersion()
....@@ -4352,7 +4646,7 @@
43524646
43534647 System.err.println("Undo");
43544648
4355
- cRadio tab = GetCurrentTab();
4649
+ //cRadio tab = GetCurrentTab();
43564650
43574651 if (copy.versionindex == 0)
43584652 {
....@@ -4384,7 +4678,7 @@
43844678 {
43854679 System.err.println("Restore");
43864680
4387
- cRadio tab = GetCurrentTab();
4681
+ //cRadio tab = GetCurrentTab();
43884682
43894683 if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43904684 {
....@@ -4400,9 +4694,9 @@
44004694
44014695 public boolean Replace()
44024696 {
4403
- System.err.println("Replace");
4697
+ //System.err.println("Replace");
44044698
4405
- cRadio tab = GetCurrentTab();
4699
+ //cRadio tab = GetCurrentTab();
44064700
44074701 if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
44084702 {
....@@ -4420,7 +4714,7 @@
44204714 // Option?
44214715 Replace();
44224716
4423
- cRadio tab = GetCurrentTab();
4717
+ //cRadio tab = GetCurrentTab();
44244718
44254719 if (copy.versionlist[copy.versionindex + 1] == null)
44264720 {
....@@ -4627,6 +4921,12 @@
46274921 // else
46284922 // applySelf(true);
46294923 // }
4924
+
4925
+ boolean Equal(double a, double b)
4926
+ {
4927
+ return Math.abs(a - b) < 0.001;
4928
+ }
4929
+
46304930 void applySelf0(boolean name)
46314931 {
46324932 if (name)
....@@ -4664,6 +4964,7 @@
46644964 current.shadow = (float) shadowField.getFloat();
46654965 current.texture = (float) textureField.getFloat();
46664966 current.opacity = (float) opacityField.getFloat();
4967
+ current.parallax = (float) parallaxField.getFloat() - 0.25f;
46674968 current.fakedepth = (float) fakedepthField.getFloat();
46684969 current.shadowbias = (float) shadowbiasField.getFloat();
46694970
....@@ -4676,29 +4977,54 @@
46764977 {
46774978 cMaterial mat = copy.material;
46784979
4679
- colorField.SetToolTipValue((mat.color));
4680
- saturationField.SetToolTipValue((mat.modulation));
4681
- metalnessField.SetToolTipValue((mat.metalness));
4682
- diffuseField.SetToolTipValue((mat.diffuse));
4683
- specularField.SetToolTipValue((mat.specular));
4684
- shininessField.SetToolTipValue((mat.shininess));
4685
- shiftField.SetToolTipValue((mat.shift));
4686
- ambientField.SetToolTipValue((mat.ambient));
4687
- lightareaField.SetToolTipValue((mat.lightarea));
4688
- diffusenessField.SetToolTipValue((mat.factor));
4689
- velvetField.SetToolTipValue((mat.velvet));
4690
- sheenField.SetToolTipValue((mat.sheen));
4691
- subsurfaceField.SetToolTipValue((mat.subsurface));
4692
- backlitField.SetToolTipValue((mat.bump));
4693
- anisoField.SetToolTipValue((mat.aniso));
4694
- anisoVField.SetToolTipValue((mat.anisoV));
4695
- cameraField.SetToolTipValue((mat.cameralight));
4696
- selfshadowField.SetToolTipValue((mat.diffuseness));
4697
- shadowField.SetToolTipValue((mat.shadow));
4698
- textureField.SetToolTipValue((mat.texture));
4699
- opacityField.SetToolTipValue((mat.opacity));
4700
- fakedepthField.SetToolTipValue((mat.fakedepth));
4701
- shadowbiasField.SetToolTipValue((mat.shadowbias));
4980
+ if (!Equal(colorField.getFloat(), mat.color))
4981
+ colorField.SetToolTipValue((mat.color));
4982
+ if (!Equal(saturationField.getFloat(), mat.modulation))
4983
+ saturationField.SetToolTipValue((mat.modulation));
4984
+ if (!Equal(metalnessField.getFloat(), mat.metalness))
4985
+ metalnessField.SetToolTipValue((mat.metalness));
4986
+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
4987
+ diffuseField.SetToolTipValue((mat.diffuse));
4988
+ if (!Equal(specularField.getFloat(), mat.specular))
4989
+ specularField.SetToolTipValue((mat.specular));
4990
+ if (!Equal(shininessField.getFloat(), mat.shininess))
4991
+ shininessField.SetToolTipValue((mat.shininess));
4992
+ if (!Equal(shiftField.getFloat(), mat.shift))
4993
+ shiftField.SetToolTipValue((mat.shift));
4994
+ if (!Equal(ambientField.getFloat(), mat.ambient))
4995
+ ambientField.SetToolTipValue((mat.ambient));
4996
+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
4997
+ lightareaField.SetToolTipValue((mat.lightarea));
4998
+ if (!Equal(diffusenessField.getFloat(), mat.factor))
4999
+ diffusenessField.SetToolTipValue((mat.factor));
5000
+ if (!Equal(velvetField.getFloat(), mat.velvet))
5001
+ velvetField.SetToolTipValue((mat.velvet));
5002
+ if (!Equal(sheenField.getFloat(), mat.sheen))
5003
+ sheenField.SetToolTipValue((mat.sheen));
5004
+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
5005
+ subsurfaceField.SetToolTipValue((mat.subsurface));
5006
+ if (!Equal(backlitField.getFloat(), mat.bump))
5007
+ backlitField.SetToolTipValue((mat.bump));
5008
+ if (!Equal(anisoField.getFloat(), mat.aniso))
5009
+ anisoField.SetToolTipValue((mat.aniso));
5010
+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
5011
+ anisoVField.SetToolTipValue((mat.anisoV));
5012
+ if (!Equal(cameraField.getFloat(), mat.cameralight))
5013
+ cameraField.SetToolTipValue((mat.cameralight));
5014
+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
5015
+ selfshadowField.SetToolTipValue((mat.diffuseness));
5016
+ if (!Equal(shadowField.getFloat(), mat.shadow))
5017
+ shadowField.SetToolTipValue((mat.shadow));
5018
+ if (!Equal(textureField.getFloat(), mat.texture))
5019
+ textureField.SetToolTipValue((mat.texture));
5020
+ if (!Equal(opacityField.getFloat(), mat.opacity))
5021
+ opacityField.SetToolTipValue((mat.opacity));
5022
+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
5023
+ parallaxField.SetToolTipValue((mat.parallax));
5024
+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
5025
+ fakedepthField.SetToolTipValue((mat.fakedepth));
5026
+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
5027
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
47025028 }
47035029
47045030 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
....@@ -4733,15 +5059,17 @@
47335059
47345060 public void stateChanged(ChangeEvent e)
47355061 {
4736
- // assert(false);
5062
+ // assert(false);
47375063 if (e.getSource() == versionSlider)
47385064 {
47395065 if (muteSlider)
47405066 return;
47415067
5068
+ Replace();
5069
+
47425070 int version = versionSlider.getInteger();
47435071
4744
- if (copy.versionlist[version] != null)
5072
+ if (version != -1 && copy.versionlist[version] != null)
47455073 {
47465074 copy.versionindex = version;
47475075 CopyChanged();
....@@ -5100,7 +5428,9 @@
51005428 }
51015429
51025430 if (previousVersionButton != null && copy.versionlist != null)
5103
- SetUndoStates();
5431
+ SetVersionStates();
5432
+
5433
+ cameraView.requestFocusInWindow();
51045434 }
51055435
51065436 static TweenManager tweenManager = new TweenManager();
....@@ -5132,7 +5462,7 @@
51325462 // group = (Composite) group.get(0);
51335463 // }
51345464
5135
- System.out.println("makeSomething of " + thing);
5465
+ //System.out.println("makeSomething of " + thing);
51365466
51375467 /*
51385468 if (deselect && jList != null)
....@@ -5486,11 +5816,15 @@
54865816
54875817 copy.versionlist = readobj.versionlist;
54885818 copy.versionindex = readobj.versionindex;
5819
+ copy.versiontable = readobj.versiontable;
54895820
54905821 if (copy.versionlist == null)
54915822 {
5823
+ // Backward compatibility
54925824 copy.versionlist = new Object3D[100];
54935825 copy.versionindex = -1;
5826
+
5827
+ //Save(true);
54945828 }
54955829
54965830 //? SetUndoStates();
....@@ -5582,6 +5916,8 @@
55825916
55835917 void save()
55845918 {
5919
+ Replace();
5920
+
55855921 if (lastname == null)
55865922 {
55875923 return;
....@@ -5836,6 +6172,7 @@
58366172 boolean materialFlushed;
58376173 Object3D latestObject;
58386174
6175
+ cGridBag transformPanel;
58396176 cGridBag XYZPanel;
58406177
58416178 JSplitPane gridPanel;
....@@ -5940,6 +6277,8 @@
59406277 cNumberSlider textureField;
59416278 JLabel opacityLabel;
59426279 cNumberSlider opacityField;
6280
+ JLabel parallaxLabel;
6281
+ cNumberSlider parallaxField;
59436282 JLabel fakedepthLabel;
59446283 cNumberSlider fakedepthField;
59456284 JLabel shadowbiasLabel;