Normand Briere
2019-08-23 60cec91731a350fe67e9b5ffe7a00d70e9026314
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)
....@@ -77,7 +124,7 @@
77124
78125 static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
79126
80
- ImageIcon GetIcon(String name)
127
+ static ImageIcon GetIcon(String name)
81128 {
82129 javax.swing.ImageIcon iconCache = icons.get(name);
83130 if (iconCache != null)
....@@ -87,8 +134,14 @@
87134
88135 try
89136 {
90
- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
91
-
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
+
92145 // if (image.getWidth() > 48 && image.getHeight() > 48)
93146 // {
94147 // BufferedImage resized = new BufferedImage(48, 48, image.getType());
....@@ -330,14 +383,6 @@
330383 client = inClient;
331384 copy = client;
332385
333
- if (copy.versionlist == null)
334
- {
335
- copy.versionlist = new Object3D[100];
336
- copy.versionindex = -1;
337
-
338
-// Save(true);
339
- }
340
-
341386 SetupUI2(callee.GetEditor());
342387 }
343388
....@@ -359,7 +404,8 @@
359404 //parent = p;
360405
361406 GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
362
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
407
+ if (Globals.DEBUG)
408
+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
363409 //gd.setFullScreenWindow(this);
364410 //setResizable(false);
365411 //if (!isDisplayable())
....@@ -396,6 +442,9 @@
396442
397443 static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
398444
445
+ // This is to refresh the UI of the material panel.
446
+ boolean patchMaterial;
447
+
399448 void SetupMenu()
400449 {
401450 frame.setMenuBar(menuBar = new MenuBar());
....@@ -409,8 +458,11 @@
409458 importOBJItem.addActionListener(this);
410459 import3DSItem = menu.add(new MenuItem("3DS file..."));
411460 import3DSItem.addActionListener(this);
461
+ if (Globals.ADVANCED)
462
+ {
412463 importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
413464 importVRMLX3DItem.addActionListener(this);
465
+ }
414466 menu.add("-");
415467 importGFDItem = menu.add(new MenuItem("Grafreed file..."));
416468 importGFDItem.addActionListener(this);
....@@ -921,18 +973,29 @@
921973 boolean temp = CameraPane.SWITCH;
922974 CameraPane.SWITCH = false;
923975
924
- object.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);
925980 // if (copy == client)
926981
927982 Object3D versions[] = object.versionlist;
983
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
928984 object.versionlist = null;
985
+ object.versiontable = null;
986
+
987
+ Object3D parent = object.parent;
988
+ object.parent = null;
929989
930990 //byte[] compress = Compress(copy);
931991 Object3D compress = (Object3D)Grafreed.clone(object);
932992
933
- object.versionlist = versions;
993
+ object.parent = parent;
934994
935
- object.RestoreBigData(versiontable);
995
+ object.versionlist = versions;
996
+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
997
+
998
+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
936999
9371000 CameraPane.SWITCH = temp;
9381001
....@@ -1271,7 +1334,7 @@
12711334
12721335 //if (copy.pinned)
12731336 {
1274
- pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1337
+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
12751338 pinButton.setSelected(copy.pinned);
12761339 cGridBag t = new cGridBag();
12771340 t.preferredWidth = 2;
....@@ -1294,14 +1357,14 @@
12941357
12951358 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12961359 liveCB.setToolTipText("Animate object");
1360
+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1361
+ markCB.setToolTipText("Set target transform");
12971362 selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12981363 selectableCB.setToolTipText("Make object selectable");
12991364 // Return();
13001365
13011366 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
13021367 hideCB.setToolTipText("Hide object");
1303
- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1304
- markCB.setToolTipText("As animation target transform");
13051368
13061369 ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
13071370
....@@ -1503,22 +1566,9 @@
15031566
15041567 if (cam == null || !(copy.get(0) instanceof cGroup))
15051568 {
1506
- System.out.println("CREATE CAMERAS");
1507
- cams = new cTemplate();
1508
- cams.name = "Cameras";
1509
- copy.insertElementAt(cams, 0);
1510
- //cams.parent = copy;
1511
-
1512
- cam = new Camera(); // LA.newVector(3, 2, 1));
1513
- cams.addChild(cam);
1514
- cam = new Camera(1);
1515
- cams.addChild(cam);
1516
- cam = new Camera(2);
1517
- cams.addChild(cam);
1518
- cam = new Camera(3);
1519
- cams.addChild(cam);
1520
- cam = new Camera(4); // Light
1521
- cams.addChild(cam);
1569
+ if (Globals.DEBUG)
1570
+ System.out.println("CREATE CAMERAS");
1571
+ cams = CreateCameras();
15221572 } else
15231573 {
15241574 cams = (cGroup) copy.get(0);
....@@ -1584,6 +1634,45 @@
15841634 //frontView.object = copy;
15851635 //sideView.object = copy;
15861636
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
+
15871676 XYZPanel = new cGridBag().setVertical(true);
15881677 //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
15891678
....@@ -1593,6 +1682,9 @@
15931682 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
15941683 //XYZPanel.setName("XYZ");
15951684
1685
+ transformPanel.add(resetTransformPanel);
1686
+ transformPanel.add(XYZPanel);
1687
+
15961688 /*
15971689 gridPanel = new JPanel(); //new BorderLayout());
15981690 gridPanel.setLayout(new GridLayout(1, 2));
....@@ -1600,12 +1692,12 @@
16001692 gridPanel.add(cameraView);
16011693 gridPanel.add(XYZPanel);
16021694 */
1603
- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1604
- gridPanel.setContinuousLayout(true);
1605
- gridPanel.setOneTouchExpandable(true);
1606
- gridPanel.setDividerLocation(1.0);
1607
- gridPanel.setDividerSize(9);
1608
- 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);
16091701
16101702 // aConstraints.weighty = 0;
16111703 //System.out.println("THIS = " + this);
....@@ -1628,30 +1720,34 @@
16281720
16291721 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
16301722 //tmp.setName("Edit");
1631
- objectPanel.add(materialPanel);
1632
- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1633
- objectPanel.setToolTipTextAt(0, "Material");
1634
-
1723
+ objectPanel.add(skyboxPanel);
1724
+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
1725
+ objectPanel.setToolTipTextAt(0, "Backgrounds");
1726
+
16351727 objectPanel.add(toolboxPanel);
16361728 objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
16371729 objectPanel.setToolTipTextAt(1, "Objects & textures");
16381730
1639
- objectPanel.add(skyboxPanel);
1640
- objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1641
- objectPanel.setToolTipTextAt(2, "Backgrounds");
1642
-
1731
+ objectPanel.add(materialPanel);
1732
+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
1733
+ objectPanel.setToolTipTextAt(2, "Material");
1734
+
16431735 // JPanel north = new JPanel(new BorderLayout());
16441736 // north.setName("Edit");
16451737 // north.add(ctrlPanel, BorderLayout.NORTH);
16461738 // objectPanel.add(north);
16471739 objectPanel.add(editPanel);
1648
- objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1740
+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
16491741 objectPanel.setToolTipTextAt(3, "Edit controls");
16501742
1651
- objectPanel.add(XYZPanel);
1743
+ objectPanel.add(transformPanel);
16521744 objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1653
- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1745
+ objectPanel.setToolTipTextAt(4, "TRS transform");
16541746
1747
+ patchMaterial = true;
1748
+ cameraView.patchMaterial = this;
1749
+ objectPanel.setSelectedIndex(2);
1750
+
16551751 /*
16561752 aConstraints.gridx = 0;
16571753 aConstraints.gridwidth = 1;
....@@ -1682,17 +1778,109 @@
16821778
16831779 AddOptions(optionsPanel); //, aConstraints);
16841780
1685
- tabbedPane.add(optionsPanel);
1686
-
16871781 tabbedPane.add(FSPane = new cFileSystemPane(this));
16881782
1783
+ tabbedPane.add(optionsPanel);
1784
+
16891785 scenePanel.add(tabbedPane);
16901786
1691
- //if (Globals.ADVANCED)
1692
-// tabbedPane.add(infoPanel);
1693
-// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1694
-// tabbedPane.setToolTipTextAt(3, "Information");
1787
+ cGridBag creditsPanel = new cGridBag().setVertical(true);
1788
+ creditsPanel.setName("Credits");
16951789
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
+ }
1883
+
16961884 /*
16971885 cTree jTree = new cTree(null);
16981886 ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1713,13 +1901,13 @@
17131901 jtp.add(tree);
17141902 */
17151903
1716
- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1717
- bigPanel.setContinuousLayout(true);
1718
- bigPanel.setOneTouchExpandable(true);
1719
- bigPanel.setDividerLocation(0.8);
1720
- bigPanel.setDividerSize(15);
1721
- bigPanel.setResizeWeight(0.15);
1722
- 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");
17231911
17241912 //bigPanel.setLayout(new BorderLayout());
17251913 //bigPanel.setSize(new Dimension(10,10));
....@@ -1789,7 +1977,7 @@
17891977
17901978 frame.getContentPane().setLayout(new BorderLayout());
17911979 /**/
1792
- JTabbedPane worldPane = new JTabbedPane();
1980
+ //JTabbedPane worldPane = new JTabbedPane();
17931981 //worldPane.add(bigPanel);
17941982 //worldPane.add(worldPanel);
17951983 /**/
....@@ -1803,7 +1991,7 @@
18031991
18041992 cameraView.requestFocusInWindow();
18051993
1806
- gridPanel.setDividerLocation(1.0);
1994
+// gridPanel.setDividerLocation(1.0);
18071995
18081996 frame.validate();
18091997
....@@ -1838,7 +2026,7 @@
18382026 {
18392027 cGridBag presetpanel = new cGridBag().setVertical(true);
18402028
1841
- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
2029
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
18422030 skin.setToolTipText("Skin");
18432031 skin.addMouseListener(new MouseAdapter()
18442032 {
....@@ -1849,7 +2037,15 @@
18492037
18502038 // Skin
18512039 colorField.setFloat(material.color);
1852
- saturationField.setFloat(material.modulation);
2040
+ float saturation = material.modulation;
2041
+
2042
+ if (!cameraView.Skinshader)
2043
+ {
2044
+ saturation /= 1.5;
2045
+ }
2046
+
2047
+ saturationField.setFloat(saturation);
2048
+
18532049 subsurfaceField.setFloat(material.subsurface);
18542050 selfshadowField.setFloat(material.diffuseness);
18552051 diffusenessField.setFloat(material.factor);
....@@ -1868,7 +2064,7 @@
18682064 });
18692065 presetpanel.add(skin);
18702066
1871
- cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
2067
+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
18722068 lambert.setToolTipText("Diffuse");
18732069 lambert.addMouseListener(new MouseAdapter()
18742070 {
....@@ -1886,7 +2082,7 @@
18862082 });
18872083 presetpanel.add(lambert);
18882084
1889
- cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
2085
+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
18902086 diffuse2.setToolTipText("Diffuse2");
18912087 diffuse2.addMouseListener(new MouseAdapter()
18922088 {
....@@ -1904,7 +2100,7 @@
19042100 });
19052101 presetpanel.add(diffuse2);
19062102
1907
- cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
2103
+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
19082104 diffusemoon.setToolTipText("Moon");
19092105 diffusemoon.addMouseListener(new MouseAdapter()
19102106 {
....@@ -1922,7 +2118,7 @@
19222118 });
19232119 presetpanel.add(diffusemoon);
19242120
1925
- cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
2121
+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
19262122 diffusemoon2.setToolTipText("Moon2");
19272123 diffusemoon2.addMouseListener(new MouseAdapter()
19282124 {
....@@ -1940,7 +2136,7 @@
19402136 });
19412137 presetpanel.add(diffusemoon2);
19422138
1943
- cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
2139
+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
19442140 diffusemoon3.setToolTipText("Moon3");
19452141 diffusemoon3.addMouseListener(new MouseAdapter()
19462142 {
....@@ -1958,7 +2154,7 @@
19582154 });
19592155 presetpanel.add(diffusemoon3);
19602156
1961
- cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
2157
+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
19622158 diffusesheen.setToolTipText("Sheen");
19632159 diffusesheen.addMouseListener(new MouseAdapter()
19642160 {
....@@ -1975,7 +2171,7 @@
19752171 });
19762172 presetpanel.add(diffusesheen);
19772173
1978
- cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
2174
+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
19792175 rough.setToolTipText("Rough metal");
19802176 rough.addMouseListener(new MouseAdapter()
19812177 {
....@@ -1993,7 +2189,7 @@
19932189 });
19942190 presetpanel.add(rough);
19952191
1996
- cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
2192
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
19972193 rough2.setToolTipText("Medium metal");
19982194 rough2.addMouseListener(new MouseAdapter()
19992195 {
....@@ -2011,7 +2207,7 @@
20112207 });
20122208 presetpanel.add(rough2);
20132209
2014
- cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
2210
+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
20152211 shini0.setToolTipText("Shiny");
20162212 shini0.addMouseListener(new MouseAdapter()
20172213 {
....@@ -2029,7 +2225,7 @@
20292225 });
20302226 presetpanel.add(shini0);
20312227
2032
- cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
2228
+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
20332229 shini1.setToolTipText("Shiny2");
20342230 shini1.addMouseListener(new MouseAdapter()
20352231 {
....@@ -2047,7 +2243,7 @@
20472243 });
20482244 presetpanel.add(shini1);
20492245
2050
- cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2246
+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
20512247 shini2.setToolTipText("Shiny3");
20522248 shini2.addMouseListener(new MouseAdapter()
20532249 {
....@@ -2065,7 +2261,7 @@
20652261 });
20662262 presetpanel.add(shini2);
20672263
2068
- cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2264
+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
20692265 aniso.setToolTipText("AnisoU");
20702266 aniso.addMouseListener(new MouseAdapter()
20712267 {
....@@ -2083,7 +2279,7 @@
20832279 });
20842280 presetpanel.add(aniso);
20852281
2086
- cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2282
+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
20872283 aniso2.setToolTipText("AnisoV");
20882284 aniso2.addMouseListener(new MouseAdapter()
20892285 {
....@@ -2101,7 +2297,7 @@
21012297 });
21022298 presetpanel.add(aniso2);
21032299
2104
- cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2300
+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
21052301 aniso3.setToolTipText("AnisoUV");
21062302 aniso3.addMouseListener(new MouseAdapter()
21072303 {
....@@ -2119,7 +2315,7 @@
21192315 });
21202316 presetpanel.add(aniso3);
21212317
2122
- cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2318
+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
21232319 velvet0.setToolTipText("Velvet");
21242320 velvet0.addMouseListener(new MouseAdapter()
21252321 {
....@@ -2141,7 +2337,7 @@
21412337 });
21422338 presetpanel.add(velvet0);
21432339
2144
- cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2340
+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
21452341 bump0.setToolTipText("Bump texture");
21462342 bump0.addMouseListener(new MouseAdapter()
21472343 {
....@@ -2160,7 +2356,22 @@
21602356 });
21612357 presetpanel.add(bump0);
21622358
2163
- cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
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);
21642375 halo.setToolTipText("Halo");
21652376 halo.addMouseListener(new MouseAdapter()
21662377 {
....@@ -2177,7 +2388,7 @@
21772388 });
21782389 presetpanel.add(halo);
21792390
2180
- cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2391
+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
21812392 candle.setToolTipText("Candle");
21822393 candle.addMouseListener(new MouseAdapter()
21832394 {
....@@ -2199,7 +2410,7 @@
21992410 });
22002411 presetpanel.add(candle);
22012412
2202
- cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2413
+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
22032414 shadowShader.setToolTipText("Shadow");
22042415 shadowShader.addMouseListener(new MouseAdapter()
22052416 {
....@@ -2218,6 +2429,48 @@
22182429 });
22192430 presetpanel.add(shadowShader);
22202431
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
+
22212474 cGridBag panel = new cGridBag().setVertical(true);
22222475
22232476 presetpanel.preferredWidth = 1;
....@@ -2234,19 +2487,19 @@
22342487
22352488 cGridBag editBar = new cGridBag().setVertical(false);
22362489
2237
- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
2490
+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
22382491 createMaterialButton.setToolTipText("Create material");
22392492
22402493 /*
22412494 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
22422495 */
22432496
2244
- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
2497
+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
22452498 clearMaterialButton.setToolTipText("Clear material");
22462499
22472500 if (Globals.ADVANCED)
22482501 {
2249
- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
2502
+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
22502503 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
22512504 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
22522505 }
....@@ -2267,9 +2520,20 @@
22672520
22682521 cGridBag huepanel = new cGridBag();
22692522 cGridBag huelabel = new cGridBag();
2270
- skin = GetLabel("icons/hue.png", false);
2271
- skin.fit = true;
2272
- huelabel.add(skin);
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);
22732537 huelabel.preferredWidth = 20;
22742538 huepanel.add(new cGridBag()); // Label
22752539 huepanel.add(huelabel); // Field/slider
....@@ -2452,6 +2716,12 @@
24522716 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
24532717 colorSection.add(backlit);
24542718
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
+
24552725 //panel.add(new JSeparator());
24562726
24572727 //panel.add(globalSection);
....@@ -3503,6 +3773,7 @@
35033773 shadowField.setFloat(mat.shadow);
35043774 textureField.setFloat(mat.texture);
35053775 opacityField.setFloat(mat.opacity);
3776
+ parallaxField.setFloat(mat.parallax + 0.125f);
35063777 fakedepthField.setFloat(mat.fakedepth);
35073778 shadowbiasField.setFloat(mat.shadowbias);
35083779 bumpField.setInteger(1); // dec 2013
....@@ -3545,32 +3816,8 @@
35453816
35463817 if (multiplyToggle != null)
35473818 multiplyToggle.setSelected(mat.multiply);
3548
-
3549
- assert (object.projectedVertices != null);
3550
-
3551
- if (object.projectedVertices.length <= 2)
3552
- {
3553
- // Side effect...
3554
- Object3D.cVector2[] keep = object.projectedVertices;
3555
- object.projectedVertices = new Object3D.cVector2[3];
3556
- for (int i = 0; i < 3; i++)
3557
- {
3558
- if (i < keep.length)
3559
- {
3560
- object.projectedVertices[i] = keep[i];
3561
- } else
3562
- {
3563
- object.projectedVertices[i] = new Object3D.cVector2();
3564
- }
3565
- /*
3566
- if(keep.length == 0)
3567
- object.projectedVertices[0] = new Object3D.cVector2();
3568
- else
3569
- object.projectedVertices[0] = keep[0];
3570
- object.projectedVertices[1] = new Object3D.cVector2();
3571
- */
3572
- }
3573
- }
3819
+
3820
+ AllocProjectedVertices(object);
35743821
35753822 SetMaterial(mat, object.projectedVertices);
35763823 }
....@@ -3880,7 +4127,7 @@
38804127 //System.out.println("ObjEditor " + event);
38814128 applySelf0(true);
38824129 //parent.applySelf();
3883
- objEditor.refreshContents();
4130
+ // conflicts with requestFocus objEditor.refreshContents();
38844131 } else if (source == resetButton)
38854132 {
38864133 CameraPane.fullreset = true;
....@@ -4060,11 +4307,18 @@
40604307
40614308 void New()
40624309 {
4063
- while (copy.Size() > 1)
4310
+ while (copy.Size() > 0)
40644311 {
4065
- copy.remove(1);
4312
+ copy.remove(0);
40664313 }
40674314
4315
+ copy.selection.clear();
4316
+
4317
+ if (copy == Grafreed.grafreed.universe)
4318
+ {
4319
+ CreateCameras();
4320
+ cameraView.SetCamera(GetCamera(copy, 0));
4321
+ }
40684322 ResetModel();
40694323 objEditor.refreshContents();
40704324 }
....@@ -4192,8 +4446,6 @@
41924446 return true;
41934447 }
41944448
4195
- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4196
-
41974449 void DeleteVersion()
41984450 {
41994451 for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4201,7 +4453,11 @@
42014453 copy.versionlist[i] = copy.versionlist[i+1];
42024454 }
42034455
4204
- CopyChanged();
4456
+ if (copy.versionlist[copy.versionindex] == null)
4457
+ copy.versionindex -= 1;
4458
+
4459
+ if (copy.versionindex != -1)
4460
+ CopyChanged();
42054461
42064462 SetVersionStates();
42074463 }
....@@ -4211,7 +4467,11 @@
42114467 System.err.println("Save");
42124468 Replace();
42134469
4214
- //cRadio tab = GetCurrentTab();
4470
+ if (copy.versionlist == null)
4471
+ {
4472
+ copy.versionlist = new Object3D[100];
4473
+ copy.versionindex = -1;
4474
+ }
42154475
42164476 Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
42174477
....@@ -4314,7 +4574,7 @@
43144574 boolean temp = CameraPane.SWITCH;
43154575 CameraPane.SWITCH = false;
43164576
4317
- copy.ExtractBigData(versiontable);
4577
+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
43184578
43194579 copy.clear();
43204580
....@@ -4326,7 +4586,7 @@
43264586 copy.add(obj.get(i));
43274587 }
43284588
4329
- copy.RestoreBigData(versiontable);
4589
+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
43304590
43314591 CameraPane.SWITCH = temp;
43324592
....@@ -4376,6 +4636,8 @@
43764636 return count;
43774637 }
43784638
4639
+ public cGridBag versionSliderPane;
4640
+
43794641 void SetVersionStates()
43804642 {
43814643 //if (true)
....@@ -4383,21 +4645,36 @@
43834645
43844646 //cRadio tab = GetCurrentTab();
43854647
4386
- restoreButton.setEnabled(copy.versionindex != -1);
4387
- replaceButton.setEnabled(copy.versionindex != -1);
4388
-
4389
- previousVersionButton.setEnabled(copy.versionindex > 0);
4390
- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4391
-
4392
- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4393
- copy.versionlist[copy.versionindex + 1] != null);
4394
-
4395
- muteSlider = true;
4396
- versionSlider.setMinimum(0);
4397
- versionSlider.setMaximum(VersionCount() - 1);
4398
- versionSlider.setInteger(copy.versionindex);
4399
- versionSlider.setEnabled(copy.versionindex != -1);
4400
- 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
+ }
44014678 }
44024679
44034680 public boolean PreviousVersion()
....@@ -4455,7 +4732,7 @@
44554732
44564733 public boolean Replace()
44574734 {
4458
- System.err.println("Replace");
4735
+ //System.err.println("Replace");
44594736
44604737 //cRadio tab = GetCurrentTab();
44614738
....@@ -4682,6 +4959,12 @@
46824959 // else
46834960 // applySelf(true);
46844961 // }
4962
+
4963
+ boolean Equal(double a, double b)
4964
+ {
4965
+ return Math.abs(a - b) < 0.001;
4966
+ }
4967
+
46854968 void applySelf0(boolean name)
46864969 {
46874970 if (name)
....@@ -4719,6 +5002,7 @@
47195002 current.shadow = (float) shadowField.getFloat();
47205003 current.texture = (float) textureField.getFloat();
47215004 current.opacity = (float) opacityField.getFloat();
5005
+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
47225006 current.fakedepth = (float) fakedepthField.getFloat();
47235007 current.shadowbias = (float) shadowbiasField.getFloat();
47245008
....@@ -4731,29 +5015,54 @@
47315015 {
47325016 cMaterial mat = copy.material;
47335017
4734
- colorField.SetToolTipValue((mat.color));
4735
- saturationField.SetToolTipValue((mat.modulation));
4736
- metalnessField.SetToolTipValue((mat.metalness));
4737
- diffuseField.SetToolTipValue((mat.diffuse));
4738
- specularField.SetToolTipValue((mat.specular));
4739
- shininessField.SetToolTipValue((mat.shininess));
4740
- shiftField.SetToolTipValue((mat.shift));
4741
- ambientField.SetToolTipValue((mat.ambient));
4742
- lightareaField.SetToolTipValue((mat.lightarea));
4743
- diffusenessField.SetToolTipValue((mat.factor));
4744
- velvetField.SetToolTipValue((mat.velvet));
4745
- sheenField.SetToolTipValue((mat.sheen));
4746
- subsurfaceField.SetToolTipValue((mat.subsurface));
4747
- backlitField.SetToolTipValue((mat.bump));
4748
- anisoField.SetToolTipValue((mat.aniso));
4749
- anisoVField.SetToolTipValue((mat.anisoV));
4750
- cameraField.SetToolTipValue((mat.cameralight));
4751
- selfshadowField.SetToolTipValue((mat.diffuseness));
4752
- shadowField.SetToolTipValue((mat.shadow));
4753
- textureField.SetToolTipValue((mat.texture));
4754
- opacityField.SetToolTipValue((mat.opacity));
4755
- fakedepthField.SetToolTipValue((mat.fakedepth));
4756
- 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));
47575066 }
47585067
47595068 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
....@@ -4788,7 +5097,7 @@
47885097
47895098 public void stateChanged(ChangeEvent e)
47905099 {
4791
- // assert(false);
5100
+ // assert(false);
47925101 if (e.getSource() == versionSlider)
47935102 {
47945103 if (muteSlider)
....@@ -5158,6 +5467,8 @@
51585467
51595468 if (previousVersionButton != null && copy.versionlist != null)
51605469 SetVersionStates();
5470
+
5471
+ cameraView.requestFocusInWindow();
51615472 }
51625473
51635474 static TweenManager tweenManager = new TweenManager();
....@@ -5189,7 +5500,7 @@
51895500 // group = (Composite) group.get(0);
51905501 // }
51915502
5192
- System.out.println("makeSomething of " + thing);
5503
+ //System.out.println("makeSomething of " + thing);
51935504
51945505 /*
51955506 if (deselect && jList != null)
....@@ -5543,6 +5854,7 @@
55435854
55445855 copy.versionlist = readobj.versionlist;
55455856 copy.versionindex = readobj.versionindex;
5857
+ copy.versiontable = readobj.versiontable;
55465858
55475859 if (copy.versionlist == null)
55485860 {
....@@ -5550,7 +5862,7 @@
55505862 copy.versionlist = new Object3D[100];
55515863 copy.versionindex = -1;
55525864
5553
- Save(true);
5865
+ //Save(true);
55545866 }
55555867
55565868 //? SetUndoStates();
....@@ -5898,6 +6210,7 @@
58986210 boolean materialFlushed;
58996211 Object3D latestObject;
59006212
6213
+ cGridBag transformPanel;
59016214 cGridBag XYZPanel;
59026215
59036216 JSplitPane gridPanel;
....@@ -6002,6 +6315,8 @@
60026315 cNumberSlider textureField;
60036316 JLabel opacityLabel;
60046317 cNumberSlider opacityField;
6318
+ JLabel parallaxLabel;
6319
+ cNumberSlider parallaxField;
60056320 JLabel fakedepthLabel;
60066321 cNumberSlider fakedepthField;
60076322 JLabel shadowbiasLabel;