.. | .. |
---|
83 | 83 | cButton GetButton(String name, boolean border) |
---|
84 | 84 | { |
---|
85 | 85 | ImageIcon icon = GetIcon(name); |
---|
86 | | - return new cButton(icon, border); |
---|
| 86 | + if (icon != null || name.contains("/")) |
---|
| 87 | + return new cButton(icon, border); |
---|
| 88 | + else |
---|
| 89 | + return new cButton(name, border); |
---|
87 | 90 | } |
---|
88 | 91 | |
---|
89 | 92 | cLabel GetLabel(String name, boolean border) |
---|
.. | .. |
---|
965 | 968 | object.versionlist = null; |
---|
966 | 969 | object.versiontable = null; |
---|
967 | 970 | |
---|
| 971 | + Object3D parent = object.parent; |
---|
| 972 | + object.parent = null; |
---|
| 973 | + |
---|
968 | 974 | //byte[] compress = Compress(copy); |
---|
969 | 975 | Object3D compress = (Object3D)Grafreed.clone(object); |
---|
| 976 | + |
---|
| 977 | + object.parent = parent; |
---|
970 | 978 | |
---|
971 | 979 | object.versionlist = versions; |
---|
972 | 980 | object.versiontable = versiontable; // if Grafreed.grafreed.universe |
---|
.. | .. |
---|
1310 | 1318 | |
---|
1311 | 1319 | //if (copy.pinned) |
---|
1312 | 1320 | { |
---|
1313 | | - pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF); |
---|
| 1321 | + pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF); |
---|
1314 | 1322 | pinButton.setSelected(copy.pinned); |
---|
1315 | 1323 | cGridBag t = new cGridBag(); |
---|
1316 | 1324 | t.preferredWidth = 2; |
---|
.. | .. |
---|
1624 | 1632 | //frontView.object = copy; |
---|
1625 | 1633 | //sideView.object = copy; |
---|
1626 | 1634 | |
---|
| 1635 | + transformPanel = new cGridBag().setVertical(true); |
---|
| 1636 | + |
---|
| 1637 | + cGridBag resetTransformPanel = new cGridBag(); |
---|
| 1638 | + |
---|
| 1639 | + resetTransformPanel.preferredHeight = 2; |
---|
| 1640 | + |
---|
| 1641 | + cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF); |
---|
| 1642 | + resetTransform.setToolTipText("Reset Translation, Rotation and Scale"); |
---|
| 1643 | + resetTransform.addMouseListener(new MouseAdapter() |
---|
| 1644 | + { |
---|
| 1645 | + public void mouseClicked(MouseEvent e) |
---|
| 1646 | + { |
---|
| 1647 | + ResetTransform(); |
---|
| 1648 | + } |
---|
| 1649 | + }); |
---|
| 1650 | + resetTransformPanel.add(resetTransform); |
---|
| 1651 | + |
---|
| 1652 | + resetTransform = GetButton("T only", !Globals.NIMBUSLAF); |
---|
| 1653 | + resetTransform.setToolTipText("Reset Translation only"); |
---|
| 1654 | + resetTransform.addMouseListener(new MouseAdapter() |
---|
| 1655 | + { |
---|
| 1656 | + public void mouseClicked(MouseEvent e) |
---|
| 1657 | + { |
---|
| 1658 | + ResetTransform(1); |
---|
| 1659 | + } |
---|
| 1660 | + }); |
---|
| 1661 | + resetTransformPanel.add(resetTransform); |
---|
| 1662 | + |
---|
| 1663 | + resetTransform = GetButton("RS only", !Globals.NIMBUSLAF); |
---|
| 1664 | + resetTransform.setToolTipText("Reset Rotation and Scale only"); |
---|
| 1665 | + resetTransform.addMouseListener(new MouseAdapter() |
---|
| 1666 | + { |
---|
| 1667 | + public void mouseClicked(MouseEvent e) |
---|
| 1668 | + { |
---|
| 1669 | + ResetTransform(2); |
---|
| 1670 | + } |
---|
| 1671 | + }); |
---|
| 1672 | + resetTransformPanel.add(resetTransform); |
---|
| 1673 | + |
---|
1627 | 1674 | XYZPanel = new cGridBag().setVertical(true); |
---|
1628 | 1675 | //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5)); |
---|
1629 | 1676 | |
---|
.. | .. |
---|
1633 | 1680 | XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll); |
---|
1634 | 1681 | //XYZPanel.setName("XYZ"); |
---|
1635 | 1682 | |
---|
| 1683 | + transformPanel.add(resetTransformPanel); |
---|
| 1684 | + transformPanel.add(XYZPanel); |
---|
| 1685 | + |
---|
1636 | 1686 | /* |
---|
1637 | 1687 | gridPanel = new JPanel(); //new BorderLayout()); |
---|
1638 | 1688 | gridPanel.setLayout(new GridLayout(1, 2)); |
---|
.. | .. |
---|
1640 | 1690 | gridPanel.add(cameraView); |
---|
1641 | 1691 | gridPanel.add(XYZPanel); |
---|
1642 | 1692 | */ |
---|
1643 | | - gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout()); |
---|
1644 | | - gridPanel.setContinuousLayout(true); |
---|
1645 | | - gridPanel.setOneTouchExpandable(true); |
---|
1646 | | - gridPanel.setDividerLocation(1.0); |
---|
1647 | | - gridPanel.setDividerSize(9); |
---|
1648 | | - gridPanel.setResizeWeight(0.85); |
---|
| 1693 | +// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout()); |
---|
| 1694 | +// gridPanel.setContinuousLayout(true); |
---|
| 1695 | +// gridPanel.setOneTouchExpandable(true); |
---|
| 1696 | +// gridPanel.setDividerLocation(1.0); |
---|
| 1697 | +// gridPanel.setDividerSize(9); |
---|
| 1698 | +// gridPanel.setResizeWeight(0.85); |
---|
1649 | 1699 | |
---|
1650 | 1700 | // aConstraints.weighty = 0; |
---|
1651 | 1701 | //System.out.println("THIS = " + this); |
---|
.. | .. |
---|
1688 | 1738 | objectPanel.setIconAt(3, GetIcon("icons/write.png")); |
---|
1689 | 1739 | objectPanel.setToolTipTextAt(3, "Edit controls"); |
---|
1690 | 1740 | |
---|
1691 | | - objectPanel.add(XYZPanel); |
---|
| 1741 | + objectPanel.add(transformPanel); |
---|
1692 | 1742 | objectPanel.setIconAt(4, GetIcon("icons/XYZ.png")); |
---|
1693 | | - objectPanel.setToolTipTextAt(4, "XYZ/RGB transform"); |
---|
| 1743 | + objectPanel.setToolTipTextAt(4, "TRS transform"); |
---|
1694 | 1744 | |
---|
1695 | 1745 | patchMaterial = true; |
---|
1696 | 1746 | cameraView.patchMaterial = this; |
---|
.. | .. |
---|
1726 | 1776 | |
---|
1727 | 1777 | AddOptions(optionsPanel); //, aConstraints); |
---|
1728 | 1778 | |
---|
1729 | | - tabbedPane.add(optionsPanel); |
---|
1730 | | - |
---|
1731 | 1779 | tabbedPane.add(FSPane = new cFileSystemPane(this)); |
---|
1732 | 1780 | |
---|
| 1781 | + tabbedPane.add(optionsPanel); |
---|
| 1782 | + |
---|
1733 | 1783 | scenePanel.add(tabbedPane); |
---|
1734 | 1784 | |
---|
1735 | | - //if (Globals.ADVANCED) |
---|
1736 | | -// tabbedPane.add(infoPanel); |
---|
1737 | | -// tabbedPane.setIconAt(3, GetIcon("icons/info.png")); |
---|
1738 | | -// tabbedPane.setToolTipTextAt(3, "Information"); |
---|
| 1785 | + cGridBag creditsPanel = new cGridBag().setVertical(true); |
---|
| 1786 | + creditsPanel.setName("Credits"); |
---|
1739 | 1787 | |
---|
| 1788 | + cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF); |
---|
| 1789 | + creditsPanel.add(ogaLabel); |
---|
| 1790 | + |
---|
| 1791 | + cButton opengameartButton; |
---|
| 1792 | + creditsPanel.add(opengameartButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF)); |
---|
| 1793 | + opengameartButton.setToolTipText("https://opengameart.org"); |
---|
| 1794 | + |
---|
| 1795 | + opengameartButton.addMouseListener(new MouseAdapter() |
---|
| 1796 | + { |
---|
| 1797 | + public void mouseClicked(MouseEvent e) |
---|
| 1798 | + { |
---|
| 1799 | + try |
---|
| 1800 | + { |
---|
| 1801 | + Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/")); |
---|
| 1802 | + } catch (Exception e1) |
---|
| 1803 | +// } catch (java.io.IOException | java.net.URISyntaxException e1) |
---|
| 1804 | + { |
---|
| 1805 | + e1.printStackTrace(); |
---|
| 1806 | + } |
---|
| 1807 | + } |
---|
| 1808 | + }); |
---|
| 1809 | + |
---|
| 1810 | + for (int i=10; --i>=0;) |
---|
| 1811 | + { |
---|
| 1812 | + creditsPanel.add(new cGridBag()); |
---|
| 1813 | + } |
---|
| 1814 | + |
---|
| 1815 | + tabbedPane.add(creditsPanel); |
---|
| 1816 | + tabbedPane.setToolTipTextAt(3, "Credits"); |
---|
| 1817 | + |
---|
| 1818 | + if (Globals.ADVANCED) |
---|
| 1819 | + { |
---|
| 1820 | + tabbedPane.add(infoPanel); |
---|
| 1821 | + tabbedPane.setIconAt(4, GetIcon("icons/info.png")); |
---|
| 1822 | + tabbedPane.setToolTipTextAt(4, "Information"); |
---|
| 1823 | + } |
---|
| 1824 | + |
---|
1740 | 1825 | /* |
---|
1741 | 1826 | cTree jTree = new cTree(null); |
---|
1742 | 1827 | ToolTipManager.sharedInstance().registerComponent(jTree); |
---|
.. | .. |
---|
1757 | 1842 | jtp.add(tree); |
---|
1758 | 1843 | */ |
---|
1759 | 1844 | |
---|
1760 | | - bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel); |
---|
1761 | | - bigPanel.setContinuousLayout(true); |
---|
1762 | | - bigPanel.setOneTouchExpandable(true); |
---|
1763 | | - bigPanel.setDividerLocation(0.8); |
---|
1764 | | - bigPanel.setDividerSize(15); |
---|
1765 | | - bigPanel.setResizeWeight(0.15); |
---|
1766 | | - bigPanel.setName("Scene"); |
---|
| 1845 | +// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel); |
---|
| 1846 | +// bigPanel.setContinuousLayout(true); |
---|
| 1847 | +// bigPanel.setOneTouchExpandable(true); |
---|
| 1848 | +// bigPanel.setDividerLocation(0.8); |
---|
| 1849 | +// bigPanel.setDividerSize(15); |
---|
| 1850 | +// bigPanel.setResizeWeight(0.15); |
---|
| 1851 | +// bigPanel.setName("Scene"); |
---|
1767 | 1852 | |
---|
1768 | 1853 | //bigPanel.setLayout(new BorderLayout()); |
---|
1769 | 1854 | //bigPanel.setSize(new Dimension(10,10)); |
---|
.. | .. |
---|
1847 | 1932 | |
---|
1848 | 1933 | cameraView.requestFocusInWindow(); |
---|
1849 | 1934 | |
---|
1850 | | - gridPanel.setDividerLocation(1.0); |
---|
| 1935 | +// gridPanel.setDividerLocation(1.0); |
---|
1851 | 1936 | |
---|
1852 | 1937 | frame.validate(); |
---|
1853 | 1938 | |
---|
.. | .. |
---|
1882 | 1967 | { |
---|
1883 | 1968 | cGridBag presetpanel = new cGridBag().setVertical(true); |
---|
1884 | 1969 | |
---|
1885 | | - cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF); |
---|
| 1970 | + cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF); |
---|
1886 | 1971 | skin.setToolTipText("Skin"); |
---|
1887 | 1972 | skin.addMouseListener(new MouseAdapter() |
---|
1888 | 1973 | { |
---|
.. | .. |
---|
1920 | 2005 | }); |
---|
1921 | 2006 | presetpanel.add(skin); |
---|
1922 | 2007 | |
---|
1923 | | - cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF); |
---|
| 2008 | + cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF); |
---|
1924 | 2009 | lambert.setToolTipText("Diffuse"); |
---|
1925 | 2010 | lambert.addMouseListener(new MouseAdapter() |
---|
1926 | 2011 | { |
---|
.. | .. |
---|
1938 | 2023 | }); |
---|
1939 | 2024 | presetpanel.add(lambert); |
---|
1940 | 2025 | |
---|
1941 | | - cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF); |
---|
| 2026 | + cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF); |
---|
1942 | 2027 | diffuse2.setToolTipText("Diffuse2"); |
---|
1943 | 2028 | diffuse2.addMouseListener(new MouseAdapter() |
---|
1944 | 2029 | { |
---|
.. | .. |
---|
1956 | 2041 | }); |
---|
1957 | 2042 | presetpanel.add(diffuse2); |
---|
1958 | 2043 | |
---|
1959 | | - cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF); |
---|
| 2044 | + cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF); |
---|
1960 | 2045 | diffusemoon.setToolTipText("Moon"); |
---|
1961 | 2046 | diffusemoon.addMouseListener(new MouseAdapter() |
---|
1962 | 2047 | { |
---|
.. | .. |
---|
1974 | 2059 | }); |
---|
1975 | 2060 | presetpanel.add(diffusemoon); |
---|
1976 | 2061 | |
---|
1977 | | - cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF); |
---|
| 2062 | + cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF); |
---|
1978 | 2063 | diffusemoon2.setToolTipText("Moon2"); |
---|
1979 | 2064 | diffusemoon2.addMouseListener(new MouseAdapter() |
---|
1980 | 2065 | { |
---|
.. | .. |
---|
1992 | 2077 | }); |
---|
1993 | 2078 | presetpanel.add(diffusemoon2); |
---|
1994 | 2079 | |
---|
1995 | | - cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF); |
---|
| 2080 | + cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF); |
---|
1996 | 2081 | diffusemoon3.setToolTipText("Moon3"); |
---|
1997 | 2082 | diffusemoon3.addMouseListener(new MouseAdapter() |
---|
1998 | 2083 | { |
---|
.. | .. |
---|
2010 | 2095 | }); |
---|
2011 | 2096 | presetpanel.add(diffusemoon3); |
---|
2012 | 2097 | |
---|
2013 | | - cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF); |
---|
| 2098 | + cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF); |
---|
2014 | 2099 | diffusesheen.setToolTipText("Sheen"); |
---|
2015 | 2100 | diffusesheen.addMouseListener(new MouseAdapter() |
---|
2016 | 2101 | { |
---|
.. | .. |
---|
2027 | 2112 | }); |
---|
2028 | 2113 | presetpanel.add(diffusesheen); |
---|
2029 | 2114 | |
---|
2030 | | - cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF); |
---|
| 2115 | + cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF); |
---|
2031 | 2116 | rough.setToolTipText("Rough metal"); |
---|
2032 | 2117 | rough.addMouseListener(new MouseAdapter() |
---|
2033 | 2118 | { |
---|
.. | .. |
---|
2045 | 2130 | }); |
---|
2046 | 2131 | presetpanel.add(rough); |
---|
2047 | 2132 | |
---|
2048 | | - cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF); |
---|
| 2133 | + cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF); |
---|
2049 | 2134 | rough2.setToolTipText("Medium metal"); |
---|
2050 | 2135 | rough2.addMouseListener(new MouseAdapter() |
---|
2051 | 2136 | { |
---|
.. | .. |
---|
2063 | 2148 | }); |
---|
2064 | 2149 | presetpanel.add(rough2); |
---|
2065 | 2150 | |
---|
2066 | | - cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF); |
---|
| 2151 | + cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF); |
---|
2067 | 2152 | shini0.setToolTipText("Shiny"); |
---|
2068 | 2153 | shini0.addMouseListener(new MouseAdapter() |
---|
2069 | 2154 | { |
---|
.. | .. |
---|
2081 | 2166 | }); |
---|
2082 | 2167 | presetpanel.add(shini0); |
---|
2083 | 2168 | |
---|
2084 | | - cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF); |
---|
| 2169 | + cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF); |
---|
2085 | 2170 | shini1.setToolTipText("Shiny2"); |
---|
2086 | 2171 | shini1.addMouseListener(new MouseAdapter() |
---|
2087 | 2172 | { |
---|
.. | .. |
---|
2099 | 2184 | }); |
---|
2100 | 2185 | presetpanel.add(shini1); |
---|
2101 | 2186 | |
---|
2102 | | - cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF); |
---|
| 2187 | + cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF); |
---|
2103 | 2188 | shini2.setToolTipText("Shiny3"); |
---|
2104 | 2189 | shini2.addMouseListener(new MouseAdapter() |
---|
2105 | 2190 | { |
---|
.. | .. |
---|
2117 | 2202 | }); |
---|
2118 | 2203 | presetpanel.add(shini2); |
---|
2119 | 2204 | |
---|
2120 | | - cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF); |
---|
| 2205 | + cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF); |
---|
2121 | 2206 | aniso.setToolTipText("AnisoU"); |
---|
2122 | 2207 | aniso.addMouseListener(new MouseAdapter() |
---|
2123 | 2208 | { |
---|
.. | .. |
---|
2135 | 2220 | }); |
---|
2136 | 2221 | presetpanel.add(aniso); |
---|
2137 | 2222 | |
---|
2138 | | - cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF); |
---|
| 2223 | + cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF); |
---|
2139 | 2224 | aniso2.setToolTipText("AnisoV"); |
---|
2140 | 2225 | aniso2.addMouseListener(new MouseAdapter() |
---|
2141 | 2226 | { |
---|
.. | .. |
---|
2153 | 2238 | }); |
---|
2154 | 2239 | presetpanel.add(aniso2); |
---|
2155 | 2240 | |
---|
2156 | | - cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF); |
---|
| 2241 | + cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF); |
---|
2157 | 2242 | aniso3.setToolTipText("AnisoUV"); |
---|
2158 | 2243 | aniso3.addMouseListener(new MouseAdapter() |
---|
2159 | 2244 | { |
---|
.. | .. |
---|
2171 | 2256 | }); |
---|
2172 | 2257 | presetpanel.add(aniso3); |
---|
2173 | 2258 | |
---|
2174 | | - cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF); |
---|
| 2259 | + cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF); |
---|
2175 | 2260 | velvet0.setToolTipText("Velvet"); |
---|
2176 | 2261 | velvet0.addMouseListener(new MouseAdapter() |
---|
2177 | 2262 | { |
---|
.. | .. |
---|
2193 | 2278 | }); |
---|
2194 | 2279 | presetpanel.add(velvet0); |
---|
2195 | 2280 | |
---|
2196 | | - cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF); |
---|
| 2281 | + cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF); |
---|
2197 | 2282 | bump0.setToolTipText("Bump texture"); |
---|
2198 | 2283 | bump0.addMouseListener(new MouseAdapter() |
---|
2199 | 2284 | { |
---|
.. | .. |
---|
2212 | 2297 | }); |
---|
2213 | 2298 | presetpanel.add(bump0); |
---|
2214 | 2299 | |
---|
2215 | | - cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF); |
---|
| 2300 | + cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF); |
---|
2216 | 2301 | borderShader.setToolTipText("Border fade"); |
---|
2217 | 2302 | borderShader.addMouseListener(new MouseAdapter() |
---|
2218 | 2303 | { |
---|
.. | .. |
---|
2227 | 2312 | }); |
---|
2228 | 2313 | presetpanel.add(borderShader); |
---|
2229 | 2314 | |
---|
2230 | | - cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF); |
---|
| 2315 | + cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF); |
---|
2231 | 2316 | halo.setToolTipText("Halo"); |
---|
2232 | 2317 | halo.addMouseListener(new MouseAdapter() |
---|
2233 | 2318 | { |
---|
.. | .. |
---|
2244 | 2329 | }); |
---|
2245 | 2330 | presetpanel.add(halo); |
---|
2246 | 2331 | |
---|
2247 | | - cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF); |
---|
| 2332 | + cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF); |
---|
2248 | 2333 | candle.setToolTipText("Candle"); |
---|
2249 | 2334 | candle.addMouseListener(new MouseAdapter() |
---|
2250 | 2335 | { |
---|
.. | .. |
---|
2266 | 2351 | }); |
---|
2267 | 2352 | presetpanel.add(candle); |
---|
2268 | 2353 | |
---|
2269 | | - cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF); |
---|
| 2354 | + cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF); |
---|
2270 | 2355 | shadowShader.setToolTipText("Shadow"); |
---|
2271 | 2356 | shadowShader.addMouseListener(new MouseAdapter() |
---|
2272 | 2357 | { |
---|
.. | .. |
---|
2301 | 2386 | |
---|
2302 | 2387 | cGridBag editBar = new cGridBag().setVertical(false); |
---|
2303 | 2388 | |
---|
2304 | | - editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints); |
---|
| 2389 | + editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints); |
---|
2305 | 2390 | createMaterialButton.setToolTipText("Create material"); |
---|
2306 | 2391 | |
---|
2307 | 2392 | /* |
---|
2308 | 2393 | ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints); |
---|
2309 | 2394 | */ |
---|
2310 | 2395 | |
---|
2311 | | - editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints); |
---|
| 2396 | + editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints); |
---|
2312 | 2397 | clearMaterialButton.setToolTipText("Clear material"); |
---|
2313 | 2398 | |
---|
2314 | 2399 | if (Globals.ADVANCED) |
---|
2315 | 2400 | { |
---|
2316 | | - editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints); |
---|
| 2401 | + editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints); |
---|
2317 | 2402 | editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints); |
---|
2318 | 2403 | editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints); |
---|
2319 | 2404 | } |
---|
.. | .. |
---|
4114 | 4199 | |
---|
4115 | 4200 | void New() |
---|
4116 | 4201 | { |
---|
4117 | | - while (copy.Size() > 1) |
---|
| 4202 | + while (copy.Size() > 0) |
---|
4118 | 4203 | { |
---|
4119 | | - copy.remove(1); |
---|
| 4204 | + copy.remove(0); |
---|
4120 | 4205 | } |
---|
4121 | 4206 | |
---|
| 4207 | + copy.selection.clear(); |
---|
| 4208 | + |
---|
4122 | 4209 | ResetModel(); |
---|
| 4210 | + SetupViews(); |
---|
4123 | 4211 | objEditor.refreshContents(); |
---|
4124 | 4212 | } |
---|
4125 | 4213 | |
---|
.. | .. |
---|
4432 | 4520 | return count; |
---|
4433 | 4521 | } |
---|
4434 | 4522 | |
---|
| 4523 | + public cGridBag versionSliderPane; |
---|
| 4524 | + |
---|
4435 | 4525 | void SetVersionStates() |
---|
4436 | 4526 | { |
---|
4437 | 4527 | //if (true) |
---|
.. | .. |
---|
4439 | 4529 | |
---|
4440 | 4530 | //cRadio tab = GetCurrentTab(); |
---|
4441 | 4531 | |
---|
4442 | | - restoreButton.setEnabled(copy.versionindex != -1); |
---|
4443 | | - replaceButton.setEnabled(copy.versionindex != -1); |
---|
4444 | | - |
---|
4445 | | - previousVersionButton.setEnabled(copy.versionindex > 0); |
---|
4446 | | - nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null); |
---|
4447 | | - |
---|
4448 | | - deleteVersionButton.setEnabled(copy.versionindex != -1); |
---|
4449 | | - //copy.versionlist[copy.versionindex + 1] != null); |
---|
4450 | | - |
---|
4451 | | - muteSlider = true; |
---|
4452 | | - versionSlider.setMinimum(0); |
---|
4453 | | - versionSlider.setMaximum(VersionCount() - 1); |
---|
4454 | | - versionSlider.setInteger(copy.versionindex); |
---|
4455 | | - versionSlider.setEnabled(copy.versionindex != -1); |
---|
4456 | | - muteSlider = false; |
---|
| 4532 | + if (copy.versionlist == null) |
---|
| 4533 | + { |
---|
| 4534 | + saveVersionButton.setEnabled(false); |
---|
| 4535 | + restoreButton.setEnabled(false); |
---|
| 4536 | + replaceButton.setEnabled(false); |
---|
| 4537 | + previousVersionButton.setEnabled(false); |
---|
| 4538 | + nextVersionButton.setEnabled(false); |
---|
| 4539 | + deleteVersionButton.setEnabled(false); |
---|
| 4540 | + versionSliderPane.setVisible(false); |
---|
| 4541 | + } |
---|
| 4542 | + else |
---|
| 4543 | + { |
---|
| 4544 | + restoreButton.setEnabled(copy.versionindex != -1); |
---|
| 4545 | + replaceButton.setEnabled(copy.versionindex != -1); |
---|
| 4546 | + |
---|
| 4547 | + previousVersionButton.setEnabled(copy.versionindex > 0); |
---|
| 4548 | + nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null); |
---|
| 4549 | + |
---|
| 4550 | + deleteVersionButton.setEnabled(copy.versionindex != -1); |
---|
| 4551 | + //copy.versionlist[copy.versionindex + 1] != null); |
---|
| 4552 | + |
---|
| 4553 | + muteSlider = true; |
---|
| 4554 | + versionSlider.setMinimum(0); |
---|
| 4555 | + versionSlider.setMaximum(VersionCount() - 1); |
---|
| 4556 | + versionSlider.setInteger(copy.versionindex); |
---|
| 4557 | + versionSlider.setEnabled(copy.versionindex != -1); |
---|
| 4558 | + muteSlider = false; |
---|
| 4559 | + |
---|
| 4560 | + versionSliderPane.setVisible(true); |
---|
| 4561 | + } |
---|
4457 | 4562 | } |
---|
4458 | 4563 | |
---|
4459 | 4564 | public boolean PreviousVersion() |
---|
.. | .. |
---|
4873 | 4978 | |
---|
4874 | 4979 | public void stateChanged(ChangeEvent e) |
---|
4875 | 4980 | { |
---|
4876 | | - // assert(false); |
---|
| 4981 | + // assert(false); |
---|
4877 | 4982 | if (e.getSource() == versionSlider) |
---|
4878 | 4983 | { |
---|
4879 | 4984 | if (muteSlider) |
---|
.. | .. |
---|
5986 | 6091 | boolean materialFlushed; |
---|
5987 | 6092 | Object3D latestObject; |
---|
5988 | 6093 | |
---|
| 6094 | + cGridBag transformPanel; |
---|
5989 | 6095 | cGridBag XYZPanel; |
---|
5990 | 6096 | |
---|
5991 | 6097 | JSplitPane gridPanel; |
---|