Normand Briere
2019-08-17 d5d6485126da83b06645e90e3e4ce66659a56009
ObjEditor.java
....@@ -34,6 +34,7 @@
3434 iSendInfo
3535 //KeyListener
3636 {
37
+ public cToggleButton pinButton;
3738 boolean timeline;
3839 boolean wasFullScreen;
3940
....@@ -41,11 +42,57 @@
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
+ }
74
+
75
+ public cGridBag GetSeparator()
76
+ {
77
+ cGridBag separator = new cGridBag();
78
+ separator.add(new JSeparator());
79
+ separator.preferredHeight = 5;
80
+ return separator;
81
+ }
4482
4583 cButton GetButton(String name, boolean border)
4684 {
4785 ImageIcon icon = GetIcon(name);
48
- return new cButton(icon, border);
86
+ if (icon != null)
87
+ return new cButton(icon, border);
88
+ else
89
+ return new cButton(name, border);
90
+ }
91
+
92
+ cLabel GetLabel(String name, boolean border)
93
+ {
94
+ //ImageIcon icon = GetIcon(name);
95
+ return new cLabel(GetImage(name), border);
4996 }
5097
5198 cToggleButton GetToggleButton(String name, boolean border)
....@@ -60,26 +107,52 @@
60107 return new cCheckBox(icon, border);
61108 }
62109
63
- private 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)
113
+ {
114
+ javax.swing.ImageIcon iconCache = icons.get(name);
115
+ if (iconCache != null)
116
+ {
117
+ return iconCache;
118
+ }
119
+
120
+ try
121
+ {
122
+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
123
+
124
+// if (image.getWidth() > 48 && image.getHeight() > 48)
125
+// {
126
+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
127
+// Graphics2D g = resized.createGraphics();
128
+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
129
+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
130
+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
131
+// g.dispose();
132
+//
133
+// image = resized;
134
+// }
135
+
136
+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
137
+
138
+ icons.put(name, icon);
139
+
140
+ return icon;
141
+ }
142
+ catch (Exception e)
143
+ {
144
+ //icons.put(name, null);
145
+ return null;
146
+ }
147
+ }
148
+
149
+ BufferedImage GetImage(String name)
64150 {
65151 try
66152 {
67153 BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
68154
69
- if (image.getWidth() != 24 && image.getHeight() != 24)
70
- {
71
- BufferedImage resized = new BufferedImage(24, 24, image.getType());
72
- Graphics2D g = resized.createGraphics();
73
- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
74
- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
75
- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
76
- g.dispose();
77
-
78
- image = resized;
79
- }
80
-
81
- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
82
- return icon;
155
+ return image;
83156 }
84157 catch (Exception e)
85158 {
....@@ -268,11 +341,13 @@
268341 client = inClient;
269342 copy = client;
270343
271
- if (copy.versions == null)
272
- {
273
- copy.versions = new byte[100][];
274
- copy.versionindex = -1;
275
- }
344
+// if (copy.versionlist == null)
345
+// {
346
+// copy.versionlist = new Object3D[100];
347
+// copy.versionindex = -1;
348
+//
349
+// callee.Save(true);
350
+// }
276351
277352 // "this" is not called: SetupUI2(objEditor);
278353 }
....@@ -287,10 +362,12 @@
287362 client = inClient;
288363 copy = client;
289364
290
- if (copy.versions == null)
365
+ if (copy.versionlist == null)
291366 {
292
- copy.versions = new byte[100][];
367
+ copy.versionlist = new Object3D[100];
293368 copy.versionindex = -1;
369
+
370
+// Save(true);
294371 }
295372
296373 SetupUI2(callee.GetEditor());
....@@ -314,7 +391,8 @@
314391 //parent = p;
315392
316393 GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
317
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
394
+ if (Globals.DEBUG)
395
+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
318396 //gd.setFullScreenWindow(this);
319397 //setResizable(false);
320398 //if (!isDisplayable())
....@@ -325,11 +403,13 @@
325403 copy = localCopy;
326404 copy.editWindow = this;
327405
328
- if (copy.versions == null)
329
- {
330
-// copy.versions = new byte[100][];
406
+// if (copy.versionlist == null)
407
+// {
408
+// copy.versionlist = new Object3D[100];
331409 // copy.versionindex = -1;
332
- }
410
+//
411
+// Save(true);
412
+// }
333413
334414 SetupMenu();
335415
....@@ -349,6 +429,9 @@
349429
350430 static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
351431
432
+ // This is to refresh the UI of the material panel.
433
+ boolean patchMaterial;
434
+
352435 void SetupMenu()
353436 {
354437 frame.setMenuBar(menuBar = new MenuBar());
....@@ -398,6 +481,8 @@
398481
399482 ChangeListener changeListener = new ChangeListener()
400483 {
484
+ //String name;
485
+
401486 public void stateChanged(ChangeEvent changeEvent)
402487 {
403488 // if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -416,7 +501,37 @@
416501 // EditSelection(false);
417502 // }
418503
419
- 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();
420535 }
421536 };
422537 objectPanel.addChangeListener(changeListener);
....@@ -436,10 +551,12 @@
436551 editPanel.add(editCommandsPanel);
437552 editPanel.add(ctrlPanel);
438553
439
- toolboxPanel = new cGridBag().setVertical(false);
554
+ toolboxPanel = new cGridBag().setVertical(true);
440555 //toolboxPanel.setName("Toolbox");
441556
442
- materialPanel = new cGridBag().setVertical(true);
557
+ skyboxPanel = new cGridBag().setVertical(true);
558
+
559
+ materialPanel = new cGridBag().setVertical(false);
443560 //materialPanel.setName("Material");
444561
445562 /*JTextPane*/
....@@ -723,6 +840,7 @@
723840 boolean maximized;
724841
725842 cButton fullscreenLayout;
843
+ cButton expandedLayout;
726844
727845 void Minimize()
728846 {
....@@ -762,10 +880,12 @@
762880 cButton minButton;
763881 cButton maxButton;
764882 cButton fullButton;
883
+ cButton collapseButton;
884
+ cButton maximize3DButton;
765885
766886 void ToggleFullScreen()
767887 {
768
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
888
+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
769889
770890 cameraView.ToggleFullScreen();
771891
....@@ -786,13 +906,13 @@
786906 // X frame.getContentPane().remove(/*"Center",*/bigThree);
787907 // X framePanel.add(bigThree);
788908 // X frame.getContentPane().add(/*"Center",*/framePanel);
789
- framePanel.setDividerLocation(46);
909
+// framePanel.setDividerLocation(46); // icons are 24x24
790910
791911 //frame.setVisible(true);
792
- radio.layout = keepButton;
912
+// radio.layout = keepButton;
793913 //theFrame = null;
794914 keepButton = null;
795
- radio.layout.doClick();
915
+// radio.layout.doClick();
796916
797917 } else
798918 {
....@@ -813,31 +933,53 @@
813933 // X frame.getContentPane().remove(/*"Center",*/framePanel);
814934 // X framePanel.remove(bigThree);
815935 // X frame.getContentPane().add(/*"Center",*/bigThree);
816
- framePanel.setDividerLocation(0);
936
+// framePanel.setDividerLocation(0);
817937
818
- radio.layout = fullscreenLayout;
819
- radio.layout.doClick();
938
+// radio.layout = fullscreenLayout;
939
+// radio.layout.doClick();
820940 //frame.setVisible(true);
821941 }
822942 frame.validate();
943
+
944
+ cameraView.requestFocusInWindow();
823945 }
824946
825
- private byte[] CompressCopy()
947
+ void CollapseToolbar()
948
+ {
949
+ framePanel.setDividerLocation(0);
950
+ //frame.validate();
951
+
952
+ cameraView.requestFocusInWindow();
953
+ }
954
+
955
+ private Object3D Duplicate(Object3D object)
826956 {
827957 boolean temp = CameraPane.SWITCH;
828958 CameraPane.SWITCH = false;
829959
830
- 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);
831964 // if (copy == client)
832965
833
- byte[] versions[] = copy.versions;
834
- 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;
835970
836
- byte[] compress = Compress(copy);
971
+ Object3D parent = object.parent;
972
+ object.parent = null;
837973
838
- copy.versions = versions;
974
+ //byte[] compress = Compress(copy);
975
+ Object3D compress = (Object3D)Grafreed.clone(object);
839976
840
- copy.RestoreBigData(versiontable);
977
+ object.parent = parent;
978
+
979
+ object.versionlist = versions;
980
+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
981
+
982
+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
841983
842984 CameraPane.SWITCH = temp;
843985
....@@ -965,6 +1107,7 @@
9651107 {
9661108 SetupMaterial(materialPanel);
9671109 }
1110
+
9681111 //SetupName();
9691112 //SetupViews();
9701113 }
....@@ -1173,6 +1316,18 @@
11731316
11741317 namePanel = new cGridBag();
11751318
1319
+ //if (copy.pinned)
1320
+ {
1321
+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.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
+
11761331 nameField = AddText(namePanel, copy.GetName());
11771332 namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
11781333 oe.ctrlPanel.add(namePanel);
....@@ -1186,14 +1341,16 @@
11861341
11871342 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
11881343 liveCB.setToolTipText("Animate object");
1344
+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1345
+ markCB.setToolTipText("Set target transform");
11891346 selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
11901347 selectableCB.setToolTipText("Make object selectable");
11911348 // Return();
11921349
11931350 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
11941351 hideCB.setToolTipText("Hide object");
1195
- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1196
- markCB.setToolTipText("As animation target transform");
1352
+
1353
+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
11971354
11981355 setupPanel2 = new cGridBag().setVertical(false);
11991356
....@@ -1393,6 +1550,7 @@
13931550
13941551 if (cam == null || !(copy.get(0) instanceof cGroup))
13951552 {
1553
+ if (Globals.DEBUG)
13961554 System.out.println("CREATE CAMERAS");
13971555 cams = new cTemplate();
13981556 cams.name = "Cameras";
....@@ -1474,6 +1632,42 @@
14741632 //frontView.object = copy;
14751633 //sideView.object = copy;
14761634
1635
+ transformPanel = new cGridBag().setVertical(true);
1636
+
1637
+ cGridBag resetTransformPanel = new cGridBag();
1638
+
1639
+ resetTransformPanel.preferredHeight = 2;
1640
+
1641
+ cButton resetTransform = GetButton("Reset all", !Grafreed.NIMBUSLAF);
1642
+ resetTransform.addMouseListener(new MouseAdapter()
1643
+ {
1644
+ public void mouseClicked(MouseEvent e)
1645
+ {
1646
+ ResetTransform();
1647
+ }
1648
+ });
1649
+ resetTransformPanel.add(resetTransform);
1650
+
1651
+ resetTransform = GetButton("T only", !Grafreed.NIMBUSLAF);
1652
+ resetTransform.addMouseListener(new MouseAdapter()
1653
+ {
1654
+ public void mouseClicked(MouseEvent e)
1655
+ {
1656
+ ResetTransform(1);
1657
+ }
1658
+ });
1659
+ resetTransformPanel.add(resetTransform);
1660
+
1661
+ resetTransform = GetButton("RS only", !Grafreed.NIMBUSLAF);
1662
+ resetTransform.addMouseListener(new MouseAdapter()
1663
+ {
1664
+ public void mouseClicked(MouseEvent e)
1665
+ {
1666
+ ResetTransform(2);
1667
+ }
1668
+ });
1669
+ resetTransformPanel.add(resetTransform);
1670
+
14771671 XYZPanel = new cGridBag().setVertical(true);
14781672 //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
14791673
....@@ -1483,6 +1677,9 @@
14831677 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
14841678 //XYZPanel.setName("XYZ");
14851679
1680
+ transformPanel.add(resetTransformPanel);
1681
+ transformPanel.add(XYZPanel);
1682
+
14861683 /*
14871684 gridPanel = new JPanel(); //new BorderLayout());
14881685 gridPanel.setLayout(new GridLayout(1, 2));
....@@ -1490,12 +1687,12 @@
14901687 gridPanel.add(cameraView);
14911688 gridPanel.add(XYZPanel);
14921689 */
1493
- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1494
- gridPanel.setContinuousLayout(true);
1495
- gridPanel.setOneTouchExpandable(true);
1496
- gridPanel.setDividerLocation(1.0);
1497
- gridPanel.setDividerSize(9);
1498
- gridPanel.setResizeWeight(0.85);
1690
+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1691
+// gridPanel.setContinuousLayout(true);
1692
+// gridPanel.setOneTouchExpandable(true);
1693
+// gridPanel.setDividerLocation(1.0);
1694
+// gridPanel.setDividerSize(9);
1695
+// gridPanel.setResizeWeight(0.85);
14991696
15001697 // aConstraints.weighty = 0;
15011698 //System.out.println("THIS = " + this);
....@@ -1518,25 +1715,34 @@
15181715
15191716 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15201717 //tmp.setName("Edit");
1718
+ objectPanel.add(toolboxPanel);
1719
+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1720
+ objectPanel.setToolTipTextAt(0, "Objects & textures");
1721
+
15211722 objectPanel.add(materialPanel);
1522
- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1723
+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1724
+ objectPanel.setToolTipTextAt(1, "Material");
1725
+
1726
+ objectPanel.add(skyboxPanel);
1727
+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1728
+ objectPanel.setToolTipTextAt(2, "Backgrounds");
1729
+
15231730 // JPanel north = new JPanel(new BorderLayout());
15241731 // north.setName("Edit");
15251732 // north.add(ctrlPanel, BorderLayout.NORTH);
15261733 // objectPanel.add(north);
15271734 objectPanel.add(editPanel);
1528
- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1735
+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1736
+ objectPanel.setToolTipTextAt(3, "Edit controls");
15291737
1530
- //if (Globals.ADVANCED)
1531
- objectPanel.add(infoPanel);
1532
- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1738
+ objectPanel.add(transformPanel);
1739
+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1740
+ objectPanel.setToolTipTextAt(4, "TRS transform");
15331741
1534
- objectPanel.add(XYZPanel);
1535
- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1536
-
1537
- objectPanel.add(toolboxPanel);
1538
- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1539
-
1742
+ patchMaterial = true;
1743
+ cameraView.patchMaterial = this;
1744
+ objectPanel.setSelectedIndex(1);
1745
+
15401746 /*
15411747 aConstraints.gridx = 0;
15421748 aConstraints.gridwidth = 1;
....@@ -1556,7 +1762,7 @@
15561762 scrollpane.addMouseWheelListener(this); // Default not fast enough
15571763
15581764 /*JTabbedPane*/ scenePanel = new cGridBag();
1559
- scenePanel.preferredWidth = 5;
1765
+ scenePanel.preferredWidth = 6;
15601766
15611767 JTabbedPane tabbedPane = new JTabbedPane();
15621768 tabbedPane.add(scrollpane);
....@@ -1573,6 +1779,11 @@
15731779
15741780 scenePanel.add(tabbedPane);
15751781
1782
+ //if (Globals.ADVANCED)
1783
+// tabbedPane.add(infoPanel);
1784
+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1785
+// tabbedPane.setToolTipTextAt(3, "Information");
1786
+
15761787 /*
15771788 cTree jTree = new cTree(null);
15781789 ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1593,13 +1804,13 @@
15931804 jtp.add(tree);
15941805 */
15951806
1596
- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1597
- bigPanel.setContinuousLayout(true);
1598
- bigPanel.setOneTouchExpandable(true);
1599
- bigPanel.setDividerLocation(0.8);
1600
- bigPanel.setDividerSize(15);
1601
- bigPanel.setResizeWeight(0.15);
1602
- bigPanel.setName("Scene");
1807
+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1808
+// bigPanel.setContinuousLayout(true);
1809
+// bigPanel.setOneTouchExpandable(true);
1810
+// bigPanel.setDividerLocation(0.8);
1811
+// bigPanel.setDividerSize(15);
1812
+// bigPanel.setResizeWeight(0.15);
1813
+// bigPanel.setName("Scene");
16031814
16041815 //bigPanel.setLayout(new BorderLayout());
16051816 //bigPanel.setSize(new Dimension(10,10));
....@@ -1643,6 +1854,23 @@
16431854 // aConstraints.gridheight = 1;
16441855
16451856 framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1857
+
1858
+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1859
+ new java.beans.PropertyChangeListener()
1860
+ {
1861
+ public void propertyChange(java.beans.PropertyChangeEvent pce)
1862
+ {
1863
+ if ((Integer)pce.getOldValue() == 1)
1864
+ {
1865
+ if (radio.layout != expandedLayout)
1866
+ {
1867
+ radio.layout = expandedLayout;
1868
+ radio.layout.doClick();
1869
+ }
1870
+ }
1871
+ }
1872
+ });
1873
+
16461874 framePanel.setContinuousLayout(false);
16471875 framePanel.setOneTouchExpandable(false);
16481876 //.setDividerLocation(0.8);
....@@ -1652,7 +1880,7 @@
16521880
16531881 frame.getContentPane().setLayout(new BorderLayout());
16541882 /**/
1655
- JTabbedPane worldPane = new JTabbedPane();
1883
+ //JTabbedPane worldPane = new JTabbedPane();
16561884 //worldPane.add(bigPanel);
16571885 //worldPane.add(worldPanel);
16581886 /**/
....@@ -1666,7 +1894,7 @@
16661894
16671895 cameraView.requestFocusInWindow();
16681896
1669
- gridPanel.setDividerLocation(1.0);
1897
+// gridPanel.setDividerLocation(1.0);
16701898
16711899 frame.validate();
16721900
....@@ -1675,7 +1903,6 @@
16751903 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16761904 frame.addWindowListener(new WindowAdapter()
16771905 {
1678
-
16791906 public void windowClosing(WindowEvent e)
16801907 {
16811908 Close();
....@@ -1698,12 +1925,426 @@
16981925 ctrlPanel.removeAll();
16991926 }
17001927
1701
- void SetupMaterial(cGridBag panel)
1928
+ void SetupMaterial(cGridBag materialpanel)
17021929 {
1703
- /*
1930
+ cGridBag presetpanel = new cGridBag().setVertical(true);
1931
+
1932
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1933
+ skin.setToolTipText("Skin");
1934
+ skin.addMouseListener(new MouseAdapter()
1935
+ {
1936
+ public void mouseClicked(MouseEvent e)
1937
+ {
1938
+ Object3D object = Grafreed.materials.versionlist[0].get(0);
1939
+ cMaterial material = object.material;
1940
+
1941
+ // Skin
1942
+ colorField.setFloat(material.color);
1943
+ float saturation = material.modulation;
1944
+
1945
+ if (!cameraView.Skinshader)
1946
+ {
1947
+ saturation /= 1.5;
1948
+ }
1949
+
1950
+ saturationField.setFloat(saturation);
1951
+
1952
+ subsurfaceField.setFloat(material.subsurface);
1953
+ selfshadowField.setFloat(material.diffuseness);
1954
+ diffusenessField.setFloat(material.factor);
1955
+ shininessField.setFloat(material.shininess);
1956
+ shadowbiasField.setFloat(material.shadowbias);
1957
+ diffuseField.setFloat(material.diffuse);
1958
+ specularField.setFloat(material.specular);
1959
+
1960
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
1961
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
1962
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
1963
+
1964
+ materialtouched = true;
1965
+ applySelf();
1966
+ }
1967
+ });
1968
+ presetpanel.add(skin);
1969
+
1970
+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
1971
+ lambert.setToolTipText("Diffuse");
1972
+ lambert.addMouseListener(new MouseAdapter()
1973
+ {
1974
+ public void mouseClicked(MouseEvent e)
1975
+ {
1976
+ Object3D object = Grafreed.materials.versionlist[2].get(0);
1977
+ cMaterial material = object.material;
1978
+
1979
+ diffusenessField.setFloat(material.factor);
1980
+ selfshadowField.setFloat(material.diffuseness);
1981
+
1982
+ materialtouched = true;
1983
+ applySelf();
1984
+ }
1985
+ });
1986
+ presetpanel.add(lambert);
1987
+
1988
+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
1989
+ diffuse2.setToolTipText("Diffuse2");
1990
+ diffuse2.addMouseListener(new MouseAdapter()
1991
+ {
1992
+ public void mouseClicked(MouseEvent e)
1993
+ {
1994
+ Object3D object = Grafreed.materials.versionlist[3].get(0);
1995
+ cMaterial material = object.material;
1996
+
1997
+ diffusenessField.setFloat(material.factor);
1998
+ selfshadowField.setFloat(material.diffuseness);
1999
+
2000
+ materialtouched = true;
2001
+ applySelf();
2002
+ }
2003
+ });
2004
+ presetpanel.add(diffuse2);
2005
+
2006
+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
2007
+ diffusemoon.setToolTipText("Moon");
2008
+ diffusemoon.addMouseListener(new MouseAdapter()
2009
+ {
2010
+ public void mouseClicked(MouseEvent e)
2011
+ {
2012
+ Object3D object = Grafreed.materials.versionlist[4].get(0);
2013
+ cMaterial material = object.material;
2014
+
2015
+ diffusenessField.setFloat(material.factor);
2016
+ selfshadowField.setFloat(material.diffuseness);
2017
+
2018
+ materialtouched = true;
2019
+ applySelf();
2020
+ }
2021
+ });
2022
+ presetpanel.add(diffusemoon);
2023
+
2024
+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
2025
+ diffusemoon2.setToolTipText("Moon2");
2026
+ diffusemoon2.addMouseListener(new MouseAdapter()
2027
+ {
2028
+ public void mouseClicked(MouseEvent e)
2029
+ {
2030
+ Object3D object = Grafreed.materials.versionlist[5].get(0);
2031
+ cMaterial material = object.material;
2032
+
2033
+ diffusenessField.setFloat(material.factor);
2034
+ selfshadowField.setFloat(material.diffuseness);
2035
+
2036
+ materialtouched = true;
2037
+ applySelf();
2038
+ }
2039
+ });
2040
+ presetpanel.add(diffusemoon2);
2041
+
2042
+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
2043
+ diffusemoon3.setToolTipText("Moon3");
2044
+ diffusemoon3.addMouseListener(new MouseAdapter()
2045
+ {
2046
+ public void mouseClicked(MouseEvent e)
2047
+ {
2048
+ Object3D object = Grafreed.materials.versionlist[6].get(0);
2049
+ cMaterial material = object.material;
2050
+
2051
+ diffusenessField.setFloat(material.factor);
2052
+ selfshadowField.setFloat(material.diffuseness);
2053
+
2054
+ materialtouched = true;
2055
+ applySelf();
2056
+ }
2057
+ });
2058
+ presetpanel.add(diffusemoon3);
2059
+
2060
+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
2061
+ diffusesheen.setToolTipText("Sheen");
2062
+ diffusesheen.addMouseListener(new MouseAdapter()
2063
+ {
2064
+ public void mouseClicked(MouseEvent e)
2065
+ {
2066
+ Object3D object = Grafreed.materials.versionlist[7].get(0);
2067
+ cMaterial material = object.material;
2068
+
2069
+ sheenField.setFloat(material.sheen);
2070
+
2071
+ materialtouched = true;
2072
+ applySelf();
2073
+ }
2074
+ });
2075
+ presetpanel.add(diffusesheen);
2076
+
2077
+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
2078
+ rough.setToolTipText("Rough metal");
2079
+ rough.addMouseListener(new MouseAdapter()
2080
+ {
2081
+ public void mouseClicked(MouseEvent e)
2082
+ {
2083
+ Object3D object = Grafreed.materials.versionlist[1].get(0);
2084
+ cMaterial material = object.material;
2085
+
2086
+ shininessField.setFloat(material.shininess);
2087
+ velvetField.setFloat(material.velvet);
2088
+
2089
+ materialtouched = true;
2090
+ applySelf();
2091
+ }
2092
+ });
2093
+ presetpanel.add(rough);
2094
+
2095
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
2096
+ rough2.setToolTipText("Medium metal");
2097
+ rough2.addMouseListener(new MouseAdapter()
2098
+ {
2099
+ public void mouseClicked(MouseEvent e)
2100
+ {
2101
+ Object3D object = Grafreed.materials.versionlist[13].get(0);
2102
+ cMaterial material = object.material;
2103
+
2104
+ shininessField.setFloat(material.shininess);
2105
+ lightareaField.setFloat(material.lightarea);
2106
+
2107
+ materialtouched = true;
2108
+ applySelf();
2109
+ }
2110
+ });
2111
+ presetpanel.add(rough2);
2112
+
2113
+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
2114
+ shini0.setToolTipText("Shiny");
2115
+ shini0.addMouseListener(new MouseAdapter()
2116
+ {
2117
+ public void mouseClicked(MouseEvent e)
2118
+ {
2119
+ Object3D object = Grafreed.materials.versionlist[14].get(0);
2120
+ cMaterial material = object.material;
2121
+
2122
+ shininessField.setFloat(material.shininess);
2123
+ lightareaField.setFloat(material.lightarea);
2124
+
2125
+ materialtouched = true;
2126
+ applySelf();
2127
+ }
2128
+ });
2129
+ presetpanel.add(shini0);
2130
+
2131
+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
2132
+ shini1.setToolTipText("Shiny2");
2133
+ shini1.addMouseListener(new MouseAdapter()
2134
+ {
2135
+ public void mouseClicked(MouseEvent e)
2136
+ {
2137
+ Object3D object = Grafreed.materials.versionlist[11].get(0);
2138
+ cMaterial material = object.material;
2139
+
2140
+ shininessField.setFloat(material.shininess);
2141
+ lightareaField.setFloat(material.lightarea);
2142
+
2143
+ materialtouched = true;
2144
+ applySelf();
2145
+ }
2146
+ });
2147
+ presetpanel.add(shini1);
2148
+
2149
+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2150
+ shini2.setToolTipText("Shiny3");
2151
+ shini2.addMouseListener(new MouseAdapter()
2152
+ {
2153
+ public void mouseClicked(MouseEvent e)
2154
+ {
2155
+ Object3D object = Grafreed.materials.versionlist[12].get(0);
2156
+ cMaterial material = object.material;
2157
+
2158
+ shininessField.setFloat(material.shininess);
2159
+ lightareaField.setFloat(material.lightarea);
2160
+
2161
+ materialtouched = true;
2162
+ applySelf();
2163
+ }
2164
+ });
2165
+ presetpanel.add(shini2);
2166
+
2167
+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2168
+ aniso.setToolTipText("AnisoU");
2169
+ aniso.addMouseListener(new MouseAdapter()
2170
+ {
2171
+ public void mouseClicked(MouseEvent e)
2172
+ {
2173
+ Object3D object = Grafreed.materials.versionlist[8].get(0);
2174
+ cMaterial material = object.material;
2175
+
2176
+ anisoField.setFloat(material.aniso);
2177
+ anisoVField.setFloat(material.anisoV);
2178
+
2179
+ materialtouched = true;
2180
+ applySelf();
2181
+ }
2182
+ });
2183
+ presetpanel.add(aniso);
2184
+
2185
+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2186
+ aniso2.setToolTipText("AnisoV");
2187
+ aniso2.addMouseListener(new MouseAdapter()
2188
+ {
2189
+ public void mouseClicked(MouseEvent e)
2190
+ {
2191
+ Object3D object = Grafreed.materials.versionlist[9].get(0);
2192
+ cMaterial material = object.material;
2193
+
2194
+ anisoField.setFloat(material.aniso);
2195
+ anisoVField.setFloat(material.anisoV);
2196
+
2197
+ materialtouched = true;
2198
+ applySelf();
2199
+ }
2200
+ });
2201
+ presetpanel.add(aniso2);
2202
+
2203
+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2204
+ aniso3.setToolTipText("AnisoUV");
2205
+ aniso3.addMouseListener(new MouseAdapter()
2206
+ {
2207
+ public void mouseClicked(MouseEvent e)
2208
+ {
2209
+ Object3D object = Grafreed.materials.versionlist[10].get(0);
2210
+ cMaterial material = object.material;
2211
+
2212
+ anisoField.setFloat(material.aniso);
2213
+ anisoVField.setFloat(material.anisoV);
2214
+
2215
+ materialtouched = true;
2216
+ applySelf();
2217
+ }
2218
+ });
2219
+ presetpanel.add(aniso3);
2220
+
2221
+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2222
+ velvet0.setToolTipText("Velvet");
2223
+ velvet0.addMouseListener(new MouseAdapter()
2224
+ {
2225
+ public void mouseClicked(MouseEvent e)
2226
+ {
2227
+ Object3D object = Grafreed.materials.versionlist[15].get(0);
2228
+ cMaterial material = object.material;
2229
+
2230
+ diffusenessField.setFloat(material.factor);
2231
+ selfshadowField.setFloat(material.diffuseness);
2232
+ sheenField.setFloat(material.sheen);
2233
+ shininessField.setFloat(material.shininess);
2234
+ velvetField.setFloat(material.velvet);
2235
+ shiftField.setFloat(material.shift);
2236
+
2237
+ materialtouched = true;
2238
+ applySelf();
2239
+ }
2240
+ });
2241
+ presetpanel.add(velvet0);
2242
+
2243
+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2244
+ bump0.setToolTipText("Bump texture");
2245
+ bump0.addMouseListener(new MouseAdapter()
2246
+ {
2247
+ public void mouseClicked(MouseEvent e)
2248
+ {
2249
+ Object3D object = Grafreed.materials.versionlist[16].get(0);
2250
+ cMaterial material = object.material;
2251
+
2252
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2253
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2254
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2255
+
2256
+ materialtouched = true;
2257
+ applySelf();
2258
+ }
2259
+ });
2260
+ presetpanel.add(bump0);
2261
+
2262
+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2263
+ borderShader.setToolTipText("Border fade");
2264
+ borderShader.addMouseListener(new MouseAdapter()
2265
+ {
2266
+ public void mouseClicked(MouseEvent e)
2267
+ {
2268
+ borderfadeField.setFloat(0.5);
2269
+ opacityField.setFloat(0.75);
2270
+
2271
+ materialtouched = true;
2272
+ applySelf();
2273
+ }
2274
+ });
2275
+ presetpanel.add(borderShader);
2276
+
2277
+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2278
+ halo.setToolTipText("Halo");
2279
+ halo.addMouseListener(new MouseAdapter()
2280
+ {
2281
+ public void mouseClicked(MouseEvent e)
2282
+ {
2283
+ Object3D object = Grafreed.materials.versionlist[17].get(0);
2284
+ cMaterial material = object.material;
2285
+
2286
+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2287
+
2288
+ materialtouched = true;
2289
+ applySelf();
2290
+ }
2291
+ });
2292
+ presetpanel.add(halo);
2293
+
2294
+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2295
+ candle.setToolTipText("Candle");
2296
+ candle.addMouseListener(new MouseAdapter()
2297
+ {
2298
+ public void mouseClicked(MouseEvent e)
2299
+ {
2300
+ Object3D object = Grafreed.materials.versionlist[18].get(0);
2301
+ cMaterial material = object.material;
2302
+
2303
+ subsurfaceField.setFloat(material.subsurface);
2304
+ shadowbiasField.setFloat(material.shadowbias);
2305
+ ambientField.setFloat(material.ambient);
2306
+ specularField.setFloat(material.specular);
2307
+ lightareaField.setFloat(material.lightarea);
2308
+ shininessField.setFloat(material.shininess);
2309
+
2310
+ materialtouched = true;
2311
+ applySelf();
2312
+ }
2313
+ });
2314
+ presetpanel.add(candle);
2315
+
2316
+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2317
+ shadowShader.setToolTipText("Shadow");
2318
+ shadowShader.addMouseListener(new MouseAdapter()
2319
+ {
2320
+ public void mouseClicked(MouseEvent e)
2321
+ {
2322
+ diffuseField.setFloat(0.001);
2323
+ ambientField.setFloat(0.001);
2324
+ cameraField.setFloat(0.001);
2325
+ specularField.setFloat(0.001);
2326
+ fakedepthField.setFloat(0.001);
2327
+ opacityField.setFloat(0.6);
2328
+
2329
+ materialtouched = true;
2330
+ applySelf();
2331
+ }
2332
+ });
2333
+ presetpanel.add(shadowShader);
2334
+
2335
+ cGridBag panel = new cGridBag().setVertical(true);
2336
+
2337
+ presetpanel.preferredWidth = 1;
2338
+
2339
+ materialpanel.add(presetpanel);
2340
+ materialpanel.add(panel);
2341
+
2342
+ panel.preferredWidth = 8;
2343
+
2344
+ /*
17042345 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
17052346 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706
- */
2347
+ */
17072348
17082349 cGridBag editBar = new cGridBag().setVertical(false);
17092350
....@@ -1737,27 +2378,61 @@
17372378 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17382379
17392380 cGridBag colorSection = new cGridBag().setVertical(true);
2381
+
2382
+ cGridBag huepanel = new cGridBag();
2383
+ cGridBag huelabel = new cGridBag();
2384
+ cLabel hue = GetLabel("icons/hue.png", false);
2385
+ hue.fit = true;
2386
+
2387
+ hue.addMouseListener(new MouseAdapter()
2388
+ {
2389
+ public void mousePressed(MouseEvent e)
2390
+ {
2391
+ int x = e.getX();
2392
+
2393
+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2394
+ }
2395
+ });
2396
+
2397
+ huelabel.add(hue);
2398
+ huelabel.preferredWidth = 20;
2399
+ huepanel.add(new cGridBag()); // Label
2400
+ huepanel.add(huelabel); // Field/slider
2401
+
2402
+ huepanel.preferredHeight = 7;
2403
+
2404
+ colorSection.add(huepanel);
17402405
17412406 cGridBag color = new cGridBag();
1742
- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1743
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1744
- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2407
+
2408
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
2409
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2410
+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2411
+
17452412 //colorField.preferredWidth = 200;
17462413 colorSection.add(color);
17472414
17482415 cGridBag modulation = new cGridBag();
17492416 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
17502417 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1751
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2418
+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
17522419 colorSection.add(modulation);
17532420
2421
+ cGridBag opacity = new cGridBag();
2422
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
2423
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2424
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2425
+ colorSection.add(opacity);
2426
+
2427
+ colorSection.add(GetSeparator());
2428
+
17542429 cGridBag texture = new cGridBag();
17552430 texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
17562431 textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17572432 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
17582433 colorSection.add(texture);
17592434
1760
- panel.add(new JSeparator());
2435
+ panel.add(GetSeparator());
17612436
17622437 panel.add(colorSection);
17632438
....@@ -1813,7 +2488,7 @@
18132488 shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
18142489 diffuseSection.add(shadowbias);
18152490
1816
- panel.add(new JSeparator());
2491
+ panel.add(GetSeparator());
18172492
18182493 panel.add(diffuseSection);
18192494
....@@ -1876,7 +2551,7 @@
18762551 specularSection.add(anisoV);
18772552
18782553
1879
- panel.add(new JSeparator());
2554
+ panel.add(GetSeparator());
18802555
18812556 panel.add(specularSection);
18822557
....@@ -1901,12 +2576,6 @@
19012576 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
19022577 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
19032578 colorSection.add(backlit);
1904
-
1905
- cGridBag opacity = new cGridBag();
1906
- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1907
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1908
- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1909
- colorSection.add(opacity);
19102579
19112580 //panel.add(new JSeparator());
19122581
....@@ -1952,7 +2621,7 @@
19522621 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
19532622 textureSection.add(opacityPower);
19542623
1955
- panel.add(new JSeparator());
2624
+ panel.add(GetSeparator());
19562625
19572626 panel.add(textureSection);
19582627
....@@ -2939,7 +3608,7 @@
29393608
29403609 freezematerial = true;
29413610 colorField.setFloat(mat.color);
2942
- modulationField.setFloat(mat.modulation);
3611
+ saturationField.setFloat(mat.modulation);
29433612 metalnessField.setFloat(mat.metalness);
29443613 diffuseField.setFloat(mat.diffuse);
29453614 specularField.setFloat(mat.specular);
....@@ -3001,32 +3670,8 @@
30013670
30023671 if (multiplyToggle != null)
30033672 multiplyToggle.setSelected(mat.multiply);
3004
-
3005
- assert (object.projectedVertices != null);
3006
-
3007
- if (object.projectedVertices.length <= 2)
3008
- {
3009
- // Side effect...
3010
- Object3D.cVector2[] keep = object.projectedVertices;
3011
- object.projectedVertices = new Object3D.cVector2[3];
3012
- for (int i = 0; i < 3; i++)
3013
- {
3014
- if (i < keep.length)
3015
- {
3016
- object.projectedVertices[i] = keep[i];
3017
- } else
3018
- {
3019
- object.projectedVertices[i] = new Object3D.cVector2();
3020
- }
3021
- /*
3022
- if(keep.length == 0)
3023
- object.projectedVertices[0] = new Object3D.cVector2();
3024
- else
3025
- object.projectedVertices[0] = keep[0];
3026
- object.projectedVertices[1] = new Object3D.cVector2();
3027
- */
3028
- }
3029
- }
3673
+
3674
+ AllocProjectedVertices(object);
30303675
30313676 SetMaterial(mat, object.projectedVertices);
30323677 }
....@@ -3146,6 +3791,17 @@
31463791 public void itemStateChanged(ItemEvent event)
31473792 {
31483793 // System.out.println("Propagate = " + propagate);
3794
+ if (event.getSource() == pinButton)
3795
+ {
3796
+ copy.pinned ^= true;
3797
+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3798
+ {
3799
+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
3800
+ copy.CloseUI();
3801
+ //copy.editWindow.refreshContents();
3802
+ }
3803
+ }
3804
+ else
31493805 if (event.getSource() == propagateToggle)
31503806 {
31513807 propagate ^= true;
....@@ -3250,6 +3906,7 @@
32503906 } else if (event.getSource() == liveCB)
32513907 {
32523908 copy.live ^= true;
3909
+ objEditor.refreshContents(true); // To show item colors
32533910 return;
32543911 } else if (event.getSource() == selectableCB)
32553912 {
....@@ -3259,7 +3916,7 @@
32593916 {
32603917 copy.hide ^= true;
32613918 copy.Touch(); // display list issue
3262
- objEditor.refreshContents();
3919
+ objEditor.refreshContents(true); // To show item colors
32633920 return;
32643921 } else if (event.getSource() == link2masterCB)
32653922 {
....@@ -3324,7 +3981,7 @@
33243981 //System.out.println("ObjEditor " + event);
33253982 applySelf0(true);
33263983 //parent.applySelf();
3327
- objEditor.refreshContents();
3984
+ // conflicts with requestFocus objEditor.refreshContents();
33283985 } else if (source == resetButton)
33293986 {
33303987 CameraPane.fullreset = true;
....@@ -3515,6 +4172,7 @@
35154172
35164173 static public byte[] Compress(Object3D o)
35174174 {
4175
+ // Slower to actually compress.
35184176 try
35194177 {
35204178 ByteArrayOutputStream baos = new ByteArrayOutputStream();
....@@ -3616,6 +4274,7 @@
36164274 {
36174275 //Save(true);
36184276 Replace();
4277
+ SetVersionStates();
36194278 }
36204279
36214280 private boolean Equal(byte[] compress, byte[] name)
....@@ -3634,31 +4293,50 @@
36344293 return true;
36354294 }
36364295
3637
- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4296
+ void DeleteVersion()
4297
+ {
4298
+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
4299
+ {
4300
+ copy.versionlist[i] = copy.versionlist[i+1];
4301
+ }
4302
+
4303
+ if (copy.versionlist[copy.versionindex] == null)
4304
+ copy.versionindex -= 1;
4305
+
4306
+ if (copy.versionindex != -1)
4307
+ CopyChanged();
4308
+
4309
+ SetVersionStates();
4310
+ }
36384311
36394312 public boolean Save(boolean user)
36404313 {
36414314 System.err.println("Save");
4315
+ Replace();
36424316
3643
- cRadio tab = GetCurrentTab();
4317
+ //cRadio tab = GetCurrentTab();
36444318
3645
- byte[] compress = CompressCopy();
4319
+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
36464320
36474321 boolean thesame = false;
36484322
3649
- // Quick heuristic using length. Works only when stream is compressed.
3650
- if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3651
- {
3652
- thesame = true;
3653
- }
4323
+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
4324
+// {
4325
+// thesame = true;
4326
+// }
36544327
36554328 //EditorFrame.m_MainFrame.requestFocusInWindow();
36564329 if (!thesame)
36574330 {
4331
+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
4332
+ {
4333
+ copy.versionlist[i] = copy.versionlist[i-1];
4334
+ }
4335
+
36584336 //tab.user[tab.versionindex] = user;
36594337 //boolean increment = true; // tab.graphs[tab.versionindex] == null;
36604338
3661
- copy.versions[++copy.versionindex] = compress;
4339
+ copy.versionlist[++copy.versionindex] = compress;
36624340
36634341 // if (increment)
36644342 // tab.versionindex++;
....@@ -3668,13 +4346,13 @@
36684346
36694347 //assert(hashtable.isEmpty());
36704348
3671
- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3672
- {
3673
- //tab.user[i] = false;
3674
- copy.versions[i] = null;
3675
- }
4349
+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
4350
+// {
4351
+// //tab.user[i] = false;
4352
+// copy.versionlist[i] = null;
4353
+// }
36764354
3677
- SetUndoStates();
4355
+ SetVersionStates();
36784356
36794357 // test save
36804358 if (false)
....@@ -3697,27 +4375,65 @@
36974375
36984376 return !thesame;
36994377 }
3700
-
3701
- void CopyChanged(Object3D obj)
4378
+
4379
+ boolean flashIt = true;
4380
+
4381
+ void RefreshSelection()
37024382 {
3703
- SetUndoStates();
4383
+ Object3D selection = new Object3D();
4384
+
4385
+ for (int i = 0; i < copy.selection.size(); i++)
4386
+ {
4387
+ Object3D elem = copy.selection.elementAt(i);
4388
+
4389
+ Object3D obj = copy.GetObject(elem.GetUUID());
4390
+
4391
+ if (obj == null)
4392
+ {
4393
+ copy.selection.remove(i--);
4394
+ }
4395
+ else
4396
+ {
4397
+ selection.add(obj);
4398
+ copy.selection.setElementAt(obj, i);
4399
+ }
4400
+ }
4401
+
4402
+ flashIt = false;
4403
+ GetTree().clearSelection();
4404
+ for (int i = 0; i < selection.size(); i++)
4405
+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
4406
+ flashIt = true;
4407
+
4408
+ //refreshContents(false);
4409
+ }
4410
+
4411
+ void CopyChanged()
4412
+ {
4413
+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4414
+
4415
+ SetVersionStates();
37044416
37054417 boolean temp = CameraPane.SWITCH;
37064418 CameraPane.SWITCH = false;
37074419
3708
- copy.ExtractBigData(versiontable);
4420
+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
37094421
37104422 copy.clear();
37114423
4424
+ copy.skyboxname = obj.skyboxname;
4425
+ copy.skyboxext = obj.skyboxext;
4426
+
37124427 for (int i=0; i<obj.Size(); i++)
37134428 {
37144429 copy.add(obj.get(i));
37154430 }
37164431
3717
- copy.RestoreBigData(versiontable);
4432
+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
37184433
37194434 CameraPane.SWITCH = temp;
37204435
4436
+ RefreshSelection();
37214437 //assert(hashtable.isEmpty());
37224438
37234439 copy.Touch();
....@@ -3738,13 +4454,15 @@
37384454 }
37394455 }
37404456
3741
- refreshContents();
4457
+ refreshContents(true);
37424458 }
37434459
3744
- cButton undoButton;
4460
+ cButton previousVersionButton;
37454461 cButton restoreButton;
37464462 cButton replaceButton;
3747
- cButton redoButton;
4463
+ cButton nextVersionButton;
4464
+ cButton saveVersionButton;
4465
+ cButton deleteVersionButton;
37484466
37494467 boolean muteSlider;
37504468
....@@ -3752,39 +4470,64 @@
37524470 {
37534471 int count = 0;
37544472
3755
- for (int i = copy.versions.length; --i >= 0;)
4473
+ for (int i = copy.versionlist.length; --i >= 0;)
37564474 {
3757
- if (copy.versions[i] != null)
4475
+ if (copy.versionlist[i] != null)
37584476 count++;
37594477 }
37604478
37614479 return count;
37624480 }
37634481
3764
- void SetUndoStates()
4482
+ public cGridBag versionSliderPane;
4483
+
4484
+ void SetVersionStates()
37654485 {
3766
- cRadio tab = GetCurrentTab();
4486
+ //if (true)
4487
+ // return;
4488
+
4489
+ //cRadio tab = GetCurrentTab();
37674490
3768
- restoreButton.setEnabled(copy.versionindex != -1);
3769
- replaceButton.setEnabled(copy.versionindex != -1);
3770
-
3771
- undoButton.setEnabled(copy.versionindex > 0);
3772
- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3773
-
3774
- muteSlider = true;
3775
- versionSlider.setMaximum(VersionCount() - 1);
3776
- versionSlider.setInteger(copy.versionindex);
3777
- muteSlider = false;
4491
+ if (copy.versionlist == null)
4492
+ {
4493
+ saveVersionButton.setEnabled(false);
4494
+ restoreButton.setEnabled(false);
4495
+ replaceButton.setEnabled(false);
4496
+ previousVersionButton.setEnabled(false);
4497
+ nextVersionButton.setEnabled(false);
4498
+ deleteVersionButton.setEnabled(false);
4499
+ versionSliderPane.setVisible(false);
4500
+ }
4501
+ else
4502
+ {
4503
+ restoreButton.setEnabled(copy.versionindex != -1);
4504
+ replaceButton.setEnabled(copy.versionindex != -1);
4505
+
4506
+ previousVersionButton.setEnabled(copy.versionindex > 0);
4507
+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4508
+
4509
+ deleteVersionButton.setEnabled(copy.versionindex != -1);
4510
+ //copy.versionlist[copy.versionindex + 1] != null);
4511
+
4512
+ muteSlider = true;
4513
+ versionSlider.setMinimum(0);
4514
+ versionSlider.setMaximum(VersionCount() - 1);
4515
+ versionSlider.setInteger(copy.versionindex);
4516
+ versionSlider.setEnabled(copy.versionindex != -1);
4517
+ muteSlider = false;
4518
+
4519
+ versionSliderPane.setVisible(true);
4520
+ }
37784521 }
37794522
3780
- public boolean Undo()
4523
+ public boolean PreviousVersion()
37814524 {
37824525 // Option?
37834526 Replace();
37844527
37854528 System.err.println("Undo");
37864529
3787
- cRadio tab = GetCurrentTab();
4530
+ //cRadio tab = GetCurrentTab();
37884531
37894532 if (copy.versionindex == 0)
37904533 {
....@@ -3807,7 +4550,7 @@
38074550
38084551 copy.versionindex -= 1;
38094552
3810
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4553
+ CopyChanged();
38114554
38124555 return true;
38134556 }
....@@ -3816,44 +4559,45 @@
38164559 {
38174560 System.err.println("Restore");
38184561
3819
- cRadio tab = GetCurrentTab();
4562
+ //cRadio tab = GetCurrentTab();
38204563
3821
- if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
4564
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
38224565 {
38234566 java.awt.Toolkit.getDefaultToolkit().beep();
38244567 return false;
38254568 }
38264569
3827
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4570
+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4571
+ CopyChanged();
38284572
38294573 return true;
38304574 }
38314575
38324576 public boolean Replace()
38334577 {
3834
- System.err.println("Replace");
4578
+ //System.err.println("Replace");
38354579
3836
- cRadio tab = GetCurrentTab();
4580
+ //cRadio tab = GetCurrentTab();
38374581
3838
- if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
4582
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
38394583 {
38404584 // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
38414585 return false;
38424586 }
38434587
3844
- copy.versions[copy.versionindex] = CompressCopy();
4588
+ copy.versionlist[copy.versionindex] = Duplicate(copy);
38454589
38464590 return true;
38474591 }
38484592
3849
- public void Redo()
4593
+ public void NextVersion()
38504594 {
38514595 // Option?
38524596 Replace();
38534597
3854
- cRadio tab = GetCurrentTab();
4598
+ //cRadio tab = GetCurrentTab();
38554599
3856
- if (copy.versions[copy.versionindex + 1] == null)
4600
+ if (copy.versionlist[copy.versionindex + 1] == null)
38574601 {
38584602 java.awt.Toolkit.getDefaultToolkit().beep();
38594603 return;
....@@ -3861,7 +4605,7 @@
38614605
38624606 copy.versionindex += 1;
38634607
3864
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4608
+ CopyChanged();
38654609
38664610 //if (!tab.user[tab.versionindex])
38674611 // tab.graphs[tab.versionindex] = null;
....@@ -4058,6 +4802,12 @@
40584802 // else
40594803 // applySelf(true);
40604804 // }
4805
+
4806
+ boolean Equal(double a, double b)
4807
+ {
4808
+ return Math.abs(a - b) < 0.001;
4809
+ }
4810
+
40614811 void applySelf0(boolean name)
40624812 {
40634813 if (name)
....@@ -4075,7 +4825,7 @@
40754825 //copy.material = new cMaterial(copy.GetMaterial());
40764826
40774827 current.color = (float) colorField.getFloat();
4078
- current.modulation = (float) modulationField.getFloat();
4828
+ current.modulation = (float) saturationField.getFloat();
40794829 current.metalness = (float) metalnessField.getFloat();
40804830 current.diffuse = (float) diffuseField.getFloat();
40814831 current.specular = (float) specularField.getFloat();
....@@ -4107,29 +4857,52 @@
41074857 {
41084858 cMaterial mat = copy.material;
41094859
4110
- colorField.SetToolTipValue((mat.color));
4111
- modulationField.SetToolTipValue((mat.modulation));
4112
- metalnessField.SetToolTipValue((mat.metalness));
4113
- diffuseField.SetToolTipValue((mat.diffuse));
4114
- specularField.SetToolTipValue((mat.specular));
4115
- shininessField.SetToolTipValue((mat.shininess));
4116
- shiftField.SetToolTipValue((mat.shift));
4117
- ambientField.SetToolTipValue((mat.ambient));
4118
- lightareaField.SetToolTipValue((mat.lightarea));
4119
- diffusenessField.SetToolTipValue((mat.factor));
4120
- velvetField.SetToolTipValue((mat.velvet));
4121
- sheenField.SetToolTipValue((mat.sheen));
4122
- subsurfaceField.SetToolTipValue((mat.subsurface));
4123
- backlitField.SetToolTipValue((mat.bump));
4124
- anisoField.SetToolTipValue((mat.aniso));
4125
- anisoVField.SetToolTipValue((mat.anisoV));
4126
- cameraField.SetToolTipValue((mat.cameralight));
4127
- selfshadowField.SetToolTipValue((mat.diffuseness));
4128
- shadowField.SetToolTipValue((mat.shadow));
4129
- textureField.SetToolTipValue((mat.texture));
4130
- opacityField.SetToolTipValue((mat.opacity));
4131
- fakedepthField.SetToolTipValue((mat.fakedepth));
4132
- shadowbiasField.SetToolTipValue((mat.shadowbias));
4860
+ if (!Equal(colorField.getFloat(), mat.color))
4861
+ colorField.SetToolTipValue((mat.color));
4862
+ if (!Equal(saturationField.getFloat(), mat.modulation))
4863
+ saturationField.SetToolTipValue((mat.modulation));
4864
+ if (!Equal(metalnessField.getFloat(), mat.metalness))
4865
+ metalnessField.SetToolTipValue((mat.metalness));
4866
+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
4867
+ diffuseField.SetToolTipValue((mat.diffuse));
4868
+ if (!Equal(specularField.getFloat(), mat.specular))
4869
+ specularField.SetToolTipValue((mat.specular));
4870
+ if (!Equal(shininessField.getFloat(), mat.shininess))
4871
+ shininessField.SetToolTipValue((mat.shininess));
4872
+ if (!Equal(shiftField.getFloat(), mat.shift))
4873
+ shiftField.SetToolTipValue((mat.shift));
4874
+ if (!Equal(ambientField.getFloat(), mat.ambient))
4875
+ ambientField.SetToolTipValue((mat.ambient));
4876
+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
4877
+ lightareaField.SetToolTipValue((mat.lightarea));
4878
+ if (!Equal(diffusenessField.getFloat(), mat.factor))
4879
+ diffusenessField.SetToolTipValue((mat.factor));
4880
+ if (!Equal(velvetField.getFloat(), mat.velvet))
4881
+ velvetField.SetToolTipValue((mat.velvet));
4882
+ if (!Equal(sheenField.getFloat(), mat.sheen))
4883
+ sheenField.SetToolTipValue((mat.sheen));
4884
+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
4885
+ subsurfaceField.SetToolTipValue((mat.subsurface));
4886
+ if (!Equal(backlitField.getFloat(), mat.bump))
4887
+ backlitField.SetToolTipValue((mat.bump));
4888
+ if (!Equal(anisoField.getFloat(), mat.aniso))
4889
+ anisoField.SetToolTipValue((mat.aniso));
4890
+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
4891
+ anisoVField.SetToolTipValue((mat.anisoV));
4892
+ if (!Equal(cameraField.getFloat(), mat.cameralight))
4893
+ cameraField.SetToolTipValue((mat.cameralight));
4894
+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
4895
+ selfshadowField.SetToolTipValue((mat.diffuseness));
4896
+ if (!Equal(shadowField.getFloat(), mat.shadow))
4897
+ shadowField.SetToolTipValue((mat.shadow));
4898
+ if (!Equal(textureField.getFloat(), mat.texture))
4899
+ textureField.SetToolTipValue((mat.texture));
4900
+ if (!Equal(opacityField.getFloat(), mat.opacity))
4901
+ opacityField.SetToolTipValue((mat.opacity));
4902
+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
4903
+ fakedepthField.SetToolTipValue((mat.fakedepth));
4904
+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
4905
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
41334906 }
41344907
41354908 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
....@@ -4164,17 +4937,20 @@
41644937
41654938 public void stateChanged(ChangeEvent e)
41664939 {
4167
- // assert(false);
4940
+ // assert(false);
41684941 if (e.getSource() == versionSlider)
41694942 {
41704943 if (muteSlider)
41714944 return;
41724945
4946
+ Replace();
4947
+
41734948 int version = versionSlider.getInteger();
41744949
4175
- if (copy.versions[version] != null)
4950
+ if (version != -1 && copy.versionlist[version] != null)
41764951 {
4177
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
4952
+ copy.versionindex = version;
4953
+ CopyChanged();
41784954 }
41794955
41804956 return;
....@@ -4214,6 +4990,12 @@
42144990 {
42154991 //System.out.println("stateChanged = " + this);
42164992 materialtouched = true;
4993
+
4994
+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
4995
+ {
4996
+ saturationField.setFloat(1);
4997
+ }
4998
+
42174999 applySelf();
42185000 //System.out.println("this = " + this);
42195001 //System.out.println("PARENT = " + parent);
....@@ -4513,6 +5295,7 @@
45135295 {
45145296 if (GetTree() != null)
45155297 {
5298
+ GetTree().revalidate();
45165299 GetTree().repaint();
45175300 }
45185301
....@@ -4521,6 +5304,11 @@
45215304 ctrlPanel.validate(); // ? new
45225305 ctrlPanel.repaint();
45235306 }
5307
+
5308
+ if (previousVersionButton != null && copy.versionlist != null)
5309
+ SetVersionStates();
5310
+
5311
+ cameraView.requestFocusInWindow();
45245312 }
45255313
45265314 static TweenManager tweenManager = new TweenManager();
....@@ -4552,7 +5340,7 @@
45525340 // group = (Composite) group.get(0);
45535341 // }
45545342
4555
- System.out.println("makeSomething of " + thing);
5343
+ //System.out.println("makeSomething of " + thing);
45565344
45575345 /*
45585346 if (deselect && jList != null)
....@@ -4769,7 +5557,9 @@
47695557 readobj.ResetDisplayList();
47705558 } catch (Exception e)
47715559 {
4772
- e.printStackTrace();
5560
+ if (!e.toString().contains("GZIP"))
5561
+ e.printStackTrace();
5562
+
47735563 try
47745564 {
47755565 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4849,6 +5639,8 @@
48495639 {
48505640 //readobj.deepCopySelf(copy);
48515641 copy.clear(); // june 2014
5642
+ copy.skyboxname = readobj.skyboxname;
5643
+ copy.skyboxext = readobj.skyboxext;
48525644 for (int i = 0; i < readobj.size(); i++)
48535645 {
48545646 Object3D child = readobj.get(i); // reserve(i);
....@@ -4900,13 +5692,17 @@
49005692 c.addChild(csg);
49015693 }
49025694
4903
- copy.versions = readobj.versions;
5695
+ copy.versionlist = readobj.versionlist;
49045696 copy.versionindex = readobj.versionindex;
5697
+ copy.versiontable = readobj.versiontable;
49055698
4906
- if (copy.versions == null)
5699
+ if (copy.versionlist == null)
49075700 {
4908
- copy.versions = new byte[100][];
5701
+ // Backward compatibility
5702
+ copy.versionlist = new Object3D[100];
49095703 copy.versionindex = -1;
5704
+
5705
+ //Save(true);
49105706 }
49115707
49125708 //? SetUndoStates();
....@@ -4921,7 +5717,7 @@
49215717 {
49225718 if (Grafreed.standAlone)
49235719 {
4924
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5720
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
49255721 browser.show();
49265722 String filename = browser.getFile();
49275723 if (filename != null && filename.length() > 0)
....@@ -4998,6 +5794,8 @@
49985794
49995795 void save()
50005796 {
5797
+ Replace();
5798
+
50015799 if (lastname == null)
50025800 {
50035801 return;
....@@ -5240,6 +6038,7 @@
52406038 ButtonGroup buttonGroup;
52416039
52426040 cGridBag toolboxPanel;
6041
+ cGridBag skyboxPanel;
52436042 cGridBag materialPanel;
52446043 cGridBag ctrlPanel;
52456044
....@@ -5251,6 +6050,7 @@
52516050 boolean materialFlushed;
52526051 Object3D latestObject;
52536052
6053
+ cGridBag transformPanel;
52546054 cGridBag XYZPanel;
52556055
52566056 JSplitPane gridPanel;
....@@ -5313,7 +6113,7 @@
53136113 JLabel colorLabel;
53146114 cNumberSlider colorField;
53156115 JLabel modulationLabel;
5316
- cNumberSlider modulationField;
6116
+ cNumberSlider saturationField;
53176117 JLabel metalnessLabel;
53186118 cNumberSlider metalnessField;
53196119 JLabel diffuseLabel;
....@@ -5344,6 +6144,7 @@
53446144 cNumberSlider anisoField;
53456145 JLabel anisoVLabel;
53466146 cNumberSlider anisoVField;
6147
+
53476148 JLabel cameraLabel;
53486149 cNumberSlider cameraField;
53496150 JLabel selfshadowLabel;
....@@ -5358,6 +6159,7 @@
53586159 cNumberSlider fakedepthField;
53596160 JLabel shadowbiasLabel;
53606161 cNumberSlider shadowbiasField;
6162
+
53616163 JLabel bumpLabel;
53626164 cNumberSlider bumpField;
53636165 JLabel noiseLabel;