Normand Briere
2019-08-18 66aca73cce89e4b4d7521862760edf4b0888bc38
ObjEditor.java
....@@ -34,6 +34,7 @@
3434 iSendInfo
3535 //KeyListener
3636 {
37
+ public cToggleButton pinButton;
3738 boolean timeline;
3839 boolean wasFullScreen;
3940
....@@ -41,6 +42,35 @@
4142 JFrame frame;
4243
4344 static ObjEditor theFrame;
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
+ }
4474
4575 public cGridBag GetSeparator()
4676 {
....@@ -53,7 +83,10 @@
5383 cButton GetButton(String name, boolean border)
5484 {
5585 ImageIcon icon = GetIcon(name);
56
- 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);
5790 }
5891
5992 cLabel GetLabel(String name, boolean border)
....@@ -74,11 +107,19 @@
74107 return new cCheckBox(icon, border);
75108 }
76109
77
- ImageIcon GetIcon(String name)
110
+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
111
+
112
+ static ImageIcon GetIcon(String name)
78113 {
114
+ javax.swing.ImageIcon iconCache = icons.get(name);
115
+ if (iconCache != null)
116
+ {
117
+ return iconCache;
118
+ }
119
+
79120 try
80121 {
81
- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
122
+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
82123
83124 // if (image.getWidth() > 48 && image.getHeight() > 48)
84125 // {
....@@ -93,10 +134,14 @@
93134 // }
94135
95136 javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
137
+
138
+ icons.put(name, icon);
139
+
96140 return icon;
97141 }
98142 catch (Exception e)
99143 {
144
+ //icons.put(name, null);
100145 return null;
101146 }
102147 }
....@@ -296,11 +341,13 @@
296341 client = inClient;
297342 copy = client;
298343
299
- if (copy.versions == null)
300
- {
301
- copy.versions = new Object3D[100];
302
- copy.versionindex = -1;
303
- }
344
+// if (copy.versionlist == null)
345
+// {
346
+// copy.versionlist = new Object3D[100];
347
+// copy.versionindex = -1;
348
+//
349
+// callee.Save(true);
350
+// }
304351
305352 // "this" is not called: SetupUI2(objEditor);
306353 }
....@@ -315,10 +362,12 @@
315362 client = inClient;
316363 copy = client;
317364
318
- if (copy.versions == null)
365
+ if (copy.versionlist == null)
319366 {
320
- copy.versions = new Object3D[100];
367
+ copy.versionlist = new Object3D[100];
321368 copy.versionindex = -1;
369
+
370
+// Save(true);
322371 }
323372
324373 SetupUI2(callee.GetEditor());
....@@ -342,7 +391,8 @@
342391 //parent = p;
343392
344393 GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
345
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
394
+ if (Globals.DEBUG)
395
+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
346396 //gd.setFullScreenWindow(this);
347397 //setResizable(false);
348398 //if (!isDisplayable())
....@@ -353,11 +403,13 @@
353403 copy = localCopy;
354404 copy.editWindow = this;
355405
356
- if (copy.versions == null)
357
- {
358
-// copy.versions = new byte[100][];
406
+// if (copy.versionlist == null)
407
+// {
408
+// copy.versionlist = new Object3D[100];
359409 // copy.versionindex = -1;
360
- }
410
+//
411
+// Save(true);
412
+// }
361413
362414 SetupMenu();
363415
....@@ -377,6 +429,9 @@
377429
378430 static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
379431
432
+ // This is to refresh the UI of the material panel.
433
+ boolean patchMaterial;
434
+
380435 void SetupMenu()
381436 {
382437 frame.setMenuBar(menuBar = new MenuBar());
....@@ -426,6 +481,8 @@
426481
427482 ChangeListener changeListener = new ChangeListener()
428483 {
484
+ //String name;
485
+
429486 public void stateChanged(ChangeEvent changeEvent)
430487 {
431488 // if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -444,7 +501,37 @@
444501 // EditSelection(false);
445502 // }
446503
447
- refreshContents(false); // To refresh Info tab
504
+// if (objectPanel.getSelectedIndex() == 4)
505
+// {
506
+// name = copy.skyboxname;
507
+//
508
+// if (name == null)
509
+// {
510
+// name = "";
511
+// }
512
+//
513
+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
514
+// copy.skyboxext = "jpg";
515
+// }
516
+// else
517
+// {
518
+// if (name != null)
519
+// {
520
+// if (name.equals(""))
521
+// {
522
+// copy.skyboxname = null;
523
+// copy.skyboxext = null;
524
+// }
525
+// else
526
+// {
527
+// copy.skyboxname = name;
528
+// }
529
+// }
530
+// }
531
+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
532
+
533
+// refreshContents(false); // To refresh Info tab
534
+ cameraView.repaint();
448535 }
449536 };
450537 objectPanel.addChangeListener(changeListener);
....@@ -467,7 +554,9 @@
467554 toolboxPanel = new cGridBag().setVertical(true);
468555 //toolboxPanel.setName("Toolbox");
469556
470
- materialPanel = new cGridBag().setVertical(true);
557
+ skyboxPanel = new cGridBag().setVertical(true);
558
+
559
+ materialPanel = new cGridBag().setVertical(false);
471560 //materialPanel.setName("Material");
472561
473562 /*JTextPane*/
....@@ -751,6 +840,7 @@
751840 boolean maximized;
752841
753842 cButton fullscreenLayout;
843
+ cButton expandedLayout;
754844
755845 void Minimize()
756846 {
....@@ -790,10 +880,12 @@
790880 cButton minButton;
791881 cButton maxButton;
792882 cButton fullButton;
883
+ cButton collapseButton;
884
+ cButton maximize3DButton;
793885
794886 void ToggleFullScreen()
795887 {
796
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
888
+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797889
798890 cameraView.ToggleFullScreen();
799891
....@@ -814,13 +906,13 @@
814906 // X frame.getContentPane().remove(/*"Center",*/bigThree);
815907 // X framePanel.add(bigThree);
816908 // X frame.getContentPane().add(/*"Center",*/framePanel);
817
- framePanel.setDividerLocation(46);
909
+// framePanel.setDividerLocation(46); // icons are 24x24
818910
819911 //frame.setVisible(true);
820
- radio.layout = keepButton;
912
+// radio.layout = keepButton;
821913 //theFrame = null;
822914 keepButton = null;
823
- radio.layout.doClick();
915
+// radio.layout.doClick();
824916
825917 } else
826918 {
....@@ -841,32 +933,53 @@
841933 // X frame.getContentPane().remove(/*"Center",*/framePanel);
842934 // X framePanel.remove(bigThree);
843935 // X frame.getContentPane().add(/*"Center",*/bigThree);
844
- framePanel.setDividerLocation(0);
936
+// framePanel.setDividerLocation(0);
845937
846
- radio.layout = fullscreenLayout;
847
- radio.layout.doClick();
938
+// radio.layout = fullscreenLayout;
939
+// radio.layout.doClick();
848940 //frame.setVisible(true);
849941 }
850942 frame.validate();
943
+
944
+ cameraView.requestFocusInWindow();
851945 }
852946
853
- private Object3D CompressCopy()
947
+ void CollapseToolbar()
948
+ {
949
+ framePanel.setDividerLocation(0);
950
+ //frame.validate();
951
+
952
+ cameraView.requestFocusInWindow();
953
+ }
954
+
955
+ private Object3D Duplicate(Object3D object)
854956 {
855957 boolean temp = CameraPane.SWITCH;
856958 CameraPane.SWITCH = false;
857959
858
- copy.ExtractBigData(versiontable);
960
+ if (Grafreed.grafreed.universe.versiontable == null)
961
+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
962
+
963
+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
859964 // if (copy == client)
860965
861
- Object3D versions[] = copy.versions;
862
- copy.versions = null;
966
+ Object3D versions[] = object.versionlist;
967
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
968
+ object.versionlist = null;
969
+ object.versiontable = null;
970
+
971
+ Object3D parent = object.parent;
972
+ object.parent = null;
863973
864974 //byte[] compress = Compress(copy);
865
- Object3D compress = (Object3D)Grafreed.clone(copy);
975
+ Object3D compress = (Object3D)Grafreed.clone(object);
866976
867
- copy.versions = versions;
977
+ object.parent = parent;
868978
869
- copy.RestoreBigData(versiontable);
979
+ object.versionlist = versions;
980
+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
981
+
982
+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
870983
871984 CameraPane.SWITCH = temp;
872985
....@@ -994,6 +1107,7 @@
9941107 {
9951108 SetupMaterial(materialPanel);
9961109 }
1110
+
9971111 //SetupName();
9981112 //SetupViews();
9991113 }
....@@ -1202,6 +1316,18 @@
12021316
12031317 namePanel = new cGridBag();
12041318
1319
+ //if (copy.pinned)
1320
+ {
1321
+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1322
+ pinButton.setSelected(copy.pinned);
1323
+ cGridBag t = new cGridBag();
1324
+ t.preferredWidth = 2;
1325
+ t.add(pinButton);
1326
+ namePanel.add(t);
1327
+
1328
+ pinButton.addItemListener(this);
1329
+ }
1330
+
12051331 nameField = AddText(namePanel, copy.GetName());
12061332 namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
12071333 oe.ctrlPanel.add(namePanel);
....@@ -1215,14 +1341,14 @@
12151341
12161342 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12171343 liveCB.setToolTipText("Animate object");
1344
+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1345
+ markCB.setToolTipText("Set target transform");
12181346 selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12191347 selectableCB.setToolTipText("Make object selectable");
12201348 // Return();
12211349
12221350 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12231351 hideCB.setToolTipText("Hide object");
1224
- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1225
- markCB.setToolTipText("As animation target transform");
12261352
12271353 ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12281354
....@@ -1424,6 +1550,7 @@
14241550
14251551 if (cam == null || !(copy.get(0) instanceof cGroup))
14261552 {
1553
+ if (Globals.DEBUG)
14271554 System.out.println("CREATE CAMERAS");
14281555 cams = new cTemplate();
14291556 cams.name = "Cameras";
....@@ -1505,6 +1632,45 @@
15051632 //frontView.object = copy;
15061633 //sideView.object = copy;
15071634
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
+
15081674 XYZPanel = new cGridBag().setVertical(true);
15091675 //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
15101676
....@@ -1514,6 +1680,9 @@
15141680 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
15151681 //XYZPanel.setName("XYZ");
15161682
1683
+ transformPanel.add(resetTransformPanel);
1684
+ transformPanel.add(XYZPanel);
1685
+
15171686 /*
15181687 gridPanel = new JPanel(); //new BorderLayout());
15191688 gridPanel.setLayout(new GridLayout(1, 2));
....@@ -1521,12 +1690,12 @@
15211690 gridPanel.add(cameraView);
15221691 gridPanel.add(XYZPanel);
15231692 */
1524
- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1525
- gridPanel.setContinuousLayout(true);
1526
- gridPanel.setOneTouchExpandable(true);
1527
- gridPanel.setDividerLocation(1.0);
1528
- gridPanel.setDividerSize(9);
1529
- 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);
15301699
15311700 // aConstraints.weighty = 0;
15321701 //System.out.println("THIS = " + this);
....@@ -1549,31 +1718,34 @@
15491718
15501719 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15511720 //tmp.setName("Edit");
1721
+ objectPanel.add(toolboxPanel);
1722
+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1723
+ objectPanel.setToolTipTextAt(0, "Objects & textures");
1724
+
15521725 objectPanel.add(materialPanel);
1553
- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1554
- objectPanel.setToolTipTextAt(0, "Material panel");
1726
+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1727
+ objectPanel.setToolTipTextAt(1, "Material");
15551728
1729
+ objectPanel.add(skyboxPanel);
1730
+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1731
+ objectPanel.setToolTipTextAt(2, "Backgrounds");
1732
+
15561733 // JPanel north = new JPanel(new BorderLayout());
15571734 // north.setName("Edit");
15581735 // north.add(ctrlPanel, BorderLayout.NORTH);
15591736 // objectPanel.add(north);
15601737 objectPanel.add(editPanel);
1561
- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1562
- objectPanel.setToolTipTextAt(1, "Edit panel");
1738
+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1739
+ objectPanel.setToolTipTextAt(3, "Edit controls");
15631740
1564
- //if (Globals.ADVANCED)
1565
- objectPanel.add(infoPanel);
1566
- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1567
- objectPanel.setToolTipTextAt(2, "Info panel");
1741
+ objectPanel.add(transformPanel);
1742
+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1743
+ objectPanel.setToolTipTextAt(4, "TRS transform");
15681744
1569
- objectPanel.add(XYZPanel);
1570
- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1571
- objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
1572
-
1573
- objectPanel.add(toolboxPanel);
1574
- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1575
- objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1576
-
1745
+ patchMaterial = true;
1746
+ cameraView.patchMaterial = this;
1747
+ objectPanel.setSelectedIndex(1);
1748
+
15771749 /*
15781750 aConstraints.gridx = 0;
15791751 aConstraints.gridwidth = 1;
....@@ -1593,7 +1765,7 @@
15931765 scrollpane.addMouseWheelListener(this); // Default not fast enough
15941766
15951767 /*JTabbedPane*/ scenePanel = new cGridBag();
1596
- scenePanel.preferredWidth = 5;
1768
+ scenePanel.preferredWidth = 6;
15971769
15981770 JTabbedPane tabbedPane = new JTabbedPane();
15991771 tabbedPane.add(scrollpane);
....@@ -1604,11 +1776,51 @@
16041776
16051777 AddOptions(optionsPanel); //, aConstraints);
16061778
1607
- tabbedPane.add(optionsPanel);
1608
-
16091779 tabbedPane.add(FSPane = new cFileSystemPane(this));
16101780
1781
+ tabbedPane.add(optionsPanel);
1782
+
16111783 scenePanel.add(tabbedPane);
1784
+
1785
+ cGridBag creditsPanel = new cGridBag().setVertical(true);
1786
+ creditsPanel.setName("Credits");
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
+ }
16121824
16131825 /*
16141826 cTree jTree = new cTree(null);
....@@ -1630,13 +1842,13 @@
16301842 jtp.add(tree);
16311843 */
16321844
1633
- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1634
- bigPanel.setContinuousLayout(true);
1635
- bigPanel.setOneTouchExpandable(true);
1636
- bigPanel.setDividerLocation(0.8);
1637
- bigPanel.setDividerSize(15);
1638
- bigPanel.setResizeWeight(0.15);
1639
- 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");
16401852
16411853 //bigPanel.setLayout(new BorderLayout());
16421854 //bigPanel.setSize(new Dimension(10,10));
....@@ -1680,6 +1892,23 @@
16801892 // aConstraints.gridheight = 1;
16811893
16821894 framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1895
+
1896
+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1897
+ new java.beans.PropertyChangeListener()
1898
+ {
1899
+ public void propertyChange(java.beans.PropertyChangeEvent pce)
1900
+ {
1901
+ if ((Integer)pce.getOldValue() == 1)
1902
+ {
1903
+ if (radio.layout != expandedLayout)
1904
+ {
1905
+ radio.layout = expandedLayout;
1906
+ radio.layout.doClick();
1907
+ }
1908
+ }
1909
+ }
1910
+ });
1911
+
16831912 framePanel.setContinuousLayout(false);
16841913 framePanel.setOneTouchExpandable(false);
16851914 //.setDividerLocation(0.8);
....@@ -1689,7 +1918,7 @@
16891918
16901919 frame.getContentPane().setLayout(new BorderLayout());
16911920 /**/
1692
- JTabbedPane worldPane = new JTabbedPane();
1921
+ //JTabbedPane worldPane = new JTabbedPane();
16931922 //worldPane.add(bigPanel);
16941923 //worldPane.add(worldPanel);
16951924 /**/
....@@ -1703,7 +1932,7 @@
17031932
17041933 cameraView.requestFocusInWindow();
17051934
1706
- gridPanel.setDividerLocation(1.0);
1935
+// gridPanel.setDividerLocation(1.0);
17071936
17081937 frame.validate();
17091938
....@@ -1734,28 +1963,442 @@
17341963 ctrlPanel.removeAll();
17351964 }
17361965
1737
- void SetupMaterial(cGridBag panel)
1966
+ void SetupMaterial(cGridBag materialpanel)
17381967 {
1739
- /*
1968
+ cGridBag presetpanel = new cGridBag().setVertical(true);
1969
+
1970
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1971
+ skin.setToolTipText("Skin");
1972
+ skin.addMouseListener(new MouseAdapter()
1973
+ {
1974
+ public void mouseClicked(MouseEvent e)
1975
+ {
1976
+ Object3D object = Grafreed.materials.versionlist[0].get(0);
1977
+ cMaterial material = object.material;
1978
+
1979
+ // Skin
1980
+ colorField.setFloat(material.color);
1981
+ float saturation = material.modulation;
1982
+
1983
+ if (!cameraView.Skinshader)
1984
+ {
1985
+ saturation /= 1.5;
1986
+ }
1987
+
1988
+ saturationField.setFloat(saturation);
1989
+
1990
+ subsurfaceField.setFloat(material.subsurface);
1991
+ selfshadowField.setFloat(material.diffuseness);
1992
+ diffusenessField.setFloat(material.factor);
1993
+ shininessField.setFloat(material.shininess);
1994
+ shadowbiasField.setFloat(material.shadowbias);
1995
+ diffuseField.setFloat(material.diffuse);
1996
+ specularField.setFloat(material.specular);
1997
+
1998
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
1999
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2000
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2001
+
2002
+ materialtouched = true;
2003
+ applySelf();
2004
+ }
2005
+ });
2006
+ presetpanel.add(skin);
2007
+
2008
+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
2009
+ lambert.setToolTipText("Diffuse");
2010
+ lambert.addMouseListener(new MouseAdapter()
2011
+ {
2012
+ public void mouseClicked(MouseEvent e)
2013
+ {
2014
+ Object3D object = Grafreed.materials.versionlist[2].get(0);
2015
+ cMaterial material = object.material;
2016
+
2017
+ diffusenessField.setFloat(material.factor);
2018
+ selfshadowField.setFloat(material.diffuseness);
2019
+
2020
+ materialtouched = true;
2021
+ applySelf();
2022
+ }
2023
+ });
2024
+ presetpanel.add(lambert);
2025
+
2026
+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
2027
+ diffuse2.setToolTipText("Diffuse2");
2028
+ diffuse2.addMouseListener(new MouseAdapter()
2029
+ {
2030
+ public void mouseClicked(MouseEvent e)
2031
+ {
2032
+ Object3D object = Grafreed.materials.versionlist[3].get(0);
2033
+ cMaterial material = object.material;
2034
+
2035
+ diffusenessField.setFloat(material.factor);
2036
+ selfshadowField.setFloat(material.diffuseness);
2037
+
2038
+ materialtouched = true;
2039
+ applySelf();
2040
+ }
2041
+ });
2042
+ presetpanel.add(diffuse2);
2043
+
2044
+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
2045
+ diffusemoon.setToolTipText("Moon");
2046
+ diffusemoon.addMouseListener(new MouseAdapter()
2047
+ {
2048
+ public void mouseClicked(MouseEvent e)
2049
+ {
2050
+ Object3D object = Grafreed.materials.versionlist[4].get(0);
2051
+ cMaterial material = object.material;
2052
+
2053
+ diffusenessField.setFloat(material.factor);
2054
+ selfshadowField.setFloat(material.diffuseness);
2055
+
2056
+ materialtouched = true;
2057
+ applySelf();
2058
+ }
2059
+ });
2060
+ presetpanel.add(diffusemoon);
2061
+
2062
+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
2063
+ diffusemoon2.setToolTipText("Moon2");
2064
+ diffusemoon2.addMouseListener(new MouseAdapter()
2065
+ {
2066
+ public void mouseClicked(MouseEvent e)
2067
+ {
2068
+ Object3D object = Grafreed.materials.versionlist[5].get(0);
2069
+ cMaterial material = object.material;
2070
+
2071
+ diffusenessField.setFloat(material.factor);
2072
+ selfshadowField.setFloat(material.diffuseness);
2073
+
2074
+ materialtouched = true;
2075
+ applySelf();
2076
+ }
2077
+ });
2078
+ presetpanel.add(diffusemoon2);
2079
+
2080
+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
2081
+ diffusemoon3.setToolTipText("Moon3");
2082
+ diffusemoon3.addMouseListener(new MouseAdapter()
2083
+ {
2084
+ public void mouseClicked(MouseEvent e)
2085
+ {
2086
+ Object3D object = Grafreed.materials.versionlist[6].get(0);
2087
+ cMaterial material = object.material;
2088
+
2089
+ diffusenessField.setFloat(material.factor);
2090
+ selfshadowField.setFloat(material.diffuseness);
2091
+
2092
+ materialtouched = true;
2093
+ applySelf();
2094
+ }
2095
+ });
2096
+ presetpanel.add(diffusemoon3);
2097
+
2098
+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
2099
+ diffusesheen.setToolTipText("Sheen");
2100
+ diffusesheen.addMouseListener(new MouseAdapter()
2101
+ {
2102
+ public void mouseClicked(MouseEvent e)
2103
+ {
2104
+ Object3D object = Grafreed.materials.versionlist[7].get(0);
2105
+ cMaterial material = object.material;
2106
+
2107
+ sheenField.setFloat(material.sheen);
2108
+
2109
+ materialtouched = true;
2110
+ applySelf();
2111
+ }
2112
+ });
2113
+ presetpanel.add(diffusesheen);
2114
+
2115
+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
2116
+ rough.setToolTipText("Rough metal");
2117
+ rough.addMouseListener(new MouseAdapter()
2118
+ {
2119
+ public void mouseClicked(MouseEvent e)
2120
+ {
2121
+ Object3D object = Grafreed.materials.versionlist[1].get(0);
2122
+ cMaterial material = object.material;
2123
+
2124
+ shininessField.setFloat(material.shininess);
2125
+ velvetField.setFloat(material.velvet);
2126
+
2127
+ materialtouched = true;
2128
+ applySelf();
2129
+ }
2130
+ });
2131
+ presetpanel.add(rough);
2132
+
2133
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
2134
+ rough2.setToolTipText("Medium metal");
2135
+ rough2.addMouseListener(new MouseAdapter()
2136
+ {
2137
+ public void mouseClicked(MouseEvent e)
2138
+ {
2139
+ Object3D object = Grafreed.materials.versionlist[13].get(0);
2140
+ cMaterial material = object.material;
2141
+
2142
+ shininessField.setFloat(material.shininess);
2143
+ lightareaField.setFloat(material.lightarea);
2144
+
2145
+ materialtouched = true;
2146
+ applySelf();
2147
+ }
2148
+ });
2149
+ presetpanel.add(rough2);
2150
+
2151
+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2152
+ shini0.setToolTipText("Shiny");
2153
+ shini0.addMouseListener(new MouseAdapter()
2154
+ {
2155
+ public void mouseClicked(MouseEvent e)
2156
+ {
2157
+ Object3D object = Grafreed.materials.versionlist[14].get(0);
2158
+ cMaterial material = object.material;
2159
+
2160
+ shininessField.setFloat(material.shininess);
2161
+ lightareaField.setFloat(material.lightarea);
2162
+
2163
+ materialtouched = true;
2164
+ applySelf();
2165
+ }
2166
+ });
2167
+ presetpanel.add(shini0);
2168
+
2169
+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2170
+ shini1.setToolTipText("Shiny2");
2171
+ shini1.addMouseListener(new MouseAdapter()
2172
+ {
2173
+ public void mouseClicked(MouseEvent e)
2174
+ {
2175
+ Object3D object = Grafreed.materials.versionlist[11].get(0);
2176
+ cMaterial material = object.material;
2177
+
2178
+ shininessField.setFloat(material.shininess);
2179
+ lightareaField.setFloat(material.lightarea);
2180
+
2181
+ materialtouched = true;
2182
+ applySelf();
2183
+ }
2184
+ });
2185
+ presetpanel.add(shini1);
2186
+
2187
+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2188
+ shini2.setToolTipText("Shiny3");
2189
+ shini2.addMouseListener(new MouseAdapter()
2190
+ {
2191
+ public void mouseClicked(MouseEvent e)
2192
+ {
2193
+ Object3D object = Grafreed.materials.versionlist[12].get(0);
2194
+ cMaterial material = object.material;
2195
+
2196
+ shininessField.setFloat(material.shininess);
2197
+ lightareaField.setFloat(material.lightarea);
2198
+
2199
+ materialtouched = true;
2200
+ applySelf();
2201
+ }
2202
+ });
2203
+ presetpanel.add(shini2);
2204
+
2205
+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2206
+ aniso.setToolTipText("AnisoU");
2207
+ aniso.addMouseListener(new MouseAdapter()
2208
+ {
2209
+ public void mouseClicked(MouseEvent e)
2210
+ {
2211
+ Object3D object = Grafreed.materials.versionlist[8].get(0);
2212
+ cMaterial material = object.material;
2213
+
2214
+ anisoField.setFloat(material.aniso);
2215
+ anisoVField.setFloat(material.anisoV);
2216
+
2217
+ materialtouched = true;
2218
+ applySelf();
2219
+ }
2220
+ });
2221
+ presetpanel.add(aniso);
2222
+
2223
+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2224
+ aniso2.setToolTipText("AnisoV");
2225
+ aniso2.addMouseListener(new MouseAdapter()
2226
+ {
2227
+ public void mouseClicked(MouseEvent e)
2228
+ {
2229
+ Object3D object = Grafreed.materials.versionlist[9].get(0);
2230
+ cMaterial material = object.material;
2231
+
2232
+ anisoField.setFloat(material.aniso);
2233
+ anisoVField.setFloat(material.anisoV);
2234
+
2235
+ materialtouched = true;
2236
+ applySelf();
2237
+ }
2238
+ });
2239
+ presetpanel.add(aniso2);
2240
+
2241
+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2242
+ aniso3.setToolTipText("AnisoUV");
2243
+ aniso3.addMouseListener(new MouseAdapter()
2244
+ {
2245
+ public void mouseClicked(MouseEvent e)
2246
+ {
2247
+ Object3D object = Grafreed.materials.versionlist[10].get(0);
2248
+ cMaterial material = object.material;
2249
+
2250
+ anisoField.setFloat(material.aniso);
2251
+ anisoVField.setFloat(material.anisoV);
2252
+
2253
+ materialtouched = true;
2254
+ applySelf();
2255
+ }
2256
+ });
2257
+ presetpanel.add(aniso3);
2258
+
2259
+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2260
+ velvet0.setToolTipText("Velvet");
2261
+ velvet0.addMouseListener(new MouseAdapter()
2262
+ {
2263
+ public void mouseClicked(MouseEvent e)
2264
+ {
2265
+ Object3D object = Grafreed.materials.versionlist[15].get(0);
2266
+ cMaterial material = object.material;
2267
+
2268
+ diffusenessField.setFloat(material.factor);
2269
+ selfshadowField.setFloat(material.diffuseness);
2270
+ sheenField.setFloat(material.sheen);
2271
+ shininessField.setFloat(material.shininess);
2272
+ velvetField.setFloat(material.velvet);
2273
+ shiftField.setFloat(material.shift);
2274
+
2275
+ materialtouched = true;
2276
+ applySelf();
2277
+ }
2278
+ });
2279
+ presetpanel.add(velvet0);
2280
+
2281
+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2282
+ bump0.setToolTipText("Bump texture");
2283
+ bump0.addMouseListener(new MouseAdapter()
2284
+ {
2285
+ public void mouseClicked(MouseEvent e)
2286
+ {
2287
+ Object3D object = Grafreed.materials.versionlist[16].get(0);
2288
+ cMaterial material = object.material;
2289
+
2290
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2291
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2292
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2293
+
2294
+ materialtouched = true;
2295
+ applySelf();
2296
+ }
2297
+ });
2298
+ presetpanel.add(bump0);
2299
+
2300
+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2301
+ borderShader.setToolTipText("Border fade");
2302
+ borderShader.addMouseListener(new MouseAdapter()
2303
+ {
2304
+ public void mouseClicked(MouseEvent e)
2305
+ {
2306
+ borderfadeField.setFloat(0.5);
2307
+ opacityField.setFloat(0.75);
2308
+
2309
+ materialtouched = true;
2310
+ applySelf();
2311
+ }
2312
+ });
2313
+ presetpanel.add(borderShader);
2314
+
2315
+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2316
+ halo.setToolTipText("Halo");
2317
+ halo.addMouseListener(new MouseAdapter()
2318
+ {
2319
+ public void mouseClicked(MouseEvent e)
2320
+ {
2321
+ Object3D object = Grafreed.materials.versionlist[17].get(0);
2322
+ cMaterial material = object.material;
2323
+
2324
+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2325
+
2326
+ materialtouched = true;
2327
+ applySelf();
2328
+ }
2329
+ });
2330
+ presetpanel.add(halo);
2331
+
2332
+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2333
+ candle.setToolTipText("Candle");
2334
+ candle.addMouseListener(new MouseAdapter()
2335
+ {
2336
+ public void mouseClicked(MouseEvent e)
2337
+ {
2338
+ Object3D object = Grafreed.materials.versionlist[18].get(0);
2339
+ cMaterial material = object.material;
2340
+
2341
+ subsurfaceField.setFloat(material.subsurface);
2342
+ shadowbiasField.setFloat(material.shadowbias);
2343
+ ambientField.setFloat(material.ambient);
2344
+ specularField.setFloat(material.specular);
2345
+ lightareaField.setFloat(material.lightarea);
2346
+ shininessField.setFloat(material.shininess);
2347
+
2348
+ materialtouched = true;
2349
+ applySelf();
2350
+ }
2351
+ });
2352
+ presetpanel.add(candle);
2353
+
2354
+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2355
+ shadowShader.setToolTipText("Shadow");
2356
+ shadowShader.addMouseListener(new MouseAdapter()
2357
+ {
2358
+ public void mouseClicked(MouseEvent e)
2359
+ {
2360
+ diffuseField.setFloat(0.001);
2361
+ ambientField.setFloat(0.001);
2362
+ cameraField.setFloat(0.001);
2363
+ specularField.setFloat(0.001);
2364
+ fakedepthField.setFloat(0.001);
2365
+ opacityField.setFloat(0.6);
2366
+
2367
+ materialtouched = true;
2368
+ applySelf();
2369
+ }
2370
+ });
2371
+ presetpanel.add(shadowShader);
2372
+
2373
+ cGridBag panel = new cGridBag().setVertical(true);
2374
+
2375
+ presetpanel.preferredWidth = 1;
2376
+
2377
+ materialpanel.add(presetpanel);
2378
+ materialpanel.add(panel);
2379
+
2380
+ panel.preferredWidth = 8;
2381
+
2382
+ /*
17402383 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
17412384 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1742
- */
2385
+ */
17432386
17442387 cGridBag editBar = new cGridBag().setVertical(false);
17452388
1746
- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
2389
+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
17472390 createMaterialButton.setToolTipText("Create material");
17482391
17492392 /*
17502393 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
17512394 */
17522395
1753
- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
2396
+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
17542397 clearMaterialButton.setToolTipText("Clear material");
17552398
17562399 if (Globals.ADVANCED)
17572400 {
1758
- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
2401
+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
17592402 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
17602403 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
17612404 }
....@@ -1776,7 +2419,20 @@
17762419
17772420 cGridBag huepanel = new cGridBag();
17782421 cGridBag huelabel = new cGridBag();
1779
- huelabel.add(GetLabel("icons/hue.png", false));
2422
+ cLabel hue = GetLabel("icons/hue.png", false);
2423
+ hue.fit = true;
2424
+
2425
+ hue.addMouseListener(new MouseAdapter()
2426
+ {
2427
+ public void mousePressed(MouseEvent e)
2428
+ {
2429
+ int x = e.getX();
2430
+
2431
+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2432
+ }
2433
+ });
2434
+
2435
+ huelabel.add(hue);
17802436 huelabel.preferredWidth = 20;
17812437 huepanel.add(new cGridBag()); // Label
17822438 huepanel.add(huelabel); // Field/slider
....@@ -1797,7 +2453,7 @@
17972453 cGridBag modulation = new cGridBag();
17982454 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
17992455 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1800
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2456
+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
18012457 colorSection.add(modulation);
18022458
18032459 cGridBag opacity = new cGridBag();
....@@ -2990,7 +3646,7 @@
29903646
29913647 freezematerial = true;
29923648 colorField.setFloat(mat.color);
2993
- modulationField.setFloat(mat.modulation);
3649
+ saturationField.setFloat(mat.modulation);
29943650 metalnessField.setFloat(mat.metalness);
29953651 diffuseField.setFloat(mat.diffuse);
29963652 specularField.setFloat(mat.specular);
....@@ -3052,32 +3708,8 @@
30523708
30533709 if (multiplyToggle != null)
30543710 multiplyToggle.setSelected(mat.multiply);
3055
-
3056
- assert (object.projectedVertices != null);
3057
-
3058
- if (object.projectedVertices.length <= 2)
3059
- {
3060
- // Side effect...
3061
- Object3D.cVector2[] keep = object.projectedVertices;
3062
- object.projectedVertices = new Object3D.cVector2[3];
3063
- for (int i = 0; i < 3; i++)
3064
- {
3065
- if (i < keep.length)
3066
- {
3067
- object.projectedVertices[i] = keep[i];
3068
- } else
3069
- {
3070
- object.projectedVertices[i] = new Object3D.cVector2();
3071
- }
3072
- /*
3073
- if(keep.length == 0)
3074
- object.projectedVertices[0] = new Object3D.cVector2();
3075
- else
3076
- object.projectedVertices[0] = keep[0];
3077
- object.projectedVertices[1] = new Object3D.cVector2();
3078
- */
3079
- }
3080
- }
3711
+
3712
+ AllocProjectedVertices(object);
30813713
30823714 SetMaterial(mat, object.projectedVertices);
30833715 }
....@@ -3197,6 +3829,17 @@
31973829 public void itemStateChanged(ItemEvent event)
31983830 {
31993831 // System.out.println("Propagate = " + propagate);
3832
+ if (event.getSource() == pinButton)
3833
+ {
3834
+ copy.pinned ^= true;
3835
+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3836
+ {
3837
+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
3838
+ copy.CloseUI();
3839
+ //copy.editWindow.refreshContents();
3840
+ }
3841
+ }
3842
+ else
32003843 if (event.getSource() == propagateToggle)
32013844 {
32023845 propagate ^= true;
....@@ -3301,6 +3944,7 @@
33013944 } else if (event.getSource() == liveCB)
33023945 {
33033946 copy.live ^= true;
3947
+ objEditor.refreshContents(true); // To show item colors
33043948 return;
33053949 } else if (event.getSource() == selectableCB)
33063950 {
....@@ -3310,7 +3954,7 @@
33103954 {
33113955 copy.hide ^= true;
33123956 copy.Touch(); // display list issue
3313
- objEditor.refreshContents();
3957
+ objEditor.refreshContents(true); // To show item colors
33143958 return;
33153959 } else if (event.getSource() == link2masterCB)
33163960 {
....@@ -3375,7 +4019,7 @@
33754019 //System.out.println("ObjEditor " + event);
33764020 applySelf0(true);
33774021 //parent.applySelf();
3378
- objEditor.refreshContents();
4022
+ // conflicts with requestFocus objEditor.refreshContents();
33794023 } else if (source == resetButton)
33804024 {
33814025 CameraPane.fullreset = true;
....@@ -3555,12 +4199,15 @@
35554199
35564200 void New()
35574201 {
3558
- while (copy.Size() > 1)
4202
+ while (copy.Size() > 0)
35594203 {
3560
- copy.remove(1);
4204
+ copy.remove(0);
35614205 }
35624206
4207
+ copy.selection.clear();
4208
+
35634209 ResetModel();
4210
+ SetupViews();
35644211 objEditor.refreshContents();
35654212 }
35664213
....@@ -3668,6 +4315,7 @@
36684315 {
36694316 //Save(true);
36704317 Replace();
4318
+ SetVersionStates();
36714319 }
36724320
36734321 private boolean Equal(byte[] compress, byte[] name)
....@@ -3686,15 +4334,30 @@
36864334 return true;
36874335 }
36884336
3689
- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4337
+ void DeleteVersion()
4338
+ {
4339
+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
4340
+ {
4341
+ copy.versionlist[i] = copy.versionlist[i+1];
4342
+ }
4343
+
4344
+ if (copy.versionlist[copy.versionindex] == null)
4345
+ copy.versionindex -= 1;
4346
+
4347
+ if (copy.versionindex != -1)
4348
+ CopyChanged();
4349
+
4350
+ SetVersionStates();
4351
+ }
36904352
36914353 public boolean Save(boolean user)
36924354 {
36934355 System.err.println("Save");
4356
+ Replace();
36944357
3695
- cRadio tab = GetCurrentTab();
4358
+ //cRadio tab = GetCurrentTab();
36964359
3697
- Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
4360
+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
36984361
36994362 boolean thesame = false;
37004363
....@@ -3706,10 +4369,15 @@
37064369 //EditorFrame.m_MainFrame.requestFocusInWindow();
37074370 if (!thesame)
37084371 {
4372
+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
4373
+ {
4374
+ copy.versionlist[i] = copy.versionlist[i-1];
4375
+ }
4376
+
37094377 //tab.user[tab.versionindex] = user;
37104378 //boolean increment = true; // tab.graphs[tab.versionindex] == null;
37114379
3712
- copy.versions[++copy.versionindex] = compress;
4380
+ copy.versionlist[++copy.versionindex] = compress;
37134381
37144382 // if (increment)
37154383 // tab.versionindex++;
....@@ -3719,13 +4387,13 @@
37194387
37204388 //assert(hashtable.isEmpty());
37214389
3722
- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3723
- {
3724
- //tab.user[i] = false;
3725
- copy.versions[i] = null;
3726
- }
4390
+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
4391
+// {
4392
+// //tab.user[i] = false;
4393
+// copy.versionlist[i] = null;
4394
+// }
37274395
3728
- SetUndoStates();
4396
+ SetVersionStates();
37294397
37304398 // test save
37314399 if (false)
....@@ -3748,15 +4416,49 @@
37484416
37494417 return !thesame;
37504418 }
3751
-
3752
- void CopyChanged(Object3D obj)
4419
+
4420
+ boolean flashIt = true;
4421
+
4422
+ void RefreshSelection()
37534423 {
3754
- SetUndoStates();
4424
+ Object3D selection = new Object3D();
4425
+
4426
+ for (int i = 0; i < copy.selection.size(); i++)
4427
+ {
4428
+ Object3D elem = copy.selection.elementAt(i);
4429
+
4430
+ Object3D obj = copy.GetObject(elem.GetUUID());
4431
+
4432
+ if (obj == null)
4433
+ {
4434
+ copy.selection.remove(i--);
4435
+ }
4436
+ else
4437
+ {
4438
+ selection.add(obj);
4439
+ copy.selection.setElementAt(obj, i);
4440
+ }
4441
+ }
4442
+
4443
+ flashIt = false;
4444
+ GetTree().clearSelection();
4445
+ for (int i = 0; i < selection.size(); i++)
4446
+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
4447
+ flashIt = true;
4448
+
4449
+ //refreshContents(false);
4450
+ }
4451
+
4452
+ void CopyChanged()
4453
+ {
4454
+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4455
+
4456
+ SetVersionStates();
37554457
37564458 boolean temp = CameraPane.SWITCH;
37574459 CameraPane.SWITCH = false;
37584460
3759
- copy.ExtractBigData(versiontable);
4461
+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
37604462
37614463 copy.clear();
37624464
....@@ -3768,10 +4470,11 @@
37684470 copy.add(obj.get(i));
37694471 }
37704472
3771
- copy.RestoreBigData(versiontable);
4473
+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
37724474
37734475 CameraPane.SWITCH = temp;
37744476
4477
+ RefreshSelection();
37754478 //assert(hashtable.isEmpty());
37764479
37774480 copy.Touch();
....@@ -3792,13 +4495,15 @@
37924495 }
37934496 }
37944497
3795
- refreshContents();
4498
+ refreshContents(true);
37964499 }
37974500
3798
- cButton undoButton;
4501
+ cButton previousVersionButton;
37994502 cButton restoreButton;
38004503 cButton replaceButton;
3801
- cButton redoButton;
4504
+ cButton nextVersionButton;
4505
+ cButton saveVersionButton;
4506
+ cButton deleteVersionButton;
38024507
38034508 boolean muteSlider;
38044509
....@@ -3806,39 +4511,64 @@
38064511 {
38074512 int count = 0;
38084513
3809
- for (int i = copy.versions.length; --i >= 0;)
4514
+ for (int i = copy.versionlist.length; --i >= 0;)
38104515 {
3811
- if (copy.versions[i] != null)
4516
+ if (copy.versionlist[i] != null)
38124517 count++;
38134518 }
38144519
38154520 return count;
38164521 }
38174522
3818
- void SetUndoStates()
4523
+ public cGridBag versionSliderPane;
4524
+
4525
+ void SetVersionStates()
38194526 {
3820
- cRadio tab = GetCurrentTab();
4527
+ //if (true)
4528
+ // return;
4529
+
4530
+ //cRadio tab = GetCurrentTab();
38214531
3822
- restoreButton.setEnabled(copy.versionindex != -1);
3823
- replaceButton.setEnabled(copy.versionindex != -1);
3824
-
3825
- undoButton.setEnabled(copy.versionindex > 0);
3826
- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3827
-
3828
- muteSlider = true;
3829
- versionSlider.setMaximum(VersionCount() - 1);
3830
- versionSlider.setInteger(copy.versionindex);
3831
- 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
+ }
38324562 }
38334563
3834
- public boolean Undo()
4564
+ public boolean PreviousVersion()
38354565 {
38364566 // Option?
38374567 Replace();
38384568
38394569 System.err.println("Undo");
38404570
3841
- cRadio tab = GetCurrentTab();
4571
+ //cRadio tab = GetCurrentTab();
38424572
38434573 if (copy.versionindex == 0)
38444574 {
....@@ -3861,7 +4591,7 @@
38614591
38624592 copy.versionindex -= 1;
38634593
3864
- CopyChanged((Object3D)copy.versions[copy.versionindex]);
4594
+ CopyChanged();
38654595
38664596 return true;
38674597 }
....@@ -3870,45 +4600,45 @@
38704600 {
38714601 System.err.println("Restore");
38724602
3873
- cRadio tab = GetCurrentTab();
4603
+ //cRadio tab = GetCurrentTab();
38744604
3875
- if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
4605
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
38764606 {
38774607 java.awt.Toolkit.getDefaultToolkit().beep();
38784608 return false;
38794609 }
38804610
38814611 //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3882
- CopyChanged(copy.versions[copy.versionindex]);
4612
+ CopyChanged();
38834613
38844614 return true;
38854615 }
38864616
38874617 public boolean Replace()
38884618 {
3889
- System.err.println("Replace");
4619
+ //System.err.println("Replace");
38904620
3891
- cRadio tab = GetCurrentTab();
4621
+ //cRadio tab = GetCurrentTab();
38924622
3893
- if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
4623
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
38944624 {
38954625 // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
38964626 return false;
38974627 }
38984628
3899
- copy.versions[copy.versionindex] = CompressCopy();
4629
+ copy.versionlist[copy.versionindex] = Duplicate(copy);
39004630
39014631 return true;
39024632 }
39034633
3904
- public void Redo()
4634
+ public void NextVersion()
39054635 {
39064636 // Option?
39074637 Replace();
39084638
3909
- cRadio tab = GetCurrentTab();
4639
+ //cRadio tab = GetCurrentTab();
39104640
3911
- if (copy.versions[copy.versionindex + 1] == null)
4641
+ if (copy.versionlist[copy.versionindex + 1] == null)
39124642 {
39134643 java.awt.Toolkit.getDefaultToolkit().beep();
39144644 return;
....@@ -3916,7 +4646,7 @@
39164646
39174647 copy.versionindex += 1;
39184648
3919
- CopyChanged(copy.versions[copy.versionindex]);
4649
+ CopyChanged();
39204650
39214651 //if (!tab.user[tab.versionindex])
39224652 // tab.graphs[tab.versionindex] = null;
....@@ -4113,6 +4843,12 @@
41134843 // else
41144844 // applySelf(true);
41154845 // }
4846
+
4847
+ boolean Equal(double a, double b)
4848
+ {
4849
+ return Math.abs(a - b) < 0.001;
4850
+ }
4851
+
41164852 void applySelf0(boolean name)
41174853 {
41184854 if (name)
....@@ -4130,7 +4866,7 @@
41304866 //copy.material = new cMaterial(copy.GetMaterial());
41314867
41324868 current.color = (float) colorField.getFloat();
4133
- current.modulation = (float) modulationField.getFloat();
4869
+ current.modulation = (float) saturationField.getFloat();
41344870 current.metalness = (float) metalnessField.getFloat();
41354871 current.diffuse = (float) diffuseField.getFloat();
41364872 current.specular = (float) specularField.getFloat();
....@@ -4162,29 +4898,52 @@
41624898 {
41634899 cMaterial mat = copy.material;
41644900
4165
- colorField.SetToolTipValue((mat.color));
4166
- modulationField.SetToolTipValue((mat.modulation));
4167
- metalnessField.SetToolTipValue((mat.metalness));
4168
- diffuseField.SetToolTipValue((mat.diffuse));
4169
- specularField.SetToolTipValue((mat.specular));
4170
- shininessField.SetToolTipValue((mat.shininess));
4171
- shiftField.SetToolTipValue((mat.shift));
4172
- ambientField.SetToolTipValue((mat.ambient));
4173
- lightareaField.SetToolTipValue((mat.lightarea));
4174
- diffusenessField.SetToolTipValue((mat.factor));
4175
- velvetField.SetToolTipValue((mat.velvet));
4176
- sheenField.SetToolTipValue((mat.sheen));
4177
- subsurfaceField.SetToolTipValue((mat.subsurface));
4178
- backlitField.SetToolTipValue((mat.bump));
4179
- anisoField.SetToolTipValue((mat.aniso));
4180
- anisoVField.SetToolTipValue((mat.anisoV));
4181
- cameraField.SetToolTipValue((mat.cameralight));
4182
- selfshadowField.SetToolTipValue((mat.diffuseness));
4183
- shadowField.SetToolTipValue((mat.shadow));
4184
- textureField.SetToolTipValue((mat.texture));
4185
- opacityField.SetToolTipValue((mat.opacity));
4186
- fakedepthField.SetToolTipValue((mat.fakedepth));
4187
- shadowbiasField.SetToolTipValue((mat.shadowbias));
4901
+ if (!Equal(colorField.getFloat(), mat.color))
4902
+ colorField.SetToolTipValue((mat.color));
4903
+ if (!Equal(saturationField.getFloat(), mat.modulation))
4904
+ saturationField.SetToolTipValue((mat.modulation));
4905
+ if (!Equal(metalnessField.getFloat(), mat.metalness))
4906
+ metalnessField.SetToolTipValue((mat.metalness));
4907
+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
4908
+ diffuseField.SetToolTipValue((mat.diffuse));
4909
+ if (!Equal(specularField.getFloat(), mat.specular))
4910
+ specularField.SetToolTipValue((mat.specular));
4911
+ if (!Equal(shininessField.getFloat(), mat.shininess))
4912
+ shininessField.SetToolTipValue((mat.shininess));
4913
+ if (!Equal(shiftField.getFloat(), mat.shift))
4914
+ shiftField.SetToolTipValue((mat.shift));
4915
+ if (!Equal(ambientField.getFloat(), mat.ambient))
4916
+ ambientField.SetToolTipValue((mat.ambient));
4917
+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
4918
+ lightareaField.SetToolTipValue((mat.lightarea));
4919
+ if (!Equal(diffusenessField.getFloat(), mat.factor))
4920
+ diffusenessField.SetToolTipValue((mat.factor));
4921
+ if (!Equal(velvetField.getFloat(), mat.velvet))
4922
+ velvetField.SetToolTipValue((mat.velvet));
4923
+ if (!Equal(sheenField.getFloat(), mat.sheen))
4924
+ sheenField.SetToolTipValue((mat.sheen));
4925
+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
4926
+ subsurfaceField.SetToolTipValue((mat.subsurface));
4927
+ if (!Equal(backlitField.getFloat(), mat.bump))
4928
+ backlitField.SetToolTipValue((mat.bump));
4929
+ if (!Equal(anisoField.getFloat(), mat.aniso))
4930
+ anisoField.SetToolTipValue((mat.aniso));
4931
+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
4932
+ anisoVField.SetToolTipValue((mat.anisoV));
4933
+ if (!Equal(cameraField.getFloat(), mat.cameralight))
4934
+ cameraField.SetToolTipValue((mat.cameralight));
4935
+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
4936
+ selfshadowField.SetToolTipValue((mat.diffuseness));
4937
+ if (!Equal(shadowField.getFloat(), mat.shadow))
4938
+ shadowField.SetToolTipValue((mat.shadow));
4939
+ if (!Equal(textureField.getFloat(), mat.texture))
4940
+ textureField.SetToolTipValue((mat.texture));
4941
+ if (!Equal(opacityField.getFloat(), mat.opacity))
4942
+ opacityField.SetToolTipValue((mat.opacity));
4943
+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
4944
+ fakedepthField.SetToolTipValue((mat.fakedepth));
4945
+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
4946
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
41884947 }
41894948
41904949 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
....@@ -4219,17 +4978,20 @@
42194978
42204979 public void stateChanged(ChangeEvent e)
42214980 {
4222
- // assert(false);
4981
+ // assert(false);
42234982 if (e.getSource() == versionSlider)
42244983 {
42254984 if (muteSlider)
42264985 return;
42274986
4987
+ Replace();
4988
+
42284989 int version = versionSlider.getInteger();
42294990
4230
- if (copy.versions[version] != null)
4991
+ if (version != -1 && copy.versionlist[version] != null)
42314992 {
4232
- CopyChanged(copy.versions[copy.versionindex = version]);
4993
+ copy.versionindex = version;
4994
+ CopyChanged();
42334995 }
42344996
42354997 return;
....@@ -4269,6 +5031,12 @@
42695031 {
42705032 //System.out.println("stateChanged = " + this);
42715033 materialtouched = true;
5034
+
5035
+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
5036
+ {
5037
+ saturationField.setFloat(1);
5038
+ }
5039
+
42725040 applySelf();
42735041 //System.out.println("this = " + this);
42745042 //System.out.println("PARENT = " + parent);
....@@ -4568,6 +5336,7 @@
45685336 {
45695337 if (GetTree() != null)
45705338 {
5339
+ GetTree().revalidate();
45715340 GetTree().repaint();
45725341 }
45735342
....@@ -4576,6 +5345,11 @@
45765345 ctrlPanel.validate(); // ? new
45775346 ctrlPanel.repaint();
45785347 }
5348
+
5349
+ if (previousVersionButton != null && copy.versionlist != null)
5350
+ SetVersionStates();
5351
+
5352
+ cameraView.requestFocusInWindow();
45795353 }
45805354
45815355 static TweenManager tweenManager = new TweenManager();
....@@ -4607,7 +5381,7 @@
46075381 // group = (Composite) group.get(0);
46085382 // }
46095383
4610
- System.out.println("makeSomething of " + thing);
5384
+ //System.out.println("makeSomething of " + thing);
46115385
46125386 /*
46135387 if (deselect && jList != null)
....@@ -4959,13 +5733,17 @@
49595733 c.addChild(csg);
49605734 }
49615735
4962
- copy.versions = readobj.versions;
5736
+ copy.versionlist = readobj.versionlist;
49635737 copy.versionindex = readobj.versionindex;
5738
+ copy.versiontable = readobj.versiontable;
49645739
4965
- if (copy.versions == null)
5740
+ if (copy.versionlist == null)
49665741 {
4967
- copy.versions = new Object3D[100];
5742
+ // Backward compatibility
5743
+ copy.versionlist = new Object3D[100];
49685744 copy.versionindex = -1;
5745
+
5746
+ //Save(true);
49695747 }
49705748
49715749 //? SetUndoStates();
....@@ -4980,7 +5758,7 @@
49805758 {
49815759 if (Grafreed.standAlone)
49825760 {
4983
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5761
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
49845762 browser.show();
49855763 String filename = browser.getFile();
49865764 if (filename != null && filename.length() > 0)
....@@ -5057,6 +5835,8 @@
50575835
50585836 void save()
50595837 {
5838
+ Replace();
5839
+
50605840 if (lastname == null)
50615841 {
50625842 return;
....@@ -5299,6 +6079,7 @@
52996079 ButtonGroup buttonGroup;
53006080
53016081 cGridBag toolboxPanel;
6082
+ cGridBag skyboxPanel;
53026083 cGridBag materialPanel;
53036084 cGridBag ctrlPanel;
53046085
....@@ -5310,6 +6091,7 @@
53106091 boolean materialFlushed;
53116092 Object3D latestObject;
53126093
6094
+ cGridBag transformPanel;
53136095 cGridBag XYZPanel;
53146096
53156097 JSplitPane gridPanel;
....@@ -5372,7 +6154,7 @@
53726154 JLabel colorLabel;
53736155 cNumberSlider colorField;
53746156 JLabel modulationLabel;
5375
- cNumberSlider modulationField;
6157
+ cNumberSlider saturationField;
53766158 JLabel metalnessLabel;
53776159 cNumberSlider metalnessField;
53786160 JLabel diffuseLabel;
....@@ -5403,6 +6185,7 @@
54036185 cNumberSlider anisoField;
54046186 JLabel anisoVLabel;
54056187 cNumberSlider anisoVField;
6188
+
54066189 JLabel cameraLabel;
54076190 cNumberSlider cameraField;
54086191 JLabel selfshadowLabel;
....@@ -5417,6 +6200,7 @@
54176200 cNumberSlider fakedepthField;
54186201 JLabel shadowbiasLabel;
54196202 cNumberSlider shadowbiasField;
6203
+
54206204 JLabel bumpLabel;
54216205 cNumberSlider bumpField;
54226206 JLabel noiseLabel;