Materials working.

Normand Briere

2019-08-06 4ec7130da08861dc4aff0232dbce38f3471696a4

Materials working.

 GroupEditor.java
..
..
@@ -948,12 +948,12 @@
948
948
 		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
949
949
                 restoreButton.setToolTipText("Undo (restore current version)");
950
950
 		restoreButton.addActionListener(this);
951
-                restoreButton.setEnabled(false);
951
+                //restoreButton.setEnabled(false);
952
952
                 
953
953
 		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
954
954
                 replaceButton.setToolTipText("Save (replace current version)");
955
955
 		replaceButton.addActionListener(this);
956
-                replaceButton.setEnabled(false);
956
+                //replaceButton.setEnabled(false);
957
957
                 
958
958
                 copyOptionsPanel.add(updown);
959
959
                 
..
..
@@ -2617,13 +2617,13 @@
2617
2617
 		{
2618
2618
                         // Restore current version
2619
2619
 			Restore();
2620
-        restoreButton.setEnabled(false);
2620
+        //restoreButton.setEnabled(false);
2621
2621
 		} else
2622
2622
 		if (source == replaceButton)
2623
2623
 		{
2624
2624
                         // Overwrite current version
2625
2625
 			Replace();
2626
-        replaceButton.setEnabled(false);
2626
+        //replaceButton.setEnabled(false);
2627
2627
 		} else
2628
2628
 		if (source == nextVersionButton)
