Textures pane.

Normand Briere

2019-08-08 8294241adc5fe698b70e13ebd6780af46ab83f7e

 ObjEditor.java
..
..
@@ -34,6 +34,7 @@
34
34
         iSendInfo
35
35
 //KeyListener
36
36
 {
37
+    public cToggleButton pinButton;
37
38
         boolean timeline;
38
39
         boolean wasFullScreen;
39
40
 
..
..
@@ -466,6 +467,8 @@
466
467
                 
467
468
         toolboxPanel = new cGridBag().setVertical(true);
468
469
         //toolboxPanel.setName("Toolbox");
470
+        
471
+        skyboxPanel = new cGridBag().setVertical(true);
469
472
         
470
473
         materialPanel = new cGridBag().setVertical(false);
471
474
         //materialPanel.setName("Material");
..
..
@@ -1205,6 +1208,18 @@
1205
1208
         
1206
1209
             namePanel = new cGridBag();
1207
1210
             
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
+        
1208
1223
         nameField = AddText(namePanel, copy.GetName());
1209
1224
         namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1210
1225
         oe.ctrlPanel.add(namePanel);
..
..
@@ -1556,27 +1571,26 @@
1556
1571
         objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1557
1572
         objectPanel.setToolTipTextAt(0, "Material");
1558
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
+        
1559
1582
 //        JPanel north = new JPanel(new BorderLayout());
1560
1583
 //        north.setName("Edit");
1561
1584
 //        north.add(ctrlPanel, BorderLayout.NORTH);
1562
1585
 //        objectPanel.add(north);
1563
1586
         objectPanel.add(editPanel);
1564
-        objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1565
-        objectPanel.setToolTipTextAt(1, "Edit controls");
1566
-        
1567
-        //if (Globals.ADVANCED)
1568
-            objectPanel.add(infoPanel);
1569
-        objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1570
-        objectPanel.setToolTipTextAt(2, "Information");
1587
+        objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1588
+        objectPanel.setToolTipTextAt(3, "Edit controls");
1571
1589
         
1572
1590
         objectPanel.add(XYZPanel);
1573
-        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1574
-        objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1591
+        objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1592
+        objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1575
1593
         
1576
-        objectPanel.add(toolboxPanel);
1577
-        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1578
-        objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1579
-
1580
1594
         /*
1581
1595
         aConstraints.gridx = 0;
1582
1596
         aConstraints.gridwidth = 1;
..
..
@@ -1613,6 +1627,11 @@
1613
1627
 
1614
1628
         scenePanel.add(tabbedPane);
1615
1629
 
1630
+        //if (Globals.ADVANCED)
1631
+            tabbedPane.add(infoPanel);
1632
+        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1633
+        tabbedPane.setToolTipTextAt(3, "Information");
1634
+        
1616
1635
         /*
1617
1636
         cTree jTree = new cTree(null);
1618
1637
         ToolTipManager.sharedInstance().registerComponent(jTree);
..
..
@@ -1740,7 +1759,9 @@
1740
1759
     void SetupMaterial(cGridBag materialpanel)
1741
1760
     {
1742
1761
         cGridBag presetpanel = new cGridBag().setVertical(true);
1762
+        
1743
1763
         cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1764
+        skin.setToolTipText("Skin");
1744
1765
         skin.addMouseListener(new MouseAdapter()
1745
1766
         {
1746
1767
             public void mouseClicked(MouseEvent e)
..
..
@@ -1769,8 +1790,116 @@
1769
1790
         });
1770
1791
         presetpanel.add(skin);
1771
1792
         
1772
-        cLabel rough2 = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1773
-        rough2.addMouseListener(new MouseAdapter()
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()
1774
1903
         {
1775
1904
             public void mouseClicked(MouseEvent e)
1776
1905
             {
..
..
@@ -1784,31 +1913,220 @@
1784
1913
                 applySelf();
1785
1914
             }
1786
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
+        });
1787
1934
         presetpanel.add(rough2);
1788
1935
         
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));
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);
1805
2123
         
1806
2124
         cGridBag panel = new cGridBag().setVertical(true);
1807
2125
         
1808
2126
         presetpanel.preferredWidth = 1;
1809
2127
         
1810
-        materialpanel.add(panel);
1811
2128
         materialpanel.add(presetpanel);
2129
+        materialpanel.add(panel);
1812
2130
         
1813
2131
         panel.preferredWidth = 8;
1814
2132
         
..
..
@@ -3275,6 +3593,17 @@
3275
3593
     public void itemStateChanged(ItemEvent event)
3276
3594
     {
3277
3595
         //                   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
3278
3607
         if (event.getSource() == propagateToggle)
3279
3608
         {
3280
3609
             propagate ^= true;
..
..
@@ -5448,6 +5777,7 @@
5448
5777
     ButtonGroup buttonGroup;
5449
5778
     
5450
5779
     cGridBag toolboxPanel;
5780
+    cGridBag skyboxPanel;
5451
5781
     cGridBag materialPanel;
5452
5782
     cGridBag ctrlPanel;
5453
5783