Normand Briere
2019-08-08 8294241adc5fe698b70e13ebd6780af46ab83f7e
ObjEditor.java
....@@ -34,6 +34,7 @@
3434 iSendInfo
3535 //KeyListener
3636 {
37
+ public cToggleButton pinButton;
3738 boolean timeline;
3839 boolean wasFullScreen;
3940
....@@ -41,64 +42,78 @@
4142 JFrame frame;
4243
4344 static ObjEditor theFrame;
45
+
46
+ public cGridBag GetSeparator()
47
+ {
48
+ cGridBag separator = new cGridBag();
49
+ separator.add(new JSeparator());
50
+ separator.preferredHeight = 5;
51
+ return separator;
52
+ }
4453
4554 cButton GetButton(String name, boolean border)
4655 {
47
- try
48
- {
49
- ImageIcon icon = GetIcon(name);
50
- return new cButton(icon, border);
51
- }
52
- catch (Exception e)
53
- {
54
- return new cButton(name, border);
55
- }
56
+ ImageIcon icon = GetIcon(name);
57
+ return new cButton(icon, border);
58
+ }
59
+
60
+ cLabel GetLabel(String name, boolean border)
61
+ {
62
+ //ImageIcon icon = GetIcon(name);
63
+ return new cLabel(GetImage(name), border);
5664 }
5765
5866 cToggleButton GetToggleButton(String name, boolean border)
5967 {
60
- try
61
- {
62
- ImageIcon icon = GetIcon(name);
63
- return new cToggleButton(icon, border);
64
- }
65
- catch (Exception e)
66
- {
67
- return new cToggleButton(name, border);
68
- }
68
+ ImageIcon icon = GetIcon(name);
69
+ return new cToggleButton(icon, border);
6970 }
7071
7172 cCheckBox GetCheckBox(String name, boolean border)
7273 {
74
+ ImageIcon icon = GetIcon(name);
75
+ return new cCheckBox(icon, border);
76
+ }
77
+
78
+ ImageIcon GetIcon(String name)
79
+ {
7380 try
7481 {
75
- ImageIcon icon = GetIcon(name);
76
- return new cCheckBox(icon, border);
82
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
83
+
84
+// if (image.getWidth() > 48 && image.getHeight() > 48)
85
+// {
86
+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
87
+// Graphics2D g = resized.createGraphics();
88
+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
89
+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
90
+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
91
+// g.dispose();
92
+//
93
+// image = resized;
94
+// }
95
+
96
+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
97
+ return icon;
7798 }
7899 catch (Exception e)
79100 {
80
- return new cCheckBox(name, border);
101
+ return null;
81102 }
82103 }
83
-
84
- private ImageIcon GetIcon(String name) throws IOException
104
+
105
+ BufferedImage GetImage(String name)
85106 {
86
- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87
-
88
- if (image.getWidth() != 24 && image.getHeight() != 24)
107
+ try
89108 {
90
- BufferedImage resized = new BufferedImage(24, 24, image.getType());
91
- Graphics2D g = resized.createGraphics();
92
- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93
- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94
- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95
- g.dispose();
96
-
97
- image = resized;
109
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
110
+
111
+ return image;
98112 }
99
-
100
- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101
- return icon;
113
+ catch (Exception e)
114
+ {
115
+ return null;
116
+ }
102117 }
103118
104119 // SCRIPT
....@@ -282,6 +297,12 @@
282297 client = inClient;
283298 copy = client;
284299
300
+ if (copy.versionlist == null)
301
+ {
302
+ copy.versionlist = new Object3D[100];
303
+ copy.versionindex = -1;
304
+ }
305
+
285306 // "this" is not called: SetupUI2(objEditor);
286307 }
287308
....@@ -295,6 +316,12 @@
295316 client = inClient;
296317 copy = client;
297318
319
+ if (copy.versionlist == null)
320
+ {
321
+ copy.versionlist = new Object3D[100];
322
+ copy.versionindex = -1;
323
+ }
324
+
298325 SetupUI2(callee.GetEditor());
299326 }
300327
....@@ -327,6 +354,12 @@
327354 copy = localCopy;
328355 copy.editWindow = this;
329356
357
+ if (copy.versionlist == null)
358
+ {
359
+// copy.versions = new byte[100][];
360
+// copy.versionindex = -1;
361
+ }
362
+
330363 SetupMenu();
331364
332365 //SetupName(objEditor); // new
....@@ -419,11 +452,12 @@
419452
420453 toolbarPanel = new JPanel();
421454 toolbarPanel.setName("Toolbar");
455
+
422456 treePanel = new cGridBag();
423457 treePanel.setName("Tree");
424458
425459 editPanel = new cGridBag().setVertical(true);
426
- editPanel.setName("Edit");
460
+ //editPanel.setName("Edit");
427461
428462 ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429463
....@@ -431,11 +465,13 @@
431465 editPanel.add(editCommandsPanel);
432466 editPanel.add(ctrlPanel);
433467
434
- toolboxPanel = new cGridBag().setVertical(false);
435
- toolboxPanel.setName("Toolbox");
468
+ toolboxPanel = new cGridBag().setVertical(true);
469
+ //toolboxPanel.setName("Toolbox");
436470
437
- materialPanel = new cGridBag().setVertical(true);
438
- materialPanel.setName("Material");
471
+ skyboxPanel = new cGridBag().setVertical(true);
472
+
473
+ materialPanel = new cGridBag().setVertical(false);
474
+ //materialPanel.setName("Material");
439475
440476 /*JTextPane*/
441477 infoarea = createTextPane();
....@@ -443,6 +479,7 @@
443479
444480 infoarea.setEditable(true);
445481 SetText();
482
+
446483 // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447484 // infoarea.setOpaque(false);
448485 // //infoarea.setForeground(textcolor);
....@@ -450,7 +487,7 @@
450487 // TEXTAREA infoarea.setWrapStyleWord(true);
451488 infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452489 infoPanel.setPreferredSize(new Dimension(1, 1));
453
- infoPanel.setName("Info");
490
+ //infoPanel.setName("Info");
454491 //infoPanel.setLayout(new BorderLayout());
455492 //infoPanel.add(createTextPane());
456493
....@@ -814,7 +851,32 @@
814851 //frame.setVisible(true);
815852 }
816853 frame.validate();
854
+
855
+ cameraView.requestFocusInWindow();
817856 }
857
+
858
+ private Object3D CompressCopy()
859
+ {
860
+ boolean temp = CameraPane.SWITCH;
861
+ CameraPane.SWITCH = false;
862
+
863
+ copy.ExtractBigData(versiontable);
864
+ // if (copy == client)
865
+
866
+ Object3D versions[] = copy.versionlist;
867
+ copy.versionlist = null;
868
+
869
+ //byte[] compress = Compress(copy);
870
+ Object3D compress = (Object3D)Grafreed.clone(copy);
871
+
872
+ copy.versionlist = versions;
873
+
874
+ copy.RestoreBigData(versiontable);
875
+
876
+ CameraPane.SWITCH = temp;
877
+
878
+ return compress;
879
+ }
818880
819881 private JTextPane createTextPane()
820882 {
....@@ -937,6 +999,7 @@
937999 {
9381000 SetupMaterial(materialPanel);
9391001 }
1002
+
9401003 //SetupName();
9411004 //SetupViews();
9421005 }
....@@ -946,7 +1009,7 @@
9461009 // NumberSlider vDivsField;
9471010 // JCheckBox endcaps;
9481011 JCheckBox liveCB;
949
- JCheckBox selectCB;
1012
+ JCheckBox selectableCB;
9501013 JCheckBox hideCB;
9511014 JCheckBox link2masterCB;
9521015 JCheckBox markCB;
....@@ -1145,6 +1208,18 @@
11451208
11461209 namePanel = new cGridBag();
11471210
1211
+ //if (copy.pinned)
1212
+ {
1213
+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1214
+ pinButton.setSelected(copy.pinned);
1215
+ cGridBag t = new cGridBag();
1216
+ t.preferredWidth = 2;
1217
+ t.add(pinButton);
1218
+ namePanel.add(t);
1219
+
1220
+ pinButton.addItemListener(this);
1221
+ }
1222
+
11481223 nameField = AddText(namePanel, copy.GetName());
11491224 namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
11501225 oe.ctrlPanel.add(namePanel);
....@@ -1158,13 +1233,16 @@
11581233
11591234 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
11601235 liveCB.setToolTipText("Animate object");
1161
- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162
- selectCB.setToolTipText("Make object selectable");
1236
+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1237
+ selectableCB.setToolTipText("Make object selectable");
11631238 // Return();
1239
+
11641240 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
11651241 hideCB.setToolTipText("Hide object");
11661242 markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
11671243 markCB.setToolTipText("As animation target transform");
1244
+
1245
+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
11681246
11691247 setupPanel2 = new cGridBag().setVertical(false);
11701248
....@@ -1452,6 +1530,7 @@
14521530 XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
14531531 XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
14541532 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1533
+ //XYZPanel.setName("XYZ");
14551534
14561535 /*
14571536 gridPanel = new JPanel(); //new BorderLayout());
....@@ -1489,17 +1568,29 @@
14891568 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
14901569 //tmp.setName("Edit");
14911570 objectPanel.add(materialPanel);
1571
+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1572
+ objectPanel.setToolTipTextAt(0, "Material");
1573
+
1574
+ objectPanel.add(toolboxPanel);
1575
+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1576
+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1577
+
1578
+ objectPanel.add(skyboxPanel);
1579
+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1580
+ objectPanel.setToolTipTextAt(2, "Backgrounds");
1581
+
14921582 // JPanel north = new JPanel(new BorderLayout());
14931583 // north.setName("Edit");
14941584 // north.add(ctrlPanel, BorderLayout.NORTH);
14951585 // objectPanel.add(north);
14961586 objectPanel.add(editPanel);
1587
+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1588
+ objectPanel.setToolTipTextAt(3, "Edit controls");
14971589
1498
- //if (Globals.ADVANCED)
1499
- objectPanel.add(infoPanel);
1590
+ objectPanel.add(XYZPanel);
1591
+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1592
+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
15001593
1501
- objectPanel.add(toolboxPanel);
1502
-
15031594 /*
15041595 aConstraints.gridx = 0;
15051596 aConstraints.gridwidth = 1;
....@@ -1519,7 +1610,7 @@
15191610 scrollpane.addMouseWheelListener(this); // Default not fast enough
15201611
15211612 /*JTabbedPane*/ scenePanel = new cGridBag();
1522
- scenePanel.preferredWidth = 6;
1613
+ scenePanel.preferredWidth = 5;
15231614
15241615 JTabbedPane tabbedPane = new JTabbedPane();
15251616 tabbedPane.add(scrollpane);
....@@ -1536,6 +1627,11 @@
15361627
15371628 scenePanel.add(tabbedPane);
15381629
1630
+ //if (Globals.ADVANCED)
1631
+ tabbedPane.add(infoPanel);
1632
+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1633
+ tabbedPane.setToolTipTextAt(3, "Information");
1634
+
15391635 /*
15401636 cTree jTree = new cTree(null);
15411637 ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1597,7 +1693,7 @@
15971693 bigThree = new cGridBag();
15981694 bigThree.addComponent(scenePanel);
15991695 bigThree.addComponent(centralPanel);
1600
- bigThree.addComponent(XYZPanel);
1696
+ //bigThree.addComponent(XYZPanel);
16011697
16021698 // // SIDE EFFECT!!!
16031699 // aConstraints.gridx = 0;
....@@ -1638,7 +1734,6 @@
16381734 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16391735 frame.addWindowListener(new WindowAdapter()
16401736 {
1641
-
16421737 public void windowClosing(WindowEvent e)
16431738 {
16441739 Close();
....@@ -1661,12 +1756,384 @@
16611756 ctrlPanel.removeAll();
16621757 }
16631758
1664
- void SetupMaterial(cGridBag panel)
1759
+ void SetupMaterial(cGridBag materialpanel)
16651760 {
1666
- /*
1761
+ cGridBag presetpanel = new cGridBag().setVertical(true);
1762
+
1763
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1764
+ skin.setToolTipText("Skin");
1765
+ skin.addMouseListener(new MouseAdapter()
1766
+ {
1767
+ public void mouseClicked(MouseEvent e)
1768
+ {
1769
+ Object3D object = Grafreed.materials.versionlist[0].get(0);
1770
+ cMaterial material = object.material;
1771
+
1772
+ // Skin
1773
+ colorField.setFloat(material.color);
1774
+ saturationField.setFloat(material.modulation);
1775
+ subsurfaceField.setFloat(material.subsurface);
1776
+ selfshadowField.setFloat(material.diffuseness);
1777
+ diffusenessField.setFloat(material.factor);
1778
+ shininessField.setFloat(material.shininess);
1779
+ shadowbiasField.setFloat(material.shadowbias);
1780
+ diffuseField.setFloat(material.diffuse);
1781
+ specularField.setFloat(material.specular);
1782
+
1783
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
1784
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
1785
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
1786
+
1787
+ materialtouched = true;
1788
+ applySelf();
1789
+ }
1790
+ });
1791
+ presetpanel.add(skin);
1792
+
1793
+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
1794
+ lambert.setToolTipText("Diffuse");
1795
+ lambert.addMouseListener(new MouseAdapter()
1796
+ {
1797
+ public void mouseClicked(MouseEvent e)
1798
+ {
1799
+ Object3D object = Grafreed.materials.versionlist[2].get(0);
1800
+ cMaterial material = object.material;
1801
+
1802
+ diffusenessField.setFloat(material.factor);
1803
+ selfshadowField.setFloat(material.diffuseness);
1804
+
1805
+ materialtouched = true;
1806
+ applySelf();
1807
+ }
1808
+ });
1809
+ presetpanel.add(lambert);
1810
+
1811
+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
1812
+ diffuse2.setToolTipText("Diffuse2");
1813
+ diffuse2.addMouseListener(new MouseAdapter()
1814
+ {
1815
+ public void mouseClicked(MouseEvent e)
1816
+ {
1817
+ Object3D object = Grafreed.materials.versionlist[3].get(0);
1818
+ cMaterial material = object.material;
1819
+
1820
+ diffusenessField.setFloat(material.factor);
1821
+ selfshadowField.setFloat(material.diffuseness);
1822
+
1823
+ materialtouched = true;
1824
+ applySelf();
1825
+ }
1826
+ });
1827
+ presetpanel.add(diffuse2);
1828
+
1829
+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
1830
+ diffusemoon.setToolTipText("Moon");
1831
+ diffusemoon.addMouseListener(new MouseAdapter()
1832
+ {
1833
+ public void mouseClicked(MouseEvent e)
1834
+ {
1835
+ Object3D object = Grafreed.materials.versionlist[4].get(0);
1836
+ cMaterial material = object.material;
1837
+
1838
+ diffusenessField.setFloat(material.factor);
1839
+ selfshadowField.setFloat(material.diffuseness);
1840
+
1841
+ materialtouched = true;
1842
+ applySelf();
1843
+ }
1844
+ });
1845
+ presetpanel.add(diffusemoon);
1846
+
1847
+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
1848
+ diffusemoon2.setToolTipText("Moon2");
1849
+ diffusemoon2.addMouseListener(new MouseAdapter()
1850
+ {
1851
+ public void mouseClicked(MouseEvent e)
1852
+ {
1853
+ Object3D object = Grafreed.materials.versionlist[5].get(0);
1854
+ cMaterial material = object.material;
1855
+
1856
+ diffusenessField.setFloat(material.factor);
1857
+ selfshadowField.setFloat(material.diffuseness);
1858
+
1859
+ materialtouched = true;
1860
+ applySelf();
1861
+ }
1862
+ });
1863
+ presetpanel.add(diffusemoon2);
1864
+
1865
+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
1866
+ diffusemoon3.setToolTipText("Moon3");
1867
+ diffusemoon3.addMouseListener(new MouseAdapter()
1868
+ {
1869
+ public void mouseClicked(MouseEvent e)
1870
+ {
1871
+ Object3D object = Grafreed.materials.versionlist[6].get(0);
1872
+ cMaterial material = object.material;
1873
+
1874
+ diffusenessField.setFloat(material.factor);
1875
+ selfshadowField.setFloat(material.diffuseness);
1876
+
1877
+ materialtouched = true;
1878
+ applySelf();
1879
+ }
1880
+ });
1881
+ presetpanel.add(diffusemoon3);
1882
+
1883
+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
1884
+ diffusesheen.setToolTipText("Sheen");
1885
+ diffusesheen.addMouseListener(new MouseAdapter()
1886
+ {
1887
+ public void mouseClicked(MouseEvent e)
1888
+ {
1889
+ Object3D object = Grafreed.materials.versionlist[7].get(0);
1890
+ cMaterial material = object.material;
1891
+
1892
+ sheenField.setFloat(material.sheen);
1893
+
1894
+ materialtouched = true;
1895
+ applySelf();
1896
+ }
1897
+ });
1898
+ presetpanel.add(diffusesheen);
1899
+
1900
+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1901
+ rough.setToolTipText("Rough metal");
1902
+ rough.addMouseListener(new MouseAdapter()
1903
+ {
1904
+ public void mouseClicked(MouseEvent e)
1905
+ {
1906
+ Object3D object = Grafreed.materials.versionlist[1].get(0);
1907
+ cMaterial material = object.material;
1908
+
1909
+ shininessField.setFloat(material.shininess);
1910
+ velvetField.setFloat(material.velvet);
1911
+
1912
+ materialtouched = true;
1913
+ applySelf();
1914
+ }
1915
+ });
1916
+ presetpanel.add(rough);
1917
+
1918
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
1919
+ rough2.setToolTipText("Medium metal");
1920
+ rough2.addMouseListener(new MouseAdapter()
1921
+ {
1922
+ public void mouseClicked(MouseEvent e)
1923
+ {
1924
+ Object3D object = Grafreed.materials.versionlist[13].get(0);
1925
+ cMaterial material = object.material;
1926
+
1927
+ shininessField.setFloat(material.shininess);
1928
+ lightareaField.setFloat(material.lightarea);
1929
+
1930
+ materialtouched = true;
1931
+ applySelf();
1932
+ }
1933
+ });
1934
+ presetpanel.add(rough2);
1935
+
1936
+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
1937
+ shini0.setToolTipText("Shiny");
1938
+ shini0.addMouseListener(new MouseAdapter()
1939
+ {
1940
+ public void mouseClicked(MouseEvent e)
1941
+ {
1942
+ Object3D object = Grafreed.materials.versionlist[14].get(0);
1943
+ cMaterial material = object.material;
1944
+
1945
+ shininessField.setFloat(material.shininess);
1946
+ lightareaField.setFloat(material.lightarea);
1947
+
1948
+ materialtouched = true;
1949
+ applySelf();
1950
+ }
1951
+ });
1952
+ presetpanel.add(shini0);
1953
+
1954
+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
1955
+ shini1.setToolTipText("Shiny2");
1956
+ shini1.addMouseListener(new MouseAdapter()
1957
+ {
1958
+ public void mouseClicked(MouseEvent e)
1959
+ {
1960
+ Object3D object = Grafreed.materials.versionlist[11].get(0);
1961
+ cMaterial material = object.material;
1962
+
1963
+ shininessField.setFloat(material.shininess);
1964
+ lightareaField.setFloat(material.lightarea);
1965
+
1966
+ materialtouched = true;
1967
+ applySelf();
1968
+ }
1969
+ });
1970
+ presetpanel.add(shini1);
1971
+
1972
+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
1973
+ shini2.setToolTipText("Shiny3");
1974
+ shini2.addMouseListener(new MouseAdapter()
1975
+ {
1976
+ public void mouseClicked(MouseEvent e)
1977
+ {
1978
+ Object3D object = Grafreed.materials.versionlist[12].get(0);
1979
+ cMaterial material = object.material;
1980
+
1981
+ shininessField.setFloat(material.shininess);
1982
+ lightareaField.setFloat(material.lightarea);
1983
+
1984
+ materialtouched = true;
1985
+ applySelf();
1986
+ }
1987
+ });
1988
+ presetpanel.add(shini2);
1989
+
1990
+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
1991
+ aniso.setToolTipText("AnisoU");
1992
+ aniso.addMouseListener(new MouseAdapter()
1993
+ {
1994
+ public void mouseClicked(MouseEvent e)
1995
+ {
1996
+ Object3D object = Grafreed.materials.versionlist[8].get(0);
1997
+ cMaterial material = object.material;
1998
+
1999
+ anisoField.setFloat(material.aniso);
2000
+ anisoVField.setFloat(material.anisoV);
2001
+
2002
+ materialtouched = true;
2003
+ applySelf();
2004
+ }
2005
+ });
2006
+ presetpanel.add(aniso);
2007
+
2008
+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2009
+ aniso2.setToolTipText("AnisoV");
2010
+ aniso2.addMouseListener(new MouseAdapter()
2011
+ {
2012
+ public void mouseClicked(MouseEvent e)
2013
+ {
2014
+ Object3D object = Grafreed.materials.versionlist[9].get(0);
2015
+ cMaterial material = object.material;
2016
+
2017
+ anisoField.setFloat(material.aniso);
2018
+ anisoVField.setFloat(material.anisoV);
2019
+
2020
+ materialtouched = true;
2021
+ applySelf();
2022
+ }
2023
+ });
2024
+ presetpanel.add(aniso2);
2025
+
2026
+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2027
+ aniso3.setToolTipText("AnisoUV");
2028
+ aniso3.addMouseListener(new MouseAdapter()
2029
+ {
2030
+ public void mouseClicked(MouseEvent e)
2031
+ {
2032
+ Object3D object = Grafreed.materials.versionlist[10].get(0);
2033
+ cMaterial material = object.material;
2034
+
2035
+ anisoField.setFloat(material.aniso);
2036
+ anisoVField.setFloat(material.anisoV);
2037
+
2038
+ materialtouched = true;
2039
+ applySelf();
2040
+ }
2041
+ });
2042
+ presetpanel.add(aniso3);
2043
+
2044
+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2045
+ velvet0.setToolTipText("Velvet");
2046
+ velvet0.addMouseListener(new MouseAdapter()
2047
+ {
2048
+ public void mouseClicked(MouseEvent e)
2049
+ {
2050
+ Object3D object = Grafreed.materials.versionlist[15].get(0);
2051
+ cMaterial material = object.material;
2052
+
2053
+ diffusenessField.setFloat(material.factor);
2054
+ selfshadowField.setFloat(material.diffuseness);
2055
+ sheenField.setFloat(material.sheen);
2056
+ shininessField.setFloat(material.shininess);
2057
+ velvetField.setFloat(material.velvet);
2058
+ shiftField.setFloat(material.shift);
2059
+
2060
+ materialtouched = true;
2061
+ applySelf();
2062
+ }
2063
+ });
2064
+ presetpanel.add(velvet0);
2065
+
2066
+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2067
+ bump0.setToolTipText("Bump texture");
2068
+ bump0.addMouseListener(new MouseAdapter()
2069
+ {
2070
+ public void mouseClicked(MouseEvent e)
2071
+ {
2072
+ Object3D object = Grafreed.materials.versionlist[16].get(0);
2073
+ cMaterial material = object.material;
2074
+
2075
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2076
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2077
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2078
+
2079
+ materialtouched = true;
2080
+ applySelf();
2081
+ }
2082
+ });
2083
+ presetpanel.add(bump0);
2084
+
2085
+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2086
+ halo.setToolTipText("Halo");
2087
+ halo.addMouseListener(new MouseAdapter()
2088
+ {
2089
+ public void mouseClicked(MouseEvent e)
2090
+ {
2091
+ Object3D object = Grafreed.materials.versionlist[17].get(0);
2092
+ cMaterial material = object.material;
2093
+
2094
+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2095
+
2096
+ materialtouched = true;
2097
+ applySelf();
2098
+ }
2099
+ });
2100
+ presetpanel.add(halo);
2101
+
2102
+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2103
+ candle.setToolTipText("Candle");
2104
+ candle.addMouseListener(new MouseAdapter()
2105
+ {
2106
+ public void mouseClicked(MouseEvent e)
2107
+ {
2108
+ Object3D object = Grafreed.materials.versionlist[18].get(0);
2109
+ cMaterial material = object.material;
2110
+
2111
+ subsurfaceField.setFloat(material.subsurface);
2112
+ shadowbiasField.setFloat(material.shadowbias);
2113
+ ambientField.setFloat(material.ambient);
2114
+ specularField.setFloat(material.specular);
2115
+ lightareaField.setFloat(material.lightarea);
2116
+ shininessField.setFloat(material.shininess);
2117
+
2118
+ materialtouched = true;
2119
+ applySelf();
2120
+ }
2121
+ });
2122
+ presetpanel.add(candle);
2123
+
2124
+ cGridBag panel = new cGridBag().setVertical(true);
2125
+
2126
+ presetpanel.preferredWidth = 1;
2127
+
2128
+ materialpanel.add(presetpanel);
2129
+ materialpanel.add(panel);
2130
+
2131
+ panel.preferredWidth = 8;
2132
+
2133
+ /*
16672134 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
16682135 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1669
- */
2136
+ */
16702137
16712138 cGridBag editBar = new cGridBag().setVertical(false);
16722139
....@@ -1700,27 +2167,50 @@
17002167 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17012168
17022169 cGridBag colorSection = new cGridBag().setVertical(true);
2170
+
2171
+ cGridBag huepanel = new cGridBag();
2172
+ cGridBag huelabel = new cGridBag();
2173
+ skin = GetLabel("icons/hue.png", false);
2174
+ skin.fit = true;
2175
+ huelabel.add(skin);
2176
+ huelabel.preferredWidth = 20;
2177
+ huepanel.add(new cGridBag()); // Label
2178
+ huepanel.add(huelabel); // Field/slider
2179
+
2180
+ huepanel.preferredHeight = 7;
2181
+
2182
+ colorSection.add(huepanel);
17032183
17042184 cGridBag color = new cGridBag();
1705
- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1706
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1707
- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2185
+
2186
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
2187
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2188
+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2189
+
17082190 //colorField.preferredWidth = 200;
17092191 colorSection.add(color);
17102192
17112193 cGridBag modulation = new cGridBag();
17122194 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
17132195 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1714
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2196
+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
17152197 colorSection.add(modulation);
17162198
2199
+ cGridBag opacity = new cGridBag();
2200
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
2201
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2202
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2203
+ colorSection.add(opacity);
2204
+
2205
+ colorSection.add(GetSeparator());
2206
+
17172207 cGridBag texture = new cGridBag();
17182208 texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
17192209 textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17202210 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
17212211 colorSection.add(texture);
17222212
1723
- panel.add(new JSeparator());
2213
+ panel.add(GetSeparator());
17242214
17252215 panel.add(colorSection);
17262216
....@@ -1776,7 +2266,7 @@
17762266 shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
17772267 diffuseSection.add(shadowbias);
17782268
1779
- panel.add(new JSeparator());
2269
+ panel.add(GetSeparator());
17802270
17812271 panel.add(diffuseSection);
17822272
....@@ -1839,7 +2329,7 @@
18392329 specularSection.add(anisoV);
18402330
18412331
1842
- panel.add(new JSeparator());
2332
+ panel.add(GetSeparator());
18432333
18442334 panel.add(specularSection);
18452335
....@@ -1864,12 +2354,6 @@
18642354 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18652355 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
18662356 colorSection.add(backlit);
1867
-
1868
- cGridBag opacity = new cGridBag();
1869
- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1870
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1871
- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1872
- colorSection.add(opacity);
18732357
18742358 //panel.add(new JSeparator());
18752359
....@@ -1915,7 +2399,7 @@
19152399 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
19162400 textureSection.add(opacityPower);
19172401
1918
- panel.add(new JSeparator());
2402
+ panel.add(GetSeparator());
19192403
19202404 panel.add(textureSection);
19212405
....@@ -2902,7 +3386,7 @@
29023386
29033387 freezematerial = true;
29043388 colorField.setFloat(mat.color);
2905
- modulationField.setFloat(mat.modulation);
3389
+ saturationField.setFloat(mat.modulation);
29063390 metalnessField.setFloat(mat.metalness);
29073391 diffuseField.setFloat(mat.diffuse);
29083392 specularField.setFloat(mat.specular);
....@@ -3109,6 +3593,17 @@
31093593 public void itemStateChanged(ItemEvent event)
31103594 {
31113595 // System.out.println("Propagate = " + propagate);
3596
+ if (event.getSource() == pinButton)
3597
+ {
3598
+ copy.pinned ^= true;
3599
+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3600
+ {
3601
+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
3602
+ copy.CloseUI();
3603
+ //copy.editWindow.refreshContents();
3604
+ }
3605
+ }
3606
+ else
31123607 if (event.getSource() == propagateToggle)
31133608 {
31143609 propagate ^= true;
....@@ -3213,8 +3708,9 @@
32133708 } else if (event.getSource() == liveCB)
32143709 {
32153710 copy.live ^= true;
3711
+ objEditor.refreshContents(true); // To show item colors
32163712 return;
3217
- } else if (event.getSource() == selectCB)
3713
+ } else if (event.getSource() == selectableCB)
32183714 {
32193715 copy.dontselect ^= true;
32203716 return;
....@@ -3222,7 +3718,7 @@
32223718 {
32233719 copy.hide ^= true;
32243720 copy.Touch(); // display list issue
3225
- objEditor.refreshContents();
3721
+ objEditor.refreshContents(true); // To show item colors
32263722 return;
32273723 } else if (event.getSource() == link2masterCB)
32283724 {
....@@ -3478,6 +3974,7 @@
34783974
34793975 static public byte[] Compress(Object3D o)
34803976 {
3977
+ // Slower to actually compress.
34813978 try
34823979 {
34833980 ByteArrayOutputStream baos = new ByteArrayOutputStream();
....@@ -3574,11 +4071,12 @@
35744071 return null;
35754072 }
35764073
3577
- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35784074
35794075 public void Save()
35804076 {
3581
- Save(true);
4077
+ //Save(true);
4078
+ Replace();
4079
+ SetUndoStates();
35824080 }
35834081
35844082 private boolean Equal(byte[] compress, byte[] name)
....@@ -3597,50 +4095,62 @@
35974095 return true;
35984096 }
35994097
4098
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4099
+
4100
+ void DeleteVersion()
4101
+ {
4102
+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
4103
+ {
4104
+ copy.versionlist[i] = copy.versionlist[i+1];
4105
+ }
4106
+
4107
+ CopyChanged();
4108
+
4109
+ SetUndoStates();
4110
+ }
4111
+
36004112 public boolean Save(boolean user)
36014113 {
36024114 System.err.println("Save");
4115
+ //Replace();
36034116
36044117 cRadio tab = GetCurrentTab();
36054118
3606
- boolean temp = CameraPane.SWITCH;
3607
- CameraPane.SWITCH = false;
3608
-
3609
- copy.ExtractBigData(hashtable);
3610
-
3611
- byte[] compress = Compress(copy);
3612
-
3613
- CameraPane.SWITCH = temp;
4119
+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
36144120
36154121 boolean thesame = false;
36164122
3617
- // Quick heuristic using length. Works only when stream is compressed.
3618
- if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
3619
- {
3620
- thesame = true;
3621
- }
4123
+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
4124
+// {
4125
+// thesame = true;
4126
+// }
36224127
36234128 //EditorFrame.m_MainFrame.requestFocusInWindow();
36244129 if (!thesame)
36254130 {
3626
- //tab.user[tab.undoindex] = user;
3627
- boolean increment = tab.graphs[tab.undoindex] == null;
4131
+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
4132
+ {
4133
+ copy.versionlist[i] = copy.versionlist[i-1];
4134
+ }
36284135
3629
- tab.graphs[tab.undoindex] = compress;
4136
+ //tab.user[tab.versionindex] = user;
4137
+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
36304138
3631
- if (increment)
3632
- tab.undoindex++;
4139
+ copy.versionlist[++copy.versionindex] = compress;
4140
+
4141
+ // if (increment)
4142
+ // tab.versionindex++;
36334143 }
36344144
3635
- copy.RestoreBigData(hashtable);
4145
+ //copy.RestoreBigData(versiontable);
36364146
36374147 //assert(hashtable.isEmpty());
36384148
3639
- for (int i = tab.undoindex; i < tab.graphs.length; i++)
3640
- {
3641
- //tab.user[i] = false;
3642
- // tab.graphs[i] = null;
3643
- }
4149
+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
4150
+// {
4151
+// //tab.user[i] = false;
4152
+// copy.versionlist[i] = null;
4153
+// }
36444154
36454155 SetUndoStates();
36464156
....@@ -3649,7 +4159,7 @@
36494159 {
36504160 try
36514161 {
3652
- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
4162
+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
36534163 ObjectOutputStream p = new ObjectOutputStream(ostream);
36544164
36554165 p.writeObject(copy);
....@@ -3665,27 +4175,65 @@
36654175
36664176 return !thesame;
36674177 }
3668
-
3669
- void CopyChanged(Object3D obj)
4178
+
4179
+ boolean flashIt = true;
4180
+
4181
+ void RefreshSelection()
36704182 {
4183
+ Object3D selection = new Object3D();
4184
+
4185
+ for (int i = 0; i < copy.selection.size(); i++)
4186
+ {
4187
+ Object3D elem = copy.selection.elementAt(i);
4188
+
4189
+ Object3D obj = copy.GetObject(elem.GetUUID());
4190
+
4191
+ if (obj == null)
4192
+ {
4193
+ copy.selection.remove(i--);
4194
+ }
4195
+ else
4196
+ {
4197
+ selection.add(obj);
4198
+ copy.selection.setElementAt(obj, i);
4199
+ }
4200
+ }
4201
+
4202
+ flashIt = false;
4203
+ GetTree().clearSelection();
4204
+ for (int i = 0; i < selection.size(); i++)
4205
+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
4206
+ flashIt = true;
4207
+
4208
+ //refreshContents(false);
4209
+ }
4210
+
4211
+ void CopyChanged()
4212
+ {
4213
+ Object3D obj = copy.versionlist[copy.versionindex];
4214
+
36714215 SetUndoStates();
36724216
36734217 boolean temp = CameraPane.SWITCH;
36744218 CameraPane.SWITCH = false;
36754219
3676
- copy.ExtractBigData(hashtable);
4220
+ copy.ExtractBigData(versiontable);
36774221
36784222 copy.clear();
36794223
4224
+ copy.skyboxname = obj.skyboxname;
4225
+ copy.skyboxext = obj.skyboxext;
4226
+
36804227 for (int i=0; i<obj.Size(); i++)
36814228 {
36824229 copy.add(obj.get(i));
36834230 }
36844231
3685
- copy.RestoreBigData(hashtable);
4232
+ copy.RestoreBigData(versiontable);
36864233
36874234 CameraPane.SWITCH = temp;
36884235
4236
+ RefreshSelection();
36894237 //assert(hashtable.isEmpty());
36904238
36914239 copy.Touch();
....@@ -3706,68 +4254,139 @@
37064254 }
37074255 }
37084256
3709
- refreshContents();
4257
+ refreshContents(true);
37104258 }
37114259
3712
- cButton undoButton;
3713
- cButton redoButton;
4260
+ cButton previousVersionButton;
4261
+ cButton restoreButton;
4262
+ cButton replaceButton;
4263
+ cButton nextVersionButton;
4264
+ cButton saveVersionButton;
4265
+ cButton deleteVersionButton;
37144266
4267
+ boolean muteSlider;
4268
+
4269
+ int VersionCount()
4270
+ {
4271
+ int count = 0;
4272
+
4273
+ for (int i = copy.versionlist.length; --i >= 0;)
4274
+ {
4275
+ if (copy.versionlist[i] != null)
4276
+ count++;
4277
+ }
4278
+
4279
+ return count;
4280
+ }
4281
+
37154282 void SetUndoStates()
37164283 {
37174284 cRadio tab = GetCurrentTab();
37184285
3719
- undoButton.setEnabled(tab.undoindex > 0);
3720
- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
4286
+ restoreButton.setEnabled(true); // copy.versionindex != -1);
4287
+ replaceButton.setEnabled(true); // copy.versionindex != -1);
4288
+
4289
+ previousVersionButton.setEnabled(copy.versionindex > 0);
4290
+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4291
+
4292
+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4293
+ copy.versionlist[copy.versionindex + 1] != null);
4294
+
4295
+ muteSlider = true;
4296
+ versionSlider.setMaximum(VersionCount() - 1);
4297
+ versionSlider.setInteger(copy.versionindex);
4298
+ muteSlider = false;
37214299 }
37224300
3723
- public boolean Undo()
4301
+ public boolean PreviousVersion()
37244302 {
4303
+ // Option?
4304
+ Replace();
4305
+
37254306 System.err.println("Undo");
37264307
37274308 cRadio tab = GetCurrentTab();
37284309
3729
- if (tab.undoindex == 0)
4310
+ if (copy.versionindex == 0)
37304311 {
37314312 java.awt.Toolkit.getDefaultToolkit().beep();
37324313 return false;
37334314 }
37344315
3735
- if (tab.graphs[tab.undoindex] == null) // || !tab.user[tab.undoindex])
3736
- {
3737
- if (Save(false))
3738
- tab.undoindex -= 1;
3739
- else
3740
- {
3741
- if (tab.undoindex <= 0)
3742
- return false;
3743
- else
3744
- tab.undoindex -= 1;
3745
- }
3746
- }
4316
+// if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
4317
+// {
4318
+// if (Save(false))
4319
+// tab.versionindex -= 1;
4320
+// else
4321
+// {
4322
+// if (tab.versionindex <= 0)
4323
+// return false;
4324
+// else
4325
+// tab.versionindex -= 1;
4326
+// }
4327
+// }
37474328
3748
- tab.undoindex -= 1;
4329
+ copy.versionindex -= 1;
37494330
3750
- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
4331
+ CopyChanged();
37514332
37524333 return true;
37534334 }
37544335
3755
- public void Redo()
4336
+ public boolean Restore()
37564337 {
4338
+ System.err.println("Restore");
4339
+
37574340 cRadio tab = GetCurrentTab();
37584341
3759
- if (tab.graphs[tab.undoindex + 1] == null)
4342
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4343
+ {
4344
+ java.awt.Toolkit.getDefaultToolkit().beep();
4345
+ return false;
4346
+ }
4347
+
4348
+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4349
+ CopyChanged();
4350
+
4351
+ return true;
4352
+ }
4353
+
4354
+ public boolean Replace()
4355
+ {
4356
+ System.err.println("Replace");
4357
+
4358
+ cRadio tab = GetCurrentTab();
4359
+
4360
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4361
+ {
4362
+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
4363
+ return false;
4364
+ }
4365
+
4366
+ copy.versionlist[copy.versionindex] = CompressCopy();
4367
+
4368
+ return true;
4369
+ }
4370
+
4371
+ public void NextVersion()
4372
+ {
4373
+ // Option?
4374
+ Replace();
4375
+
4376
+ cRadio tab = GetCurrentTab();
4377
+
4378
+ if (copy.versionlist[copy.versionindex + 1] == null)
37604379 {
37614380 java.awt.Toolkit.getDefaultToolkit().beep();
37624381 return;
37634382 }
37644383
3765
- tab.undoindex += 1;
4384
+ copy.versionindex += 1;
37664385
3767
- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
4386
+ CopyChanged();
37684387
3769
- //if (!tab.user[tab.undoindex])
3770
- // tab.graphs[tab.undoindex] = null;
4388
+ //if (!tab.user[tab.versionindex])
4389
+ // tab.graphs[tab.versionindex] = null;
37714390 }
37724391
37734392 void ImportGFD()
....@@ -3978,7 +4597,7 @@
39784597 //copy.material = new cMaterial(copy.GetMaterial());
39794598
39804599 current.color = (float) colorField.getFloat();
3981
- current.modulation = (float) modulationField.getFloat();
4600
+ current.modulation = (float) saturationField.getFloat();
39824601 current.metalness = (float) metalnessField.getFloat();
39834602 current.diffuse = (float) diffuseField.getFloat();
39844603 current.specular = (float) specularField.getFloat();
....@@ -4011,7 +4630,7 @@
40114630 cMaterial mat = copy.material;
40124631
40134632 colorField.SetToolTipValue((mat.color));
4014
- modulationField.SetToolTipValue((mat.modulation));
4633
+ saturationField.SetToolTipValue((mat.modulation));
40154634 metalnessField.SetToolTipValue((mat.metalness));
40164635 diffuseField.SetToolTipValue((mat.diffuse));
40174636 specularField.SetToolTipValue((mat.specular));
....@@ -4063,9 +4682,26 @@
40634682 //copy.Touch();
40644683 }
40654684
4685
+ cNumberSlider versionSlider;
4686
+
40664687 public void stateChanged(ChangeEvent e)
40674688 {
40684689 // assert(false);
4690
+ if (e.getSource() == versionSlider)
4691
+ {
4692
+ if (muteSlider)
4693
+ return;
4694
+
4695
+ int version = versionSlider.getInteger();
4696
+
4697
+ if (copy.versionlist[version] != null)
4698
+ {
4699
+ copy.versionindex = version;
4700
+ CopyChanged();
4701
+ }
4702
+
4703
+ return;
4704
+ }
40694705
40704706 if (freezematerial)
40714707 {
....@@ -4101,6 +4737,12 @@
41014737 {
41024738 //System.out.println("stateChanged = " + this);
41034739 materialtouched = true;
4740
+
4741
+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4742
+ {
4743
+ saturationField.setFloat(1);
4744
+ }
4745
+
41044746 applySelf();
41054747 //System.out.println("this = " + this);
41064748 //System.out.println("PARENT = " + parent);
....@@ -4400,6 +5042,7 @@
44005042 {
44015043 if (GetTree() != null)
44025044 {
5045
+ GetTree().revalidate();
44035046 GetTree().repaint();
44045047 }
44055048
....@@ -4408,13 +5051,16 @@
44085051 ctrlPanel.validate(); // ? new
44095052 ctrlPanel.repaint();
44105053 }
5054
+
5055
+ if (previousVersionButton != null && copy.versionlist != null)
5056
+ SetUndoStates();
44115057 }
44125058
44135059 static TweenManager tweenManager = new TweenManager();
44145060
44155061 void makeSomething(Object3D thing, boolean resetmodel) // deselect)
44165062 {
4417
- if (Globals.SAVEONMAKE) // && resetmodel)
5063
+ if (Globals.REPLACEONMAKE) // && resetmodel)
44185064 Save();
44195065 //Tween.set(thing, 0).target(1).start(tweenManager);
44205066 //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4656,7 +5302,9 @@
46565302 readobj.ResetDisplayList();
46575303 } catch (Exception e)
46585304 {
4659
- //e.printStackTrace();
5305
+ if (!e.toString().contains("GZIP"))
5306
+ e.printStackTrace();
5307
+
46605308 try
46615309 {
46625310 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4736,6 +5384,8 @@
47365384 {
47375385 //readobj.deepCopySelf(copy);
47385386 copy.clear(); // june 2014
5387
+ copy.skyboxname = readobj.skyboxname;
5388
+ copy.skyboxext = readobj.skyboxext;
47395389 for (int i = 0; i < readobj.size(); i++)
47405390 {
47415391 Object3D child = readobj.get(i); // reserve(i);
....@@ -4776,6 +5426,7 @@
47765426 }
47775427 } catch (ClassCastException e)
47785428 {
5429
+ e.printStackTrace();
47795430 assert (false);
47805431 Composite c = (Composite) copy;
47815432 c.children.clear();
....@@ -4786,6 +5437,17 @@
47865437 c.addChild(csg);
47875438 }
47885439
5440
+ copy.versionlist = readobj.versionlist;
5441
+ copy.versionindex = readobj.versionindex;
5442
+
5443
+ if (copy.versionlist == null)
5444
+ {
5445
+ copy.versionlist = new Object3D[100];
5446
+ copy.versionindex = -1;
5447
+ }
5448
+
5449
+ //? SetUndoStates();
5450
+
47895451 ResetModel();
47905452 copy.HardTouch(); // recompile?
47915453 refreshContents();
....@@ -4796,7 +5458,7 @@
47965458 {
47975459 if (Grafreed.standAlone)
47985460 {
4799
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5461
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
48005462 browser.show();
48015463 String filename = browser.getFile();
48025464 if (filename != null && filename.length() > 0)
....@@ -4895,6 +5557,7 @@
48955557 //ps.print(buffer.toString());
48965558 } catch (IOException e)
48975559 {
5560
+ e.printStackTrace();
48985561 }
48995562 }
49005563
....@@ -5114,6 +5777,7 @@
51145777 ButtonGroup buttonGroup;
51155778
51165779 cGridBag toolboxPanel;
5780
+ cGridBag skyboxPanel;
51175781 cGridBag materialPanel;
51185782 cGridBag ctrlPanel;
51195783
....@@ -5187,7 +5851,7 @@
51875851 JLabel colorLabel;
51885852 cNumberSlider colorField;
51895853 JLabel modulationLabel;
5190
- cNumberSlider modulationField;
5854
+ cNumberSlider saturationField;
51915855 JLabel metalnessLabel;
51925856 cNumberSlider metalnessField;
51935857 JLabel diffuseLabel;