2629
2629
 		{
 ObjEditor.java
..
..
@@ -1740,7 +1740,9 @@
1740
1740
     void SetupMaterial(cGridBag materialpanel)
1741
1741
     {
1742
1742
         cGridBag presetpanel = new cGridBag().setVertical(true);
1743
+        
1743
1744
         cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1745
+        skin.setToolTipText("Skin");
1744
1746
         skin.addMouseListener(new MouseAdapter()
1745
1747
         {
1746
1748
             public void mouseClicked(MouseEvent e)
..
..
@@ -1769,8 +1771,116 @@
1769
1771
         });
1770
1772
         presetpanel.add(skin);
1771
1773
         
1772
-        cLabel rough2 = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1773
-        rough2.addMouseListener(new MouseAdapter()
1774
+        cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
1775
+        lambert.setToolTipText("Diffuse");
1776
+        lambert.addMouseListener(new MouseAdapter()
1777
+        {
1778
+            public void mouseClicked(MouseEvent e)
1779
+            {
1780
+                Object3D object = Grafreed.materials.versionlist[2].get(0);
1781
+                cMaterial material = object.material;
1782
+                
1783
+                diffusenessField.setFloat(material.factor);
1784
+                selfshadowField.setFloat(material.diffuseness);
1785
+
1786
+                materialtouched = true;
1787
+                applySelf();
1788
+            }
1789
+        });
1790
+        presetpanel.add(lambert);
1791
+        
1792
+        cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
1793
+        diffuse2.setToolTipText("Diffuse2");
1794
+        diffuse2.addMouseListener(new MouseAdapter()
1795
+        {
1796
+            public void mouseClicked(MouseEvent e)
1797
+            {
1798
+                Object3D object = Grafreed.materials.versionlist[3].get(0);
1799
+                cMaterial material = object.material;
1800
+                
1801
+                diffusenessField.setFloat(material.factor);
1802
+                selfshadowField.setFloat(material.diffuseness);
1803
+
1804
+                materialtouched = true;
1805
+                applySelf();
1806
+            }
1807
+        });
1808
+        presetpanel.add(diffuse2);
1809
+        
1810
+        cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
1811
+        diffusemoon.setToolTipText("Moon");
1812
+        diffusemoon.addMouseListener(new MouseAdapter()
1813
+        {
1814
+            public void mouseClicked(MouseEvent e)
1815
+            {
1816
+                Object3D object = Grafreed.materials.versionlist[4].get(0);
1817
+                cMaterial material = object.material;
1818
+                
1819
+                diffusenessField.setFloat(material.factor);
1820
+                selfshadowField.setFloat(material.diffuseness);
1821
+
1822
+                materialtouched = true;
1823
+                applySelf();
1824
+            }
1825
+        });
1826
+        presetpanel.add(diffusemoon);
1827
+        
1828
+        cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
1829
+        diffusemoon2.setToolTipText("Moon2");
1830
+        diffusemoon2.addMouseListener(new MouseAdapter()
1831
+        {
1832
+            public void mouseClicked(MouseEvent e)
1833
+            {
1834
+                Object3D object = Grafreed.materials.versionlist[5].get(0);
1835
+                cMaterial material = object.material;
1836
+                
1837
+                diffusenessField.setFloat(material.factor);
1838
+                selfshadowField.setFloat(material.diffuseness);
1839
+
1840
+                materialtouched = true;
1841
+                applySelf();
1842
+            }
1843
+        });
1844
+        presetpanel.add(diffusemoon2);
1845
+        
1846
+        cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
1847
+        diffusemoon3.setToolTipText("Moon3");
1848
+        diffusemoon3.addMouseListener(new MouseAdapter()
1849
+        {
1850
+            public void mouseClicked(MouseEvent e)
1851
+            {
1852
+                Object3D object = Grafreed.materials.versionlist[6].get(0);
1853
+                cMaterial material = object.material;
1854
+                
1855
+                diffusenessField.setFloat(material.factor);
1856
+                selfshadowField.setFloat(material.diffuseness);
1857
+
1858
+                materialtouched = true;
1859
+                applySelf();
1860
+            }
1861
+        });
1862
+        presetpanel.add(diffusemoon3);
1863
+        
1864
+        cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
1865
+        diffusesheen.setToolTipText("Sheen");
1866
+        diffusesheen.addMouseListener(new MouseAdapter()
1867
+        {
1868
+            public void mouseClicked(MouseEvent e)
1869
+            {
1870
+                Object3D object = Grafreed.materials.versionlist[7].get(0);
1871
+                cMaterial material = object.material;
1872
+                
1873
+                sheenField.setFloat(material.sheen);
1874
+
1875
+                materialtouched = true;
1876
+                applySelf();
1877
+            }
1878
+        });
1879
+        presetpanel.add(diffusesheen);
1880
+        
1881
+        cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1882
+        rough.setToolTipText("Rough metal");
1883
+        rough.addMouseListener(new MouseAdapter()
1774
1884
         {
1775
1885
             public void mouseClicked(MouseEvent e)
1776
1886
             {
..
..
@@ -1784,31 +1894,220 @@
1784
1894
                 applySelf();
1785
1895
             }
1786
1896
         });
1897
+        presetpanel.add(rough);
1898
+        
1899
+        cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
1900
+        rough2.setToolTipText("Medium metal");
1901
+        rough2.addMouseListener(new MouseAdapter()
1902
+        {
1903
+            public void mouseClicked(MouseEvent e)
1904
+            {
1905
+                Object3D object = Grafreed.materials.versionlist[13].get(0);
1906
+                cMaterial material = object.material;
1907
+                
1908
+                shininessField.setFloat(material.shininess);
1909
+                lightareaField.setFloat(material.lightarea);
1910
+
1911
+                materialtouched = true;
1912
+                applySelf();
1913
+            }
1914
+        });
1787
1915
         presetpanel.add(rough2);
1788
1916
         
1789
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
1790
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
1791
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
1792
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
1793
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
1794
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
1795
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
1796
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
1797
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
1798
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
1799
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
1800
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
1801
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
1802
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
1803
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
1804
-        presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
1917
+        cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
1918
+        shini0.setToolTipText("Shiny");
1919
+        shini0.addMouseListener(new MouseAdapter()
1920
+        {
1921
+            public void mouseClicked(MouseEvent e)
1922
+            {
1923
+                Object3D object = Grafreed.materials.versionlist[14].get(0);
1924
+                cMaterial material = object.material;
1925
+                
1926
+                shininessField.setFloat(material.shininess);
1927
+                lightareaField.setFloat(material.lightarea);
1928
+
1929
+                materialtouched = true;
1930
+                applySelf();
1931
+            }
1932
+        });
1933
+        presetpanel.add(shini0);
1934
+        
1935
+        cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
1936
+        shini1.setToolTipText("Shiny2");
1937
+        shini1.addMouseListener(new MouseAdapter()
1938
+        {
1939
+            public void mouseClicked(MouseEvent e)
1940
+            {
1941
+                Object3D object = Grafreed.materials.versionlist[11].get(0);
1942
+                cMaterial material = object.material;
1943
+                
1944
+                shininessField.setFloat(material.shininess);
1945
+                lightareaField.setFloat(material.lightarea);
1946
+
1947
+                materialtouched = true;
1948
+                applySelf();
1949
+            }
1950
+        });
1951
+        presetpanel.add(shini1);
1952
+        
1953
+        cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
1954
+        shini2.setToolTipText("Shiny3");
1955
+        shini2.addMouseListener(new MouseAdapter()
1956
+        {
1957
+            public void mouseClicked(MouseEvent e)
1958
+            {
1959
+                Object3D object = Grafreed.materials.versionlist[12].get(0);
1960
+                cMaterial material = object.material;
1961
+                
1962
+                shininessField.setFloat(material.shininess);
1963
+                lightareaField.setFloat(material.lightarea);
1964
+
1965
+                materialtouched = true;
1966
+                applySelf();
1967
+            }
1968
+        });
1969
+        presetpanel.add(shini2);
1970
+        
1971
+        cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
1972
+        aniso.setToolTipText("AnisoU");
1973
+        aniso.addMouseListener(new MouseAdapter()
1974
+        {
1975
+            public void mouseClicked(MouseEvent e)
1976
+            {
1977
+                Object3D object = Grafreed.materials.versionlist[8].get(0);
1978
+                cMaterial material = object.material;
1979
+                
1980
+                anisoField.setFloat(material.aniso);
1981
+                anisoVField.setFloat(material.anisoV);
1982
+
1983
+                materialtouched = true;
1984
+                applySelf();
1985
+            }
1986
+        });
1987
+        presetpanel.add(aniso);
1988
+        
1989
+        cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
1990
+        aniso2.setToolTipText("AnisoV");
1991
+        aniso2.addMouseListener(new MouseAdapter()
1992
+        {
1993
+            public void mouseClicked(MouseEvent e)
1994
+            {
1995
+                Object3D object = Grafreed.materials.versionlist[9].get(0);
1996
+                cMaterial material = object.material;
1997
+                
1998
+                anisoField.setFloat(material.aniso);
1999
+                anisoVField.setFloat(material.anisoV);
2000
+
2001
+                materialtouched = true;
2002
+                applySelf();
2003
+            }
2004
+        });
2005
+        presetpanel.add(aniso2);
2006
+        
2007
+        cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2008
+        aniso3.setToolTipText("AnisoUV");
2009
+        aniso3.addMouseListener(new MouseAdapter()
2010
+        {
2011
+            public void mouseClicked(MouseEvent e)
2012
+            {
2013
+                Object3D object = Grafreed.materials.versionlist[10].get(0);
2014
+                cMaterial material = object.material;
2015
+                
2016
+                anisoField.setFloat(material.aniso);
2017
+                anisoVField.setFloat(material.anisoV);
2018
+
2019
+                materialtouched = true;
2020
+                applySelf();
2021
+            }
2022
+        });
2023
+        presetpanel.add(aniso3);
2024
+        
2025
+        cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2026
+        velvet0.setToolTipText("Velvet");
2027
+        velvet0.addMouseListener(new MouseAdapter()
2028
+        {
2029
+            public void mouseClicked(MouseEvent e)
2030
+            {
2031
+                Object3D object = Grafreed.materials.versionlist[15].get(0);
2032
+                cMaterial material = object.material;
2033
+                
2034
+                diffusenessField.setFloat(material.factor);
2035
+                selfshadowField.setFloat(material.diffuseness);
2036
+                sheenField.setFloat(material.sheen);
2037
+                shininessField.setFloat(material.shininess);
2038
+                velvetField.setFloat(material.velvet);
2039
+                shiftField.setFloat(material.shift);
2040
+
2041
+                materialtouched = true;
2042
+                applySelf();
2043
+            }
2044
+        });
2045
+        presetpanel.add(velvet0);
2046
+        
2047
+        cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2048
+        bump0.setToolTipText("Bump texture");
2049
+        bump0.addMouseListener(new MouseAdapter()
2050
+        {
2051
+            public void mouseClicked(MouseEvent e)
2052
+            {
2053
+                Object3D object = Grafreed.materials.versionlist[16].get(0);
2054
+                cMaterial material = object.material;
2055
+                
2056
+                bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2057
+                noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2058
+                powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2059
+
2060
+                materialtouched = true;
2061
+                applySelf();
2062
+            }
2063
+        });
2064
+        presetpanel.add(bump0);
2065
+        
2066
+        cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2067
+        halo.setToolTipText("Halo");
2068
+        halo.addMouseListener(new MouseAdapter()
2069
+        {
2070
+            public void mouseClicked(MouseEvent e)
2071
+            {
2072
+                Object3D object = Grafreed.materials.versionlist[17].get(0);
2073
+                cMaterial material = object.material;
2074
+                
2075
+                opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2076
+
2077
+                materialtouched = true;
2078
+                applySelf();
2079
+            }
2080
+        });
2081
+        presetpanel.add(halo);
2082
+        
2083
+        cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2084
+        candle.setToolTipText("Candle");
2085
+        candle.addMouseListener(new MouseAdapter()
2086
+        {
2087
+            public void mouseClicked(MouseEvent e)
2088
+            {
2089
+                Object3D object = Grafreed.materials.versionlist[18].get(0);
2090
+                cMaterial material = object.material;
2091
+                
2092
+                subsurfaceField.setFloat(material.subsurface);
2093
+                shadowbiasField.setFloat(material.shadowbias);
2094
+                ambientField.setFloat(material.ambient);
2095
+                specularField.setFloat(material.specular);
2096
+                lightareaField.setFloat(material.lightarea);
2097
+                shininessField.setFloat(material.shininess);
2098
+
2099
+                materialtouched = true;
2100
+                applySelf();
2101
+            }
2102
+        });
2103
+        presetpanel.add(candle);
1805
2104
         
1806
2105
         cGridBag panel = new cGridBag().setVertical(true);
1807
2106
         
1808
2107
         presetpanel.preferredWidth = 1;
1809
2108
         
1810
-        materialpanel.add(panel);
1811
2109
         materialpanel.add(presetpanel);
2110
+        materialpanel.add(panel);
1812
2111
         
1813
2112
         panel.preferredWidth = 8;
1814
2113
         
 gfd/materials.gfd
Binary files differ
 icons/shadericons/shadericon00018.png
Binary files differ
 icons/trash.png
Binary files differ