.. | .. |
---|
43 | 43 | |
---|
44 | 44 | static ObjEditor theFrame; |
---|
45 | 45 | |
---|
| 46 | + public void AllocProjectedVertices(Object3D object) |
---|
| 47 | + { |
---|
| 48 | + assert (object.projectedVertices != null); |
---|
| 49 | + |
---|
| 50 | + if (object.projectedVertices.length <= 2) |
---|
| 51 | + { |
---|
| 52 | + // Side effect... |
---|
| 53 | + Object3D.cVector2[] keep = object.projectedVertices; |
---|
| 54 | + object.projectedVertices = new Object3D.cVector2[3]; |
---|
| 55 | + for (int i = 0; i < 3; i++) |
---|
| 56 | + { |
---|
| 57 | + if (i < keep.length) |
---|
| 58 | + { |
---|
| 59 | + object.projectedVertices[i] = keep[i]; |
---|
| 60 | + } else |
---|
| 61 | + { |
---|
| 62 | + object.projectedVertices[i] = new Object3D.cVector2(); |
---|
| 63 | + } |
---|
| 64 | + /* |
---|
| 65 | + if(keep.length == 0) |
---|
| 66 | + object.projectedVertices[0] = new Object3D.cVector2(); |
---|
| 67 | + else |
---|
| 68 | + object.projectedVertices[0] = keep[0]; |
---|
| 69 | + object.projectedVertices[1] = new Object3D.cVector2(); |
---|
| 70 | + */ |
---|
| 71 | + } |
---|
| 72 | + } |
---|
| 73 | + } |
---|
| 74 | + |
---|
| 75 | + public Composite CreateCameras() |
---|
| 76 | + { |
---|
| 77 | + Composite cams = new cTemplate(); |
---|
| 78 | + cams.name = "Cameras"; |
---|
| 79 | + copy.insertElementAt(cams, 0); |
---|
| 80 | + |
---|
| 81 | + cams.addChild(new Camera()); |
---|
| 82 | + cams.addChild(new Camera(1)); |
---|
| 83 | + cams.addChild(new Camera(2)); |
---|
| 84 | + cams.addChild(new Camera(3)); |
---|
| 85 | + cams.addChild(new Camera(4)); |
---|
| 86 | + |
---|
| 87 | + return cams; |
---|
| 88 | + } |
---|
| 89 | + |
---|
46 | 90 | public cGridBag GetSeparator() |
---|
47 | 91 | { |
---|
48 | 92 | cGridBag separator = new cGridBag(); |
---|
.. | .. |
---|
54 | 98 | cButton GetButton(String name, boolean border) |
---|
55 | 99 | { |
---|
56 | 100 | ImageIcon icon = GetIcon(name); |
---|
57 | | - return new cButton(icon, border); |
---|
| 101 | + if (icon != null || name.contains("/")) |
---|
| 102 | + return new cButton(icon, border); |
---|
| 103 | + else |
---|
| 104 | + return new cButton(name, border); |
---|
58 | 105 | } |
---|
59 | 106 | |
---|
60 | 107 | cLabel GetLabel(String name, boolean border) |
---|
.. | .. |
---|
77 | 124 | |
---|
78 | 125 | static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>(); |
---|
79 | 126 | |
---|
80 | | - ImageIcon GetIcon(String name) |
---|
| 127 | + static ImageIcon GetIcon(String name) |
---|
81 | 128 | { |
---|
82 | 129 | javax.swing.ImageIcon iconCache = icons.get(name); |
---|
83 | 130 | if (iconCache != null) |
---|
.. | .. |
---|
87 | 134 | |
---|
88 | 135 | try |
---|
89 | 136 | { |
---|
90 | | - BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name)); |
---|
91 | | - |
---|
| 137 | + BufferedImage image; |
---|
| 138 | + |
---|
| 139 | + if (name.endsWith("jpg")) |
---|
| 140 | + // Much faster! |
---|
| 141 | + image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage(); |
---|
| 142 | + else |
---|
| 143 | + image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name)); |
---|
| 144 | + |
---|
92 | 145 | // if (image.getWidth() > 48 && image.getHeight() > 48) |
---|
93 | 146 | // { |
---|
94 | 147 | // BufferedImage resized = new BufferedImage(48, 48, image.getType()); |
---|
.. | .. |
---|
359 | 412 | //parent = p; |
---|
360 | 413 | |
---|
361 | 414 | GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice(); |
---|
362 | | - System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow()); |
---|
| 415 | + if (Globals.DEBUG) |
---|
| 416 | + System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow()); |
---|
363 | 417 | //gd.setFullScreenWindow(this); |
---|
364 | 418 | //setResizable(false); |
---|
365 | 419 | //if (!isDisplayable()) |
---|
.. | .. |
---|
396 | 450 | |
---|
397 | 451 | static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>(); |
---|
398 | 452 | |
---|
| 453 | + // This is to refresh the UI of the material panel. |
---|
| 454 | + boolean patchMaterial; |
---|
| 455 | + |
---|
399 | 456 | void SetupMenu() |
---|
400 | 457 | { |
---|
401 | 458 | frame.setMenuBar(menuBar = new MenuBar()); |
---|
.. | .. |
---|
409 | 466 | importOBJItem.addActionListener(this); |
---|
410 | 467 | import3DSItem = menu.add(new MenuItem("3DS file...")); |
---|
411 | 468 | import3DSItem.addActionListener(this); |
---|
| 469 | + if (Globals.ADVANCED) |
---|
| 470 | + { |
---|
412 | 471 | importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file...")); |
---|
413 | 472 | importVRMLX3DItem.addActionListener(this); |
---|
| 473 | + } |
---|
414 | 474 | menu.add("-"); |
---|
415 | 475 | importGFDItem = menu.add(new MenuItem("Grafreed file...")); |
---|
416 | 476 | importGFDItem.addActionListener(this); |
---|
.. | .. |
---|
921 | 981 | boolean temp = CameraPane.SWITCH; |
---|
922 | 982 | CameraPane.SWITCH = false; |
---|
923 | 983 | |
---|
924 | | - object.ExtractBigData(versiontable); |
---|
| 984 | + if (Grafreed.grafreed.universe.versiontable == null) |
---|
| 985 | + Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>(); |
---|
| 986 | + |
---|
| 987 | + object.ExtractBigData(Grafreed.grafreed.universe.versiontable); |
---|
925 | 988 | // if (copy == client) |
---|
926 | 989 | |
---|
927 | 990 | Object3D versions[] = object.versionlist; |
---|
| 991 | + java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe |
---|
928 | 992 | object.versionlist = null; |
---|
| 993 | + object.versiontable = null; |
---|
| 994 | + |
---|
| 995 | + Object3D parent = object.parent; |
---|
| 996 | + object.parent = null; |
---|
929 | 997 | |
---|
930 | 998 | //byte[] compress = Compress(copy); |
---|
931 | 999 | Object3D compress = (Object3D)Grafreed.clone(object); |
---|
932 | 1000 | |
---|
933 | | - object.versionlist = versions; |
---|
| 1001 | + object.parent = parent; |
---|
934 | 1002 | |
---|
935 | | - object.RestoreBigData(versiontable); |
---|
| 1003 | + object.versionlist = versions; |
---|
| 1004 | + object.versiontable = versiontable; // if Grafreed.grafreed.universe |
---|
| 1005 | + |
---|
| 1006 | + object.RestoreBigData(Grafreed.grafreed.universe.versiontable); |
---|
936 | 1007 | |
---|
937 | 1008 | CameraPane.SWITCH = temp; |
---|
938 | 1009 | |
---|
.. | .. |
---|
1271 | 1342 | |
---|
1272 | 1343 | //if (copy.pinned) |
---|
1273 | 1344 | { |
---|
1274 | | - pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF); |
---|
| 1345 | + pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF); |
---|
1275 | 1346 | pinButton.setSelected(copy.pinned); |
---|
1276 | 1347 | cGridBag t = new cGridBag(); |
---|
1277 | 1348 | t.preferredWidth = 2; |
---|
.. | .. |
---|
1294 | 1365 | |
---|
1295 | 1366 | liveCB = AddCheckBox(setupPanel, "Live", copy.live); |
---|
1296 | 1367 | liveCB.setToolTipText("Animate object"); |
---|
| 1368 | + markCB = AddCheckBox(setupPanel, "Anim", copy.marked); |
---|
| 1369 | + markCB.setToolTipText("Set target transform"); |
---|
1297 | 1370 | selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect); |
---|
1298 | 1371 | selectableCB.setToolTipText("Make object selectable"); |
---|
1299 | 1372 | // Return(); |
---|
1300 | 1373 | |
---|
1301 | 1374 | hideCB = AddCheckBox(setupPanel, "Hide", copy.hide); |
---|
1302 | 1375 | hideCB.setToolTipText("Hide object"); |
---|
1303 | | - markCB = AddCheckBox(setupPanel, "Mark", copy.marked); |
---|
1304 | | - markCB.setToolTipText("As animation target transform"); |
---|
1305 | 1376 | |
---|
1306 | 1377 | ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false); |
---|
1307 | 1378 | |
---|
.. | .. |
---|
1503 | 1574 | |
---|
1504 | 1575 | if (cam == null || !(copy.get(0) instanceof cGroup)) |
---|
1505 | 1576 | { |
---|
1506 | | - System.out.println("CREATE CAMERAS"); |
---|
1507 | | - cams = new cTemplate(); |
---|
1508 | | - cams.name = "Cameras"; |
---|
1509 | | - copy.insertElementAt(cams, 0); |
---|
1510 | | - //cams.parent = copy; |
---|
1511 | | - |
---|
1512 | | - cam = new Camera(); // LA.newVector(3, 2, 1)); |
---|
1513 | | - cams.addChild(cam); |
---|
1514 | | - cam = new Camera(1); |
---|
1515 | | - cams.addChild(cam); |
---|
1516 | | - cam = new Camera(2); |
---|
1517 | | - cams.addChild(cam); |
---|
1518 | | - cam = new Camera(3); |
---|
1519 | | - cams.addChild(cam); |
---|
1520 | | - cam = new Camera(4); // Light |
---|
1521 | | - cams.addChild(cam); |
---|
| 1577 | + if (Globals.DEBUG) |
---|
| 1578 | + System.out.println("CREATE CAMERAS"); |
---|
| 1579 | + cams = CreateCameras(); |
---|
1522 | 1580 | } else |
---|
1523 | 1581 | { |
---|
1524 | 1582 | cams = (cGroup) copy.get(0); |
---|
.. | .. |
---|
1584 | 1642 | //frontView.object = copy; |
---|
1585 | 1643 | //sideView.object = copy; |
---|
1586 | 1644 | |
---|
| 1645 | + transformPanel = new cGridBag().setVertical(true); |
---|
| 1646 | + |
---|
| 1647 | + cGridBag resetTransformPanel = new cGridBag(); |
---|
| 1648 | + |
---|
| 1649 | + resetTransformPanel.preferredHeight = 2; |
---|
| 1650 | + |
---|
| 1651 | + cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF); |
---|
| 1652 | + resetTransform.setToolTipText("Reset Translation, Rotation and Scale"); |
---|
| 1653 | + resetTransform.addMouseListener(new MouseAdapter() |
---|
| 1654 | + { |
---|
| 1655 | + public void mouseClicked(MouseEvent e) |
---|
| 1656 | + { |
---|
| 1657 | + ResetTransform(); |
---|
| 1658 | + } |
---|
| 1659 | + }); |
---|
| 1660 | + resetTransformPanel.add(resetTransform); |
---|
| 1661 | + |
---|
| 1662 | + resetTransform = GetButton("T only", !Globals.NIMBUSLAF); |
---|
| 1663 | + resetTransform.setToolTipText("Reset Translation only"); |
---|
| 1664 | + resetTransform.addMouseListener(new MouseAdapter() |
---|
| 1665 | + { |
---|
| 1666 | + public void mouseClicked(MouseEvent e) |
---|
| 1667 | + { |
---|
| 1668 | + ResetTransform(1); |
---|
| 1669 | + } |
---|
| 1670 | + }); |
---|
| 1671 | + resetTransformPanel.add(resetTransform); |
---|
| 1672 | + |
---|
| 1673 | + resetTransform = GetButton("RS only", !Globals.NIMBUSLAF); |
---|
| 1674 | + resetTransform.setToolTipText("Reset Rotation and Scale only"); |
---|
| 1675 | + resetTransform.addMouseListener(new MouseAdapter() |
---|
| 1676 | + { |
---|
| 1677 | + public void mouseClicked(MouseEvent e) |
---|
| 1678 | + { |
---|
| 1679 | + ResetTransform(2); |
---|
| 1680 | + } |
---|
| 1681 | + }); |
---|
| 1682 | + resetTransformPanel.add(resetTransform); |
---|
| 1683 | + |
---|
1587 | 1684 | XYZPanel = new cGridBag().setVertical(true); |
---|
1588 | 1685 | //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5)); |
---|
1589 | 1686 | |
---|
.. | .. |
---|
1593 | 1690 | XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll); |
---|
1594 | 1691 | //XYZPanel.setName("XYZ"); |
---|
1595 | 1692 | |
---|
| 1693 | + transformPanel.add(resetTransformPanel); |
---|
| 1694 | + transformPanel.add(XYZPanel); |
---|
| 1695 | + |
---|
1596 | 1696 | /* |
---|
1597 | 1697 | gridPanel = new JPanel(); //new BorderLayout()); |
---|
1598 | 1698 | gridPanel.setLayout(new GridLayout(1, 2)); |
---|
.. | .. |
---|
1600 | 1700 | gridPanel.add(cameraView); |
---|
1601 | 1701 | gridPanel.add(XYZPanel); |
---|
1602 | 1702 | */ |
---|
1603 | | - gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout()); |
---|
1604 | | - gridPanel.setContinuousLayout(true); |
---|
1605 | | - gridPanel.setOneTouchExpandable(true); |
---|
1606 | | - gridPanel.setDividerLocation(1.0); |
---|
1607 | | - gridPanel.setDividerSize(9); |
---|
1608 | | - gridPanel.setResizeWeight(0.85); |
---|
| 1703 | +// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout()); |
---|
| 1704 | +// gridPanel.setContinuousLayout(true); |
---|
| 1705 | +// gridPanel.setOneTouchExpandable(true); |
---|
| 1706 | +// gridPanel.setDividerLocation(1.0); |
---|
| 1707 | +// gridPanel.setDividerSize(9); |
---|
| 1708 | +// gridPanel.setResizeWeight(0.85); |
---|
1609 | 1709 | |
---|
1610 | 1710 | // aConstraints.weighty = 0; |
---|
1611 | 1711 | //System.out.println("THIS = " + this); |
---|
.. | .. |
---|
1628 | 1728 | |
---|
1629 | 1729 | //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); |
---|
1630 | 1730 | //tmp.setName("Edit"); |
---|
1631 | | - objectPanel.add(materialPanel); |
---|
1632 | | - objectPanel.setIconAt(0, GetIcon("icons/material.png")); |
---|
1633 | | - objectPanel.setToolTipTextAt(0, "Material"); |
---|
1634 | | - |
---|
| 1731 | + objectPanel.add(skyboxPanel); |
---|
| 1732 | + objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg")); |
---|
| 1733 | + objectPanel.setToolTipTextAt(0, "Backgrounds"); |
---|
| 1734 | + |
---|
1635 | 1735 | objectPanel.add(toolboxPanel); |
---|
1636 | 1736 | objectPanel.setIconAt(1, GetIcon("icons/primitives.png")); |
---|
1637 | 1737 | objectPanel.setToolTipTextAt(1, "Objects & textures"); |
---|
1638 | 1738 | |
---|
1639 | | - objectPanel.add(skyboxPanel); |
---|
1640 | | - objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg")); |
---|
1641 | | - objectPanel.setToolTipTextAt(2, "Backgrounds"); |
---|
1642 | | - |
---|
| 1739 | + objectPanel.add(materialPanel); |
---|
| 1740 | + objectPanel.setIconAt(2, GetIcon("icons/material.png")); |
---|
| 1741 | + objectPanel.setToolTipTextAt(2, "Material"); |
---|
| 1742 | + |
---|
1643 | 1743 | // JPanel north = new JPanel(new BorderLayout()); |
---|
1644 | 1744 | // north.setName("Edit"); |
---|
1645 | 1745 | // north.add(ctrlPanel, BorderLayout.NORTH); |
---|
1646 | 1746 | // objectPanel.add(north); |
---|
1647 | 1747 | objectPanel.add(editPanel); |
---|
1648 | | - objectPanel.setIconAt(3, GetIcon("icons/write.png")); |
---|
| 1748 | + objectPanel.setIconAt(3, GetIcon("icons/writewhite.png")); |
---|
1649 | 1749 | objectPanel.setToolTipTextAt(3, "Edit controls"); |
---|
1650 | 1750 | |
---|
1651 | | - objectPanel.add(XYZPanel); |
---|
| 1751 | + objectPanel.add(transformPanel); |
---|
1652 | 1752 | objectPanel.setIconAt(4, GetIcon("icons/XYZ.png")); |
---|
1653 | | - objectPanel.setToolTipTextAt(4, "XYZ/RGB transform"); |
---|
| 1753 | + objectPanel.setToolTipTextAt(4, "TRS transform"); |
---|
1654 | 1754 | |
---|
| 1755 | + patchMaterial = true; |
---|
| 1756 | + cameraView.patchMaterial = this; |
---|
| 1757 | + objectPanel.setSelectedIndex(2); |
---|
| 1758 | + |
---|
1655 | 1759 | /* |
---|
1656 | 1760 | aConstraints.gridx = 0; |
---|
1657 | 1761 | aConstraints.gridwidth = 1; |
---|
.. | .. |
---|
1671 | 1775 | scrollpane.addMouseWheelListener(this); // Default not fast enough |
---|
1672 | 1776 | |
---|
1673 | 1777 | /*JTabbedPane*/ scenePanel = new cGridBag(); |
---|
1674 | | - scenePanel.preferredWidth = 5; |
---|
| 1778 | + scenePanel.preferredWidth = 6; |
---|
1675 | 1779 | |
---|
1676 | 1780 | JTabbedPane tabbedPane = new JTabbedPane(); |
---|
1677 | 1781 | tabbedPane.add(scrollpane); |
---|
.. | .. |
---|
1682 | 1786 | |
---|
1683 | 1787 | AddOptions(optionsPanel); //, aConstraints); |
---|
1684 | 1788 | |
---|
1685 | | - tabbedPane.add(optionsPanel); |
---|
1686 | | - |
---|
1687 | 1789 | tabbedPane.add(FSPane = new cFileSystemPane(this)); |
---|
1688 | 1790 | |
---|
| 1791 | + tabbedPane.add(optionsPanel); |
---|
| 1792 | + |
---|
1689 | 1793 | scenePanel.add(tabbedPane); |
---|
1690 | 1794 | |
---|
1691 | | - //if (Globals.ADVANCED) |
---|
1692 | | -// tabbedPane.add(infoPanel); |
---|
1693 | | -// tabbedPane.setIconAt(3, GetIcon("icons/info.png")); |
---|
1694 | | -// tabbedPane.setToolTipTextAt(3, "Information"); |
---|
| 1795 | + cGridBag creditsPanel = new cGridBag().setVertical(true); |
---|
| 1796 | + creditsPanel.setName("Credits"); |
---|
1695 | 1797 | |
---|
| 1798 | + cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF); |
---|
| 1799 | + creditsPanel.add(ogaLabel); |
---|
| 1800 | + |
---|
| 1801 | + cButton creditButton; |
---|
| 1802 | + creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF)); |
---|
| 1803 | + creditButton.setToolTipText("https://opengameart.org"); |
---|
| 1804 | + |
---|
| 1805 | + creditButton.addMouseListener(new MouseAdapter() |
---|
| 1806 | + { |
---|
| 1807 | + public void mouseClicked(MouseEvent e) |
---|
| 1808 | + { |
---|
| 1809 | + try |
---|
| 1810 | + { |
---|
| 1811 | + Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/")); |
---|
| 1812 | + } catch (Exception e1) |
---|
| 1813 | +// } catch (java.io.IOException | java.net.URISyntaxException e1) |
---|
| 1814 | + { |
---|
| 1815 | + e1.printStackTrace(); |
---|
| 1816 | + } |
---|
| 1817 | + } |
---|
| 1818 | + }); |
---|
| 1819 | + |
---|
| 1820 | + ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF); |
---|
| 1821 | + creditsPanel.add(ogaLabel); |
---|
| 1822 | + |
---|
| 1823 | + creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF)); |
---|
| 1824 | + creditButton.setToolTipText("https://3delicious.net"); |
---|
| 1825 | + |
---|
| 1826 | + creditButton.addMouseListener(new MouseAdapter() |
---|
| 1827 | + { |
---|
| 1828 | + public void mouseClicked(MouseEvent e) |
---|
| 1829 | + { |
---|
| 1830 | + try |
---|
| 1831 | + { |
---|
| 1832 | + Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net")); |
---|
| 1833 | + } catch (Exception e1) |
---|
| 1834 | +// } catch (java.io.IOException | java.net.URISyntaxException e1) |
---|
| 1835 | + { |
---|
| 1836 | + e1.printStackTrace(); |
---|
| 1837 | + } |
---|
| 1838 | + } |
---|
| 1839 | + }); |
---|
| 1840 | + |
---|
| 1841 | + creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF)); |
---|
| 1842 | + creditButton.setToolTipText("https://archive3d.net"); |
---|
| 1843 | + |
---|
| 1844 | + creditButton.addMouseListener(new MouseAdapter() |
---|
| 1845 | + { |
---|
| 1846 | + public void mouseClicked(MouseEvent e) |
---|
| 1847 | + { |
---|
| 1848 | + try |
---|
| 1849 | + { |
---|
| 1850 | + Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net")); |
---|
| 1851 | + } catch (Exception e1) |
---|
| 1852 | +// } catch (java.io.IOException | java.net.URISyntaxException e1) |
---|
| 1853 | + { |
---|
| 1854 | + e1.printStackTrace(); |
---|
| 1855 | + } |
---|
| 1856 | + } |
---|
| 1857 | + }); |
---|
| 1858 | + |
---|
| 1859 | + creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF)); |
---|
| 1860 | + creditButton.setToolTipText("https://turbosquid.com"); |
---|
| 1861 | + |
---|
| 1862 | + creditButton.addMouseListener(new MouseAdapter() |
---|
| 1863 | + { |
---|
| 1864 | + public void mouseClicked(MouseEvent e) |
---|
| 1865 | + { |
---|
| 1866 | + try |
---|
| 1867 | + { |
---|
| 1868 | + Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free")); |
---|
| 1869 | + } catch (Exception e1) |
---|
| 1870 | +// } catch (java.io.IOException | java.net.URISyntaxException e1) |
---|
| 1871 | + { |
---|
| 1872 | + e1.printStackTrace(); |
---|
| 1873 | + } |
---|
| 1874 | + } |
---|
| 1875 | + }); |
---|
| 1876 | + |
---|
| 1877 | + for (int i=6; --i>=0;) |
---|
| 1878 | + { |
---|
| 1879 | + creditsPanel.add(new cGridBag()); |
---|
| 1880 | + } |
---|
| 1881 | + |
---|
| 1882 | + tabbedPane.add(creditsPanel); |
---|
| 1883 | + tabbedPane.setToolTipTextAt(3, "Credits"); |
---|
| 1884 | + |
---|
| 1885 | + if (Globals.ADVANCED) |
---|
| 1886 | + { |
---|
| 1887 | + tabbedPane.add(infoPanel); |
---|
| 1888 | + tabbedPane.setIconAt(4, GetIcon("icons/info.png")); |
---|
| 1889 | + tabbedPane.setToolTipTextAt(4, "Information"); |
---|
| 1890 | + } |
---|
| 1891 | + |
---|
1696 | 1892 | /* |
---|
1697 | 1893 | cTree jTree = new cTree(null); |
---|
1698 | 1894 | ToolTipManager.sharedInstance().registerComponent(jTree); |
---|
.. | .. |
---|
1713 | 1909 | jtp.add(tree); |
---|
1714 | 1910 | */ |
---|
1715 | 1911 | |
---|
1716 | | - bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel); |
---|
1717 | | - bigPanel.setContinuousLayout(true); |
---|
1718 | | - bigPanel.setOneTouchExpandable(true); |
---|
1719 | | - bigPanel.setDividerLocation(0.8); |
---|
1720 | | - bigPanel.setDividerSize(15); |
---|
1721 | | - bigPanel.setResizeWeight(0.15); |
---|
1722 | | - bigPanel.setName("Scene"); |
---|
| 1912 | +// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel); |
---|
| 1913 | +// bigPanel.setContinuousLayout(true); |
---|
| 1914 | +// bigPanel.setOneTouchExpandable(true); |
---|
| 1915 | +// bigPanel.setDividerLocation(0.8); |
---|
| 1916 | +// bigPanel.setDividerSize(15); |
---|
| 1917 | +// bigPanel.setResizeWeight(0.15); |
---|
| 1918 | +// bigPanel.setName("Scene"); |
---|
1723 | 1919 | |
---|
1724 | 1920 | //bigPanel.setLayout(new BorderLayout()); |
---|
1725 | 1921 | //bigPanel.setSize(new Dimension(10,10)); |
---|
.. | .. |
---|
1789 | 1985 | |
---|
1790 | 1986 | frame.getContentPane().setLayout(new BorderLayout()); |
---|
1791 | 1987 | /**/ |
---|
1792 | | - JTabbedPane worldPane = new JTabbedPane(); |
---|
| 1988 | + //JTabbedPane worldPane = new JTabbedPane(); |
---|
1793 | 1989 | //worldPane.add(bigPanel); |
---|
1794 | 1990 | //worldPane.add(worldPanel); |
---|
1795 | 1991 | /**/ |
---|
.. | .. |
---|
1803 | 1999 | |
---|
1804 | 2000 | cameraView.requestFocusInWindow(); |
---|
1805 | 2001 | |
---|
1806 | | - gridPanel.setDividerLocation(1.0); |
---|
| 2002 | +// gridPanel.setDividerLocation(1.0); |
---|
1807 | 2003 | |
---|
1808 | 2004 | frame.validate(); |
---|
1809 | 2005 | |
---|
.. | .. |
---|
1838 | 2034 | { |
---|
1839 | 2035 | cGridBag presetpanel = new cGridBag().setVertical(true); |
---|
1840 | 2036 | |
---|
1841 | | - cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF); |
---|
| 2037 | + cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF); |
---|
1842 | 2038 | skin.setToolTipText("Skin"); |
---|
1843 | 2039 | skin.addMouseListener(new MouseAdapter() |
---|
1844 | 2040 | { |
---|
.. | .. |
---|
1849 | 2045 | |
---|
1850 | 2046 | // Skin |
---|
1851 | 2047 | colorField.setFloat(material.color); |
---|
1852 | | - saturationField.setFloat(material.modulation); |
---|
| 2048 | + float saturation = material.modulation; |
---|
| 2049 | + |
---|
| 2050 | + if (!cameraView.Skinshader) |
---|
| 2051 | + { |
---|
| 2052 | + saturation /= 1.5; |
---|
| 2053 | + } |
---|
| 2054 | + |
---|
| 2055 | + saturationField.setFloat(saturation); |
---|
| 2056 | + |
---|
1853 | 2057 | subsurfaceField.setFloat(material.subsurface); |
---|
1854 | 2058 | selfshadowField.setFloat(material.diffuseness); |
---|
1855 | 2059 | diffusenessField.setFloat(material.factor); |
---|
.. | .. |
---|
1868 | 2072 | }); |
---|
1869 | 2073 | presetpanel.add(skin); |
---|
1870 | 2074 | |
---|
1871 | | - cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF); |
---|
| 2075 | + cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF); |
---|
1872 | 2076 | lambert.setToolTipText("Diffuse"); |
---|
1873 | 2077 | lambert.addMouseListener(new MouseAdapter() |
---|
1874 | 2078 | { |
---|
.. | .. |
---|
1886 | 2090 | }); |
---|
1887 | 2091 | presetpanel.add(lambert); |
---|
1888 | 2092 | |
---|
1889 | | - cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF); |
---|
| 2093 | + cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF); |
---|
1890 | 2094 | diffuse2.setToolTipText("Diffuse2"); |
---|
1891 | 2095 | diffuse2.addMouseListener(new MouseAdapter() |
---|
1892 | 2096 | { |
---|
.. | .. |
---|
1904 | 2108 | }); |
---|
1905 | 2109 | presetpanel.add(diffuse2); |
---|
1906 | 2110 | |
---|
1907 | | - cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF); |
---|
| 2111 | + cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF); |
---|
1908 | 2112 | diffusemoon.setToolTipText("Moon"); |
---|
1909 | 2113 | diffusemoon.addMouseListener(new MouseAdapter() |
---|
1910 | 2114 | { |
---|
.. | .. |
---|
1922 | 2126 | }); |
---|
1923 | 2127 | presetpanel.add(diffusemoon); |
---|
1924 | 2128 | |
---|
1925 | | - cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF); |
---|
| 2129 | + cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF); |
---|
1926 | 2130 | diffusemoon2.setToolTipText("Moon2"); |
---|
1927 | 2131 | diffusemoon2.addMouseListener(new MouseAdapter() |
---|
1928 | 2132 | { |
---|
.. | .. |
---|
1940 | 2144 | }); |
---|
1941 | 2145 | presetpanel.add(diffusemoon2); |
---|
1942 | 2146 | |
---|
1943 | | - cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF); |
---|
| 2147 | + cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF); |
---|
1944 | 2148 | diffusemoon3.setToolTipText("Moon3"); |
---|
1945 | 2149 | diffusemoon3.addMouseListener(new MouseAdapter() |
---|
1946 | 2150 | { |
---|
.. | .. |
---|
1958 | 2162 | }); |
---|
1959 | 2163 | presetpanel.add(diffusemoon3); |
---|
1960 | 2164 | |
---|
1961 | | - cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF); |
---|
| 2165 | + cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF); |
---|
1962 | 2166 | diffusesheen.setToolTipText("Sheen"); |
---|
1963 | 2167 | diffusesheen.addMouseListener(new MouseAdapter() |
---|
1964 | 2168 | { |
---|
.. | .. |
---|
1975 | 2179 | }); |
---|
1976 | 2180 | presetpanel.add(diffusesheen); |
---|
1977 | 2181 | |
---|
1978 | | - cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF); |
---|
| 2182 | + cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF); |
---|
1979 | 2183 | rough.setToolTipText("Rough metal"); |
---|
1980 | 2184 | rough.addMouseListener(new MouseAdapter() |
---|
1981 | 2185 | { |
---|
.. | .. |
---|
1993 | 2197 | }); |
---|
1994 | 2198 | presetpanel.add(rough); |
---|
1995 | 2199 | |
---|
1996 | | - cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF); |
---|
| 2200 | + cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF); |
---|
1997 | 2201 | rough2.setToolTipText("Medium metal"); |
---|
1998 | 2202 | rough2.addMouseListener(new MouseAdapter() |
---|
1999 | 2203 | { |
---|
.. | .. |
---|
2011 | 2215 | }); |
---|
2012 | 2216 | presetpanel.add(rough2); |
---|
2013 | 2217 | |
---|
2014 | | - cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF); |
---|
| 2218 | + cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF); |
---|
2015 | 2219 | shini0.setToolTipText("Shiny"); |
---|
2016 | 2220 | shini0.addMouseListener(new MouseAdapter() |
---|
2017 | 2221 | { |
---|
.. | .. |
---|
2029 | 2233 | }); |
---|
2030 | 2234 | presetpanel.add(shini0); |
---|
2031 | 2235 | |
---|
2032 | | - cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF); |
---|
| 2236 | + cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF); |
---|
2033 | 2237 | shini1.setToolTipText("Shiny2"); |
---|
2034 | 2238 | shini1.addMouseListener(new MouseAdapter() |
---|
2035 | 2239 | { |
---|
.. | .. |
---|
2047 | 2251 | }); |
---|
2048 | 2252 | presetpanel.add(shini1); |
---|
2049 | 2253 | |
---|
2050 | | - cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF); |
---|
| 2254 | + cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF); |
---|
2051 | 2255 | shini2.setToolTipText("Shiny3"); |
---|
2052 | 2256 | shini2.addMouseListener(new MouseAdapter() |
---|
2053 | 2257 | { |
---|
.. | .. |
---|
2065 | 2269 | }); |
---|
2066 | 2270 | presetpanel.add(shini2); |
---|
2067 | 2271 | |
---|
2068 | | - cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF); |
---|
| 2272 | + cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF); |
---|
2069 | 2273 | aniso.setToolTipText("AnisoU"); |
---|
2070 | 2274 | aniso.addMouseListener(new MouseAdapter() |
---|
2071 | 2275 | { |
---|
.. | .. |
---|
2083 | 2287 | }); |
---|
2084 | 2288 | presetpanel.add(aniso); |
---|
2085 | 2289 | |
---|
2086 | | - cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF); |
---|
| 2290 | + cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF); |
---|
2087 | 2291 | aniso2.setToolTipText("AnisoV"); |
---|
2088 | 2292 | aniso2.addMouseListener(new MouseAdapter() |
---|
2089 | 2293 | { |
---|
.. | .. |
---|
2101 | 2305 | }); |
---|
2102 | 2306 | presetpanel.add(aniso2); |
---|
2103 | 2307 | |
---|
2104 | | - cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF); |
---|
| 2308 | + cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF); |
---|
2105 | 2309 | aniso3.setToolTipText("AnisoUV"); |
---|
2106 | 2310 | aniso3.addMouseListener(new MouseAdapter() |
---|
2107 | 2311 | { |
---|
.. | .. |
---|
2119 | 2323 | }); |
---|
2120 | 2324 | presetpanel.add(aniso3); |
---|
2121 | 2325 | |
---|
2122 | | - cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF); |
---|
| 2326 | + cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF); |
---|
2123 | 2327 | velvet0.setToolTipText("Velvet"); |
---|
2124 | 2328 | velvet0.addMouseListener(new MouseAdapter() |
---|
2125 | 2329 | { |
---|
.. | .. |
---|
2141 | 2345 | }); |
---|
2142 | 2346 | presetpanel.add(velvet0); |
---|
2143 | 2347 | |
---|
2144 | | - cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF); |
---|
| 2348 | + cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF); |
---|
2145 | 2349 | bump0.setToolTipText("Bump texture"); |
---|
2146 | 2350 | bump0.addMouseListener(new MouseAdapter() |
---|
2147 | 2351 | { |
---|
.. | .. |
---|
2160 | 2364 | }); |
---|
2161 | 2365 | presetpanel.add(bump0); |
---|
2162 | 2366 | |
---|
2163 | | - cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF); |
---|
| 2367 | + cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF); |
---|
| 2368 | + borderShader.setToolTipText("Border fade"); |
---|
| 2369 | + borderShader.addMouseListener(new MouseAdapter() |
---|
| 2370 | + { |
---|
| 2371 | + public void mouseClicked(MouseEvent e) |
---|
| 2372 | + { |
---|
| 2373 | + borderfadeField.setFloat(0.5); |
---|
| 2374 | + opacityField.setFloat(0.75); |
---|
| 2375 | + |
---|
| 2376 | + materialtouched = true; |
---|
| 2377 | + applySelf(); |
---|
| 2378 | + } |
---|
| 2379 | + }); |
---|
| 2380 | + presetpanel.add(borderShader); |
---|
| 2381 | + |
---|
| 2382 | + cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF); |
---|
2164 | 2383 | halo.setToolTipText("Halo"); |
---|
2165 | 2384 | halo.addMouseListener(new MouseAdapter() |
---|
2166 | 2385 | { |
---|
.. | .. |
---|
2177 | 2396 | }); |
---|
2178 | 2397 | presetpanel.add(halo); |
---|
2179 | 2398 | |
---|
2180 | | - cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF); |
---|
| 2399 | + cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF); |
---|
2181 | 2400 | candle.setToolTipText("Candle"); |
---|
2182 | 2401 | candle.addMouseListener(new MouseAdapter() |
---|
2183 | 2402 | { |
---|
.. | .. |
---|
2199 | 2418 | }); |
---|
2200 | 2419 | presetpanel.add(candle); |
---|
2201 | 2420 | |
---|
2202 | | - cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF); |
---|
| 2421 | + cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF); |
---|
2203 | 2422 | shadowShader.setToolTipText("Shadow"); |
---|
2204 | 2423 | shadowShader.addMouseListener(new MouseAdapter() |
---|
2205 | 2424 | { |
---|
.. | .. |
---|
2234 | 2453 | |
---|
2235 | 2454 | cGridBag editBar = new cGridBag().setVertical(false); |
---|
2236 | 2455 | |
---|
2237 | | - editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints); |
---|
| 2456 | + editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints); |
---|
2238 | 2457 | createMaterialButton.setToolTipText("Create material"); |
---|
2239 | 2458 | |
---|
2240 | 2459 | /* |
---|
2241 | 2460 | ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints); |
---|
2242 | 2461 | */ |
---|
2243 | 2462 | |
---|
2244 | | - editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints); |
---|
| 2463 | + editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints); |
---|
2245 | 2464 | clearMaterialButton.setToolTipText("Clear material"); |
---|
2246 | 2465 | |
---|
2247 | 2466 | if (Globals.ADVANCED) |
---|
2248 | 2467 | { |
---|
2249 | | - editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints); |
---|
| 2468 | + editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints); |
---|
2250 | 2469 | editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints); |
---|
2251 | 2470 | editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints); |
---|
2252 | 2471 | } |
---|
.. | .. |
---|
2267 | 2486 | |
---|
2268 | 2487 | cGridBag huepanel = new cGridBag(); |
---|
2269 | 2488 | cGridBag huelabel = new cGridBag(); |
---|
2270 | | - skin = GetLabel("icons/hue.png", false); |
---|
2271 | | - skin.fit = true; |
---|
2272 | | - huelabel.add(skin); |
---|
| 2489 | + cLabel hue = GetLabel("icons/hue.png", false); |
---|
| 2490 | + hue.fit = true; |
---|
| 2491 | + |
---|
| 2492 | + hue.addMouseListener(new MouseAdapter() |
---|
| 2493 | + { |
---|
| 2494 | + public void mousePressed(MouseEvent e) |
---|
| 2495 | + { |
---|
| 2496 | + int x = e.getX(); |
---|
| 2497 | + |
---|
| 2498 | + colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth()); |
---|
| 2499 | + } |
---|
| 2500 | + }); |
---|
| 2501 | + |
---|
| 2502 | + huelabel.add(hue); |
---|
2273 | 2503 | huelabel.preferredWidth = 20; |
---|
2274 | 2504 | huepanel.add(new cGridBag()); // Label |
---|
2275 | 2505 | huepanel.add(huelabel); // Field/slider |
---|
.. | .. |
---|
3545 | 3775 | |
---|
3546 | 3776 | if (multiplyToggle != null) |
---|
3547 | 3777 | multiplyToggle.setSelected(mat.multiply); |
---|
3548 | | - |
---|
3549 | | - assert (object.projectedVertices != null); |
---|
3550 | | - |
---|
3551 | | - if (object.projectedVertices.length <= 2) |
---|
3552 | | - { |
---|
3553 | | - // Side effect... |
---|
3554 | | - Object3D.cVector2[] keep = object.projectedVertices; |
---|
3555 | | - object.projectedVertices = new Object3D.cVector2[3]; |
---|
3556 | | - for (int i = 0; i < 3; i++) |
---|
3557 | | - { |
---|
3558 | | - if (i < keep.length) |
---|
3559 | | - { |
---|
3560 | | - object.projectedVertices[i] = keep[i]; |
---|
3561 | | - } else |
---|
3562 | | - { |
---|
3563 | | - object.projectedVertices[i] = new Object3D.cVector2(); |
---|
3564 | | - } |
---|
3565 | | - /* |
---|
3566 | | - if(keep.length == 0) |
---|
3567 | | - object.projectedVertices[0] = new Object3D.cVector2(); |
---|
3568 | | - else |
---|
3569 | | - object.projectedVertices[0] = keep[0]; |
---|
3570 | | - object.projectedVertices[1] = new Object3D.cVector2(); |
---|
3571 | | - */ |
---|
3572 | | - } |
---|
3573 | | - } |
---|
| 3778 | + |
---|
| 3779 | + AllocProjectedVertices(object); |
---|
3574 | 3780 | |
---|
3575 | 3781 | SetMaterial(mat, object.projectedVertices); |
---|
3576 | 3782 | } |
---|
.. | .. |
---|
3880 | 4086 | //System.out.println("ObjEditor " + event); |
---|
3881 | 4087 | applySelf0(true); |
---|
3882 | 4088 | //parent.applySelf(); |
---|
3883 | | - objEditor.refreshContents(); |
---|
| 4089 | + // conflicts with requestFocus objEditor.refreshContents(); |
---|
3884 | 4090 | } else if (source == resetButton) |
---|
3885 | 4091 | { |
---|
3886 | 4092 | CameraPane.fullreset = true; |
---|
.. | .. |
---|
4060 | 4266 | |
---|
4061 | 4267 | void New() |
---|
4062 | 4268 | { |
---|
4063 | | - while (copy.Size() > 1) |
---|
| 4269 | + while (copy.Size() > 0) |
---|
4064 | 4270 | { |
---|
4065 | | - copy.remove(1); |
---|
| 4271 | + copy.remove(0); |
---|
4066 | 4272 | } |
---|
4067 | 4273 | |
---|
| 4274 | + copy.selection.clear(); |
---|
| 4275 | + |
---|
| 4276 | + if (copy == Grafreed.grafreed.universe) |
---|
| 4277 | + { |
---|
| 4278 | + CreateCameras(); |
---|
| 4279 | + cameraView.SetCamera(GetCamera(copy, 0)); |
---|
| 4280 | + } |
---|
4068 | 4281 | ResetModel(); |
---|
4069 | 4282 | objEditor.refreshContents(); |
---|
4070 | 4283 | } |
---|
.. | .. |
---|
4192 | 4405 | return true; |
---|
4193 | 4406 | } |
---|
4194 | 4407 | |
---|
4195 | | - java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>(); |
---|
4196 | | - |
---|
4197 | 4408 | void DeleteVersion() |
---|
4198 | 4409 | { |
---|
4199 | 4410 | for (int i = copy.versionindex; i < copy.versionlist.length-1; i++) |
---|
.. | .. |
---|
4201 | 4412 | copy.versionlist[i] = copy.versionlist[i+1]; |
---|
4202 | 4413 | } |
---|
4203 | 4414 | |
---|
4204 | | - CopyChanged(); |
---|
| 4415 | + if (copy.versionlist[copy.versionindex] == null) |
---|
| 4416 | + copy.versionindex -= 1; |
---|
| 4417 | + |
---|
| 4418 | + if (copy.versionindex != -1) |
---|
| 4419 | + CopyChanged(); |
---|
4205 | 4420 | |
---|
4206 | 4421 | SetVersionStates(); |
---|
4207 | 4422 | } |
---|
.. | .. |
---|
4314 | 4529 | boolean temp = CameraPane.SWITCH; |
---|
4315 | 4530 | CameraPane.SWITCH = false; |
---|
4316 | 4531 | |
---|
4317 | | - copy.ExtractBigData(versiontable); |
---|
| 4532 | + copy.ExtractBigData(Grafreed.grafreed.universe.versiontable); |
---|
4318 | 4533 | |
---|
4319 | 4534 | copy.clear(); |
---|
4320 | 4535 | |
---|
.. | .. |
---|
4326 | 4541 | copy.add(obj.get(i)); |
---|
4327 | 4542 | } |
---|
4328 | 4543 | |
---|
4329 | | - copy.RestoreBigData(versiontable); |
---|
| 4544 | + copy.RestoreBigData(Grafreed.grafreed.universe.versiontable); |
---|
4330 | 4545 | |
---|
4331 | 4546 | CameraPane.SWITCH = temp; |
---|
4332 | 4547 | |
---|
.. | .. |
---|
4376 | 4591 | return count; |
---|
4377 | 4592 | } |
---|
4378 | 4593 | |
---|
| 4594 | + public cGridBag versionSliderPane; |
---|
| 4595 | + |
---|
4379 | 4596 | void SetVersionStates() |
---|
4380 | 4597 | { |
---|
4381 | 4598 | //if (true) |
---|
.. | .. |
---|
4383 | 4600 | |
---|
4384 | 4601 | //cRadio tab = GetCurrentTab(); |
---|
4385 | 4602 | |
---|
4386 | | - restoreButton.setEnabled(copy.versionindex != -1); |
---|
4387 | | - replaceButton.setEnabled(copy.versionindex != -1); |
---|
4388 | | - |
---|
4389 | | - previousVersionButton.setEnabled(copy.versionindex > 0); |
---|
4390 | | - nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null); |
---|
4391 | | - |
---|
4392 | | - deleteVersionButton.setEnabled(//copy.versionindex > 0 && |
---|
4393 | | - copy.versionlist[copy.versionindex + 1] != null); |
---|
4394 | | - |
---|
4395 | | - muteSlider = true; |
---|
4396 | | - versionSlider.setMinimum(0); |
---|
4397 | | - versionSlider.setMaximum(VersionCount() - 1); |
---|
4398 | | - versionSlider.setInteger(copy.versionindex); |
---|
4399 | | - versionSlider.setEnabled(copy.versionindex != -1); |
---|
4400 | | - muteSlider = false; |
---|
| 4603 | + if (copy.versionlist == null) |
---|
| 4604 | + { |
---|
| 4605 | + saveVersionButton.setEnabled(false); |
---|
| 4606 | + restoreButton.setEnabled(false); |
---|
| 4607 | + replaceButton.setEnabled(false); |
---|
| 4608 | + previousVersionButton.setEnabled(false); |
---|
| 4609 | + nextVersionButton.setEnabled(false); |
---|
| 4610 | + deleteVersionButton.setEnabled(false); |
---|
| 4611 | + versionSliderPane.setVisible(false); |
---|
| 4612 | + } |
---|
| 4613 | + else |
---|
| 4614 | + { |
---|
| 4615 | + restoreButton.setEnabled(copy.versionindex != -1); |
---|
| 4616 | + replaceButton.setEnabled(copy.versionindex != -1); |
---|
| 4617 | + |
---|
| 4618 | + previousVersionButton.setEnabled(copy.versionindex > 0); |
---|
| 4619 | + nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null); |
---|
| 4620 | + |
---|
| 4621 | + deleteVersionButton.setEnabled(copy.versionindex != -1); |
---|
| 4622 | + //copy.versionlist[copy.versionindex + 1] != null); |
---|
| 4623 | + |
---|
| 4624 | + muteSlider = true; |
---|
| 4625 | + versionSlider.setMinimum(0); |
---|
| 4626 | + versionSlider.setMaximum(VersionCount() - 1); |
---|
| 4627 | + versionSlider.setInteger(copy.versionindex); |
---|
| 4628 | + versionSlider.setEnabled(copy.versionindex != -1); |
---|
| 4629 | + muteSlider = false; |
---|
| 4630 | + |
---|
| 4631 | + versionSliderPane.setVisible(true); |
---|
| 4632 | + } |
---|
4401 | 4633 | } |
---|
4402 | 4634 | |
---|
4403 | 4635 | public boolean PreviousVersion() |
---|
.. | .. |
---|
4455 | 4687 | |
---|
4456 | 4688 | public boolean Replace() |
---|
4457 | 4689 | { |
---|
4458 | | - System.err.println("Replace"); |
---|
| 4690 | + //System.err.println("Replace"); |
---|
4459 | 4691 | |
---|
4460 | 4692 | //cRadio tab = GetCurrentTab(); |
---|
4461 | 4693 | |
---|
.. | .. |
---|
4682 | 4914 | // else |
---|
4683 | 4915 | // applySelf(true); |
---|
4684 | 4916 | // } |
---|
| 4917 | + |
---|
| 4918 | + boolean Equal(double a, double b) |
---|
| 4919 | + { |
---|
| 4920 | + return Math.abs(a - b) < 0.001; |
---|
| 4921 | + } |
---|
| 4922 | + |
---|
4685 | 4923 | void applySelf0(boolean name) |
---|
4686 | 4924 | { |
---|
4687 | 4925 | if (name) |
---|
.. | .. |
---|
4731 | 4969 | { |
---|
4732 | 4970 | cMaterial mat = copy.material; |
---|
4733 | 4971 | |
---|
4734 | | - colorField.SetToolTipValue((mat.color)); |
---|
4735 | | - saturationField.SetToolTipValue((mat.modulation)); |
---|
4736 | | - metalnessField.SetToolTipValue((mat.metalness)); |
---|
4737 | | - diffuseField.SetToolTipValue((mat.diffuse)); |
---|
4738 | | - specularField.SetToolTipValue((mat.specular)); |
---|
4739 | | - shininessField.SetToolTipValue((mat.shininess)); |
---|
4740 | | - shiftField.SetToolTipValue((mat.shift)); |
---|
4741 | | - ambientField.SetToolTipValue((mat.ambient)); |
---|
4742 | | - lightareaField.SetToolTipValue((mat.lightarea)); |
---|
4743 | | - diffusenessField.SetToolTipValue((mat.factor)); |
---|
4744 | | - velvetField.SetToolTipValue((mat.velvet)); |
---|
4745 | | - sheenField.SetToolTipValue((mat.sheen)); |
---|
4746 | | - subsurfaceField.SetToolTipValue((mat.subsurface)); |
---|
4747 | | - backlitField.SetToolTipValue((mat.bump)); |
---|
4748 | | - anisoField.SetToolTipValue((mat.aniso)); |
---|
4749 | | - anisoVField.SetToolTipValue((mat.anisoV)); |
---|
4750 | | - cameraField.SetToolTipValue((mat.cameralight)); |
---|
4751 | | - selfshadowField.SetToolTipValue((mat.diffuseness)); |
---|
4752 | | - shadowField.SetToolTipValue((mat.shadow)); |
---|
4753 | | - textureField.SetToolTipValue((mat.texture)); |
---|
4754 | | - opacityField.SetToolTipValue((mat.opacity)); |
---|
4755 | | - fakedepthField.SetToolTipValue((mat.fakedepth)); |
---|
4756 | | - shadowbiasField.SetToolTipValue((mat.shadowbias)); |
---|
| 4972 | + if (!Equal(colorField.getFloat(), mat.color)) |
---|
| 4973 | + colorField.SetToolTipValue((mat.color)); |
---|
| 4974 | + if (!Equal(saturationField.getFloat(), mat.modulation)) |
---|
| 4975 | + saturationField.SetToolTipValue((mat.modulation)); |
---|
| 4976 | + if (!Equal(metalnessField.getFloat(), mat.metalness)) |
---|
| 4977 | + metalnessField.SetToolTipValue((mat.metalness)); |
---|
| 4978 | + if (!Equal(diffuseField.getFloat(), mat.diffuse)) |
---|
| 4979 | + diffuseField.SetToolTipValue((mat.diffuse)); |
---|
| 4980 | + if (!Equal(specularField.getFloat(), mat.specular)) |
---|
| 4981 | + specularField.SetToolTipValue((mat.specular)); |
---|
| 4982 | + if (!Equal(shininessField.getFloat(), mat.shininess)) |
---|
| 4983 | + shininessField.SetToolTipValue((mat.shininess)); |
---|
| 4984 | + if (!Equal(shiftField.getFloat(), mat.shift)) |
---|
| 4985 | + shiftField.SetToolTipValue((mat.shift)); |
---|
| 4986 | + if (!Equal(ambientField.getFloat(), mat.ambient)) |
---|
| 4987 | + ambientField.SetToolTipValue((mat.ambient)); |
---|
| 4988 | + if (!Equal(lightareaField.getFloat(), mat.lightarea)) |
---|
| 4989 | + lightareaField.SetToolTipValue((mat.lightarea)); |
---|
| 4990 | + if (!Equal(diffusenessField.getFloat(), mat.factor)) |
---|
| 4991 | + diffusenessField.SetToolTipValue((mat.factor)); |
---|
| 4992 | + if (!Equal(velvetField.getFloat(), mat.velvet)) |
---|
| 4993 | + velvetField.SetToolTipValue((mat.velvet)); |
---|
| 4994 | + if (!Equal(sheenField.getFloat(), mat.sheen)) |
---|
| 4995 | + sheenField.SetToolTipValue((mat.sheen)); |
---|
| 4996 | + if (!Equal(subsurfaceField.getFloat(), mat.subsurface)) |
---|
| 4997 | + subsurfaceField.SetToolTipValue((mat.subsurface)); |
---|
| 4998 | + if (!Equal(backlitField.getFloat(), mat.bump)) |
---|
| 4999 | + backlitField.SetToolTipValue((mat.bump)); |
---|
| 5000 | + if (!Equal(anisoField.getFloat(), mat.aniso)) |
---|
| 5001 | + anisoField.SetToolTipValue((mat.aniso)); |
---|
| 5002 | + if (!Equal(anisoVField.getFloat(), mat.anisoV)) |
---|
| 5003 | + anisoVField.SetToolTipValue((mat.anisoV)); |
---|
| 5004 | + if (!Equal(cameraField.getFloat(), mat.cameralight)) |
---|
| 5005 | + cameraField.SetToolTipValue((mat.cameralight)); |
---|
| 5006 | + if (!Equal(selfshadowField.getFloat(), mat.diffuseness)) |
---|
| 5007 | + selfshadowField.SetToolTipValue((mat.diffuseness)); |
---|
| 5008 | + if (!Equal(shadowField.getFloat(), mat.shadow)) |
---|
| 5009 | + shadowField.SetToolTipValue((mat.shadow)); |
---|
| 5010 | + if (!Equal(textureField.getFloat(), mat.texture)) |
---|
| 5011 | + textureField.SetToolTipValue((mat.texture)); |
---|
| 5012 | + if (!Equal(opacityField.getFloat(), mat.opacity)) |
---|
| 5013 | + opacityField.SetToolTipValue((mat.opacity)); |
---|
| 5014 | + if (!Equal(fakedepthField.getFloat(), mat.fakedepth)) |
---|
| 5015 | + fakedepthField.SetToolTipValue((mat.fakedepth)); |
---|
| 5016 | + if (!Equal(shadowbiasField.getFloat(), mat.shadowbias)) |
---|
| 5017 | + shadowbiasField.SetToolTipValue((mat.shadowbias)); |
---|
4757 | 5018 | } |
---|
4758 | 5019 | |
---|
4759 | 5020 | if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null) |
---|
.. | .. |
---|
4788 | 5049 | |
---|
4789 | 5050 | public void stateChanged(ChangeEvent e) |
---|
4790 | 5051 | { |
---|
4791 | | - // assert(false); |
---|
| 5052 | + // assert(false); |
---|
4792 | 5053 | if (e.getSource() == versionSlider) |
---|
4793 | 5054 | { |
---|
4794 | 5055 | if (muteSlider) |
---|
.. | .. |
---|
5158 | 5419 | |
---|
5159 | 5420 | if (previousVersionButton != null && copy.versionlist != null) |
---|
5160 | 5421 | SetVersionStates(); |
---|
| 5422 | + |
---|
| 5423 | + cameraView.requestFocusInWindow(); |
---|
5161 | 5424 | } |
---|
5162 | 5425 | |
---|
5163 | 5426 | static TweenManager tweenManager = new TweenManager(); |
---|
.. | .. |
---|
5189 | 5452 | // group = (Composite) group.get(0); |
---|
5190 | 5453 | // } |
---|
5191 | 5454 | |
---|
5192 | | - System.out.println("makeSomething of " + thing); |
---|
| 5455 | + //System.out.println("makeSomething of " + thing); |
---|
5193 | 5456 | |
---|
5194 | 5457 | /* |
---|
5195 | 5458 | if (deselect && jList != null) |
---|
.. | .. |
---|
5543 | 5806 | |
---|
5544 | 5807 | copy.versionlist = readobj.versionlist; |
---|
5545 | 5808 | copy.versionindex = readobj.versionindex; |
---|
| 5809 | + copy.versiontable = readobj.versiontable; |
---|
5546 | 5810 | |
---|
5547 | 5811 | if (copy.versionlist == null) |
---|
5548 | 5812 | { |
---|
.. | .. |
---|
5550 | 5814 | copy.versionlist = new Object3D[100]; |
---|
5551 | 5815 | copy.versionindex = -1; |
---|
5552 | 5816 | |
---|
5553 | | - Save(true); |
---|
| 5817 | + //Save(true); |
---|
5554 | 5818 | } |
---|
5555 | 5819 | |
---|
5556 | 5820 | //? SetUndoStates(); |
---|
.. | .. |
---|
5898 | 6162 | boolean materialFlushed; |
---|
5899 | 6163 | Object3D latestObject; |
---|
5900 | 6164 | |
---|
| 6165 | + cGridBag transformPanel; |
---|
5901 | 6166 | cGridBag XYZPanel; |
---|
5902 | 6167 | |
---|
5903 | 6168 | JSplitPane gridPanel; |
---|