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,64 +42,122 @@
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 {
47
- try
48
- {
49
- ImageIcon icon = GetIcon(name);
85
+ ImageIcon icon = GetIcon(name);
86
+ if (icon != null || name.contains("/"))
5087 return new cButton(icon, border);
51
- }
52
- catch (Exception e)
53
- {
88
+ else
5489 return new cButton(name, border);
55
- }
90
+ }
91
+
92
+ cLabel GetLabel(String name, boolean border)
93
+ {
94
+ //ImageIcon icon = GetIcon(name);
95
+ return new cLabel(GetImage(name), border);
5696 }
5797
5898 cToggleButton GetToggleButton(String name, boolean border)
5999 {
60
- try
61
- {
62
- ImageIcon icon = GetIcon(name);
63
- return new cToggleButton(icon, border);
64
- }
65
- catch (Exception e)
66
- {
67
- return new cToggleButton(name, border);
68
- }
100
+ ImageIcon icon = GetIcon(name);
101
+ return new cToggleButton(icon, border);
69102 }
70103
71104 cCheckBox GetCheckBox(String name, boolean border)
72105 {
106
+ ImageIcon icon = GetIcon(name);
107
+ return new cCheckBox(icon, border);
108
+ }
109
+
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
+
73120 try
74121 {
75
- ImageIcon icon = GetIcon(name);
76
- return new cCheckBox(icon, border);
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;
77141 }
78142 catch (Exception e)
79143 {
80
- return new cCheckBox(name, border);
144
+ //icons.put(name, null);
145
+ return null;
81146 }
82147 }
83
-
84
- private ImageIcon GetIcon(String name) throws IOException
148
+
149
+ BufferedImage GetImage(String name)
85150 {
86
- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87
-
88
- if (image.getWidth() != 24 && image.getHeight() != 24)
151
+ try
89152 {
90
- BufferedImage resized = new BufferedImage(24, 24, image.getType());
91
- Graphics2D g = resized.createGraphics();
92
- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93
- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94
- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95
- g.dispose();
96
-
97
- image = resized;
153
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
154
+
155
+ return image;
98156 }
99
-
100
- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101
- return icon;
157
+ catch (Exception e)
158
+ {
159
+ return null;
160
+ }
102161 }
103162
104163 // SCRIPT
....@@ -282,11 +341,13 @@
282341 client = inClient;
283342 copy = client;
284343
285
- if (copy.versions == null)
286
- {
287
- copy.versions = new byte[100][];
288
- copy.versionindex = -1;
289
- }
344
+// if (copy.versionlist == null)
345
+// {
346
+// copy.versionlist = new Object3D[100];
347
+// copy.versionindex = -1;
348
+//
349
+// callee.Save(true);
350
+// }
290351
291352 // "this" is not called: SetupUI2(objEditor);
292353 }
....@@ -301,10 +362,12 @@
301362 client = inClient;
302363 copy = client;
303364
304
- if (copy.versions == null)
365
+ if (copy.versionlist == null)
305366 {
306
- copy.versions = new byte[100][];
367
+ copy.versionlist = new Object3D[100];
307368 copy.versionindex = -1;
369
+
370
+// Save(true);
308371 }
309372
310373 SetupUI2(callee.GetEditor());
....@@ -328,7 +391,8 @@
328391 //parent = p;
329392
330393 GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
331
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
394
+ if (Globals.DEBUG)
395
+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
332396 //gd.setFullScreenWindow(this);
333397 //setResizable(false);
334398 //if (!isDisplayable())
....@@ -339,11 +403,13 @@
339403 copy = localCopy;
340404 copy.editWindow = this;
341405
342
- if (copy.versions == null)
343
- {
344
- copy.versions = new byte[100][];
345
- copy.versionindex = -1;
346
- }
406
+// if (copy.versionlist == null)
407
+// {
408
+// copy.versionlist = new Object3D[100];
409
+// copy.versionindex = -1;
410
+//
411
+// Save(true);
412
+// }
347413
348414 SetupMenu();
349415
....@@ -363,6 +429,9 @@
363429
364430 static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
365431
432
+ // This is to refresh the UI of the material panel.
433
+ boolean patchMaterial;
434
+
366435 void SetupMenu()
367436 {
368437 frame.setMenuBar(menuBar = new MenuBar());
....@@ -412,6 +481,8 @@
412481
413482 ChangeListener changeListener = new ChangeListener()
414483 {
484
+ //String name;
485
+
415486 public void stateChanged(ChangeEvent changeEvent)
416487 {
417488 // if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -430,18 +501,49 @@
430501 // EditSelection(false);
431502 // }
432503
433
- 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();
434535 }
435536 };
436537 objectPanel.addChangeListener(changeListener);
437538
438539 toolbarPanel = new JPanel();
439540 toolbarPanel.setName("Toolbar");
541
+
440542 treePanel = new cGridBag();
441543 treePanel.setName("Tree");
442544
443545 editPanel = new cGridBag().setVertical(true);
444
- editPanel.setName("Edit");
546
+ //editPanel.setName("Edit");
445547
446548 ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
447549
....@@ -449,11 +551,13 @@
449551 editPanel.add(editCommandsPanel);
450552 editPanel.add(ctrlPanel);
451553
452
- toolboxPanel = new cGridBag().setVertical(false);
453
- toolboxPanel.setName("Toolbox");
554
+ toolboxPanel = new cGridBag().setVertical(true);
555
+ //toolboxPanel.setName("Toolbox");
454556
455
- materialPanel = new cGridBag().setVertical(true);
456
- materialPanel.setName("Material");
557
+ skyboxPanel = new cGridBag().setVertical(true);
558
+
559
+ materialPanel = new cGridBag().setVertical(false);
560
+ //materialPanel.setName("Material");
457561
458562 /*JTextPane*/
459563 infoarea = createTextPane();
....@@ -461,6 +565,7 @@
461565
462566 infoarea.setEditable(true);
463567 SetText();
568
+
464569 // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
465570 // infoarea.setOpaque(false);
466571 // //infoarea.setForeground(textcolor);
....@@ -468,7 +573,7 @@
468573 // TEXTAREA infoarea.setWrapStyleWord(true);
469574 infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
470575 infoPanel.setPreferredSize(new Dimension(1, 1));
471
- infoPanel.setName("Info");
576
+ //infoPanel.setName("Info");
472577 //infoPanel.setLayout(new BorderLayout());
473578 //infoPanel.add(createTextPane());
474579
....@@ -735,6 +840,7 @@
735840 boolean maximized;
736841
737842 cButton fullscreenLayout;
843
+ cButton expandedLayout;
738844
739845 void Minimize()
740846 {
....@@ -774,10 +880,12 @@
774880 cButton minButton;
775881 cButton maxButton;
776882 cButton fullButton;
883
+ cButton collapseButton;
884
+ cButton maximize3DButton;
777885
778886 void ToggleFullScreen()
779887 {
780
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
888
+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
781889
782890 cameraView.ToggleFullScreen();
783891
....@@ -798,13 +906,13 @@
798906 // X frame.getContentPane().remove(/*"Center",*/bigThree);
799907 // X framePanel.add(bigThree);
800908 // X frame.getContentPane().add(/*"Center",*/framePanel);
801
- framePanel.setDividerLocation(46);
909
+// framePanel.setDividerLocation(46); // icons are 24x24
802910
803911 //frame.setVisible(true);
804
- radio.layout = keepButton;
912
+// radio.layout = keepButton;
805913 //theFrame = null;
806914 keepButton = null;
807
- radio.layout.doClick();
915
+// radio.layout.doClick();
808916
809917 } else
810918 {
....@@ -825,31 +933,53 @@
825933 // X frame.getContentPane().remove(/*"Center",*/framePanel);
826934 // X framePanel.remove(bigThree);
827935 // X frame.getContentPane().add(/*"Center",*/bigThree);
828
- framePanel.setDividerLocation(0);
936
+// framePanel.setDividerLocation(0);
829937
830
- radio.layout = fullscreenLayout;
831
- radio.layout.doClick();
938
+// radio.layout = fullscreenLayout;
939
+// radio.layout.doClick();
832940 //frame.setVisible(true);
833941 }
834942 frame.validate();
943
+
944
+ cameraView.requestFocusInWindow();
835945 }
836946
837
- 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)
838956 {
839957 boolean temp = CameraPane.SWITCH;
840958 CameraPane.SWITCH = false;
841959
842
- 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);
843964 // if (copy == client)
844965
845
- byte[] versions[] = copy.versions;
846
- 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;
847970
848
- byte[] compress = Compress(copy);
971
+ Object3D parent = object.parent;
972
+ object.parent = null;
849973
850
- copy.versions = versions;
974
+ //byte[] compress = Compress(copy);
975
+ Object3D compress = (Object3D)Grafreed.clone(object);
851976
852
- 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);
853983
854984 CameraPane.SWITCH = temp;
855985
....@@ -977,6 +1107,7 @@
9771107 {
9781108 SetupMaterial(materialPanel);
9791109 }
1110
+
9801111 //SetupName();
9811112 //SetupViews();
9821113 }
....@@ -986,7 +1117,7 @@
9861117 // NumberSlider vDivsField;
9871118 // JCheckBox endcaps;
9881119 JCheckBox liveCB;
989
- JCheckBox selectCB;
1120
+ JCheckBox selectableCB;
9901121 JCheckBox hideCB;
9911122 JCheckBox link2masterCB;
9921123 JCheckBox markCB;
....@@ -1185,6 +1316,18 @@
11851316
11861317 namePanel = new cGridBag();
11871318
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
+
11881331 nameField = AddText(namePanel, copy.GetName());
11891332 namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
11901333 oe.ctrlPanel.add(namePanel);
....@@ -1198,13 +1341,16 @@
11981341
11991342 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12001343 liveCB.setToolTipText("Animate object");
1201
- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1202
- selectCB.setToolTipText("Make object selectable");
1344
+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1345
+ markCB.setToolTipText("Set target transform");
1346
+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1347
+ selectableCB.setToolTipText("Make object selectable");
12031348 // Return();
1349
+
12041350 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12051351 hideCB.setToolTipText("Hide object");
1206
- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1207
- markCB.setToolTipText("As animation target transform");
1352
+
1353
+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12081354
12091355 setupPanel2 = new cGridBag().setVertical(false);
12101356
....@@ -1404,6 +1550,7 @@
14041550
14051551 if (cam == null || !(copy.get(0) instanceof cGroup))
14061552 {
1553
+ if (Globals.DEBUG)
14071554 System.out.println("CREATE CAMERAS");
14081555 cams = new cTemplate();
14091556 cams.name = "Cameras";
....@@ -1485,6 +1632,45 @@
14851632 //frontView.object = copy;
14861633 //sideView.object = copy;
14871634
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
+
14881674 XYZPanel = new cGridBag().setVertical(true);
14891675 //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
14901676
....@@ -1492,7 +1678,11 @@
14921678 XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
14931679 XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
14941680 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1681
+ //XYZPanel.setName("XYZ");
14951682
1683
+ transformPanel.add(resetTransformPanel);
1684
+ transformPanel.add(XYZPanel);
1685
+
14961686 /*
14971687 gridPanel = new JPanel(); //new BorderLayout());
14981688 gridPanel.setLayout(new GridLayout(1, 2));
....@@ -1500,12 +1690,12 @@
15001690 gridPanel.add(cameraView);
15011691 gridPanel.add(XYZPanel);
15021692 */
1503
- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1504
- gridPanel.setContinuousLayout(true);
1505
- gridPanel.setOneTouchExpandable(true);
1506
- gridPanel.setDividerLocation(1.0);
1507
- gridPanel.setDividerSize(9);
1508
- 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);
15091699
15101700 // aConstraints.weighty = 0;
15111701 //System.out.println("THIS = " + this);
....@@ -1528,18 +1718,34 @@
15281718
15291719 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15301720 //tmp.setName("Edit");
1721
+ objectPanel.add(toolboxPanel);
1722
+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1723
+ objectPanel.setToolTipTextAt(0, "Objects & textures");
1724
+
15311725 objectPanel.add(materialPanel);
1726
+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1727
+ objectPanel.setToolTipTextAt(1, "Material");
1728
+
1729
+ objectPanel.add(skyboxPanel);
1730
+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1731
+ objectPanel.setToolTipTextAt(2, "Backgrounds");
1732
+
15321733 // JPanel north = new JPanel(new BorderLayout());
15331734 // north.setName("Edit");
15341735 // north.add(ctrlPanel, BorderLayout.NORTH);
15351736 // objectPanel.add(north);
15361737 objectPanel.add(editPanel);
1738
+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1739
+ objectPanel.setToolTipTextAt(3, "Edit controls");
15371740
1538
- //if (Globals.ADVANCED)
1539
- objectPanel.add(infoPanel);
1741
+ objectPanel.add(transformPanel);
1742
+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1743
+ objectPanel.setToolTipTextAt(4, "TRS transform");
15401744
1541
- objectPanel.add(toolboxPanel);
1542
-
1745
+ patchMaterial = true;
1746
+ cameraView.patchMaterial = this;
1747
+ objectPanel.setSelectedIndex(1);
1748
+
15431749 /*
15441750 aConstraints.gridx = 0;
15451751 aConstraints.gridwidth = 1;
....@@ -1570,11 +1776,51 @@
15701776
15711777 AddOptions(optionsPanel); //, aConstraints);
15721778
1573
- tabbedPane.add(optionsPanel);
1574
-
15751779 tabbedPane.add(FSPane = new cFileSystemPane(this));
15761780
1781
+ tabbedPane.add(optionsPanel);
1782
+
15771783 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
+ }
15781824
15791825 /*
15801826 cTree jTree = new cTree(null);
....@@ -1596,13 +1842,13 @@
15961842 jtp.add(tree);
15971843 */
15981844
1599
- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1600
- bigPanel.setContinuousLayout(true);
1601
- bigPanel.setOneTouchExpandable(true);
1602
- bigPanel.setDividerLocation(0.8);
1603
- bigPanel.setDividerSize(15);
1604
- bigPanel.setResizeWeight(0.15);
1605
- 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");
16061852
16071853 //bigPanel.setLayout(new BorderLayout());
16081854 //bigPanel.setSize(new Dimension(10,10));
....@@ -1637,7 +1883,7 @@
16371883 bigThree = new cGridBag();
16381884 bigThree.addComponent(scenePanel);
16391885 bigThree.addComponent(centralPanel);
1640
- bigThree.addComponent(XYZPanel);
1886
+ //bigThree.addComponent(XYZPanel);
16411887
16421888 // // SIDE EFFECT!!!
16431889 // aConstraints.gridx = 0;
....@@ -1646,6 +1892,23 @@
16461892 // aConstraints.gridheight = 1;
16471893
16481894 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
+
16491912 framePanel.setContinuousLayout(false);
16501913 framePanel.setOneTouchExpandable(false);
16511914 //.setDividerLocation(0.8);
....@@ -1655,7 +1918,7 @@
16551918
16561919 frame.getContentPane().setLayout(new BorderLayout());
16571920 /**/
1658
- JTabbedPane worldPane = new JTabbedPane();
1921
+ //JTabbedPane worldPane = new JTabbedPane();
16591922 //worldPane.add(bigPanel);
16601923 //worldPane.add(worldPanel);
16611924 /**/
....@@ -1669,7 +1932,7 @@
16691932
16701933 cameraView.requestFocusInWindow();
16711934
1672
- gridPanel.setDividerLocation(1.0);
1935
+// gridPanel.setDividerLocation(1.0);
16731936
16741937 frame.validate();
16751938
....@@ -1678,7 +1941,6 @@
16781941 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16791942 frame.addWindowListener(new WindowAdapter()
16801943 {
1681
-
16821944 public void windowClosing(WindowEvent e)
16831945 {
16841946 Close();
....@@ -1701,28 +1963,442 @@
17011963 ctrlPanel.removeAll();
17021964 }
17031965
1704
- void SetupMaterial(cGridBag panel)
1966
+ void SetupMaterial(cGridBag materialpanel)
17051967 {
1706
- /*
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
+ /*
17072383 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
17082384 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1709
- */
2385
+ */
17102386
17112387 cGridBag editBar = new cGridBag().setVertical(false);
17122388
1713
- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
2389
+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
17142390 createMaterialButton.setToolTipText("Create material");
17152391
17162392 /*
17172393 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
17182394 */
17192395
1720
- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
2396
+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
17212397 clearMaterialButton.setToolTipText("Clear material");
17222398
17232399 if (Globals.ADVANCED)
17242400 {
1725
- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
2401
+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
17262402 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
17272403 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
17282404 }
....@@ -1740,27 +2416,61 @@
17402416 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17412417
17422418 cGridBag colorSection = new cGridBag().setVertical(true);
2419
+
2420
+ cGridBag huepanel = new cGridBag();
2421
+ cGridBag huelabel = new cGridBag();
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);
2436
+ huelabel.preferredWidth = 20;
2437
+ huepanel.add(new cGridBag()); // Label
2438
+ huepanel.add(huelabel); // Field/slider
2439
+
2440
+ huepanel.preferredHeight = 7;
2441
+
2442
+ colorSection.add(huepanel);
17432443
17442444 cGridBag color = new cGridBag();
1745
- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1746
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1747
- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2445
+
2446
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
2447
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2448
+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2449
+
17482450 //colorField.preferredWidth = 200;
17492451 colorSection.add(color);
17502452
17512453 cGridBag modulation = new cGridBag();
17522454 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
17532455 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1754
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2456
+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
17552457 colorSection.add(modulation);
17562458
2459
+ cGridBag opacity = new cGridBag();
2460
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
2461
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2462
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2463
+ colorSection.add(opacity);
2464
+
2465
+ colorSection.add(GetSeparator());
2466
+
17572467 cGridBag texture = new cGridBag();
17582468 texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
17592469 textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17602470 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
17612471 colorSection.add(texture);
17622472
1763
- panel.add(new JSeparator());
2473
+ panel.add(GetSeparator());
17642474
17652475 panel.add(colorSection);
17662476
....@@ -1816,7 +2526,7 @@
18162526 shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
18172527 diffuseSection.add(shadowbias);
18182528
1819
- panel.add(new JSeparator());
2529
+ panel.add(GetSeparator());
18202530
18212531 panel.add(diffuseSection);
18222532
....@@ -1879,7 +2589,7 @@
18792589 specularSection.add(anisoV);
18802590
18812591
1882
- panel.add(new JSeparator());
2592
+ panel.add(GetSeparator());
18832593
18842594 panel.add(specularSection);
18852595
....@@ -1904,12 +2614,6 @@
19042614 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
19052615 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
19062616 colorSection.add(backlit);
1907
-
1908
- cGridBag opacity = new cGridBag();
1909
- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1910
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1911
- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1912
- colorSection.add(opacity);
19132617
19142618 //panel.add(new JSeparator());
19152619
....@@ -1955,7 +2659,7 @@
19552659 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
19562660 textureSection.add(opacityPower);
19572661
1958
- panel.add(new JSeparator());
2662
+ panel.add(GetSeparator());
19592663
19602664 panel.add(textureSection);
19612665
....@@ -2942,7 +3646,7 @@
29423646
29433647 freezematerial = true;
29443648 colorField.setFloat(mat.color);
2945
- modulationField.setFloat(mat.modulation);
3649
+ saturationField.setFloat(mat.modulation);
29463650 metalnessField.setFloat(mat.metalness);
29473651 diffuseField.setFloat(mat.diffuse);
29483652 specularField.setFloat(mat.specular);
....@@ -3004,32 +3708,8 @@
30043708
30053709 if (multiplyToggle != null)
30063710 multiplyToggle.setSelected(mat.multiply);
3007
-
3008
- assert (object.projectedVertices != null);
3009
-
3010
- if (object.projectedVertices.length <= 2)
3011
- {
3012
- // Side effect...
3013
- Object3D.cVector2[] keep = object.projectedVertices;
3014
- object.projectedVertices = new Object3D.cVector2[3];
3015
- for (int i = 0; i < 3; i++)
3016
- {
3017
- if (i < keep.length)
3018
- {
3019
- object.projectedVertices[i] = keep[i];
3020
- } else
3021
- {
3022
- object.projectedVertices[i] = new Object3D.cVector2();
3023
- }
3024
- /*
3025
- if(keep.length == 0)
3026
- object.projectedVertices[0] = new Object3D.cVector2();
3027
- else
3028
- object.projectedVertices[0] = keep[0];
3029
- object.projectedVertices[1] = new Object3D.cVector2();
3030
- */
3031
- }
3032
- }
3711
+
3712
+ AllocProjectedVertices(object);
30333713
30343714 SetMaterial(mat, object.projectedVertices);
30353715 }
....@@ -3149,6 +3829,17 @@
31493829 public void itemStateChanged(ItemEvent event)
31503830 {
31513831 // 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
31523843 if (event.getSource() == propagateToggle)
31533844 {
31543845 propagate ^= true;
....@@ -3253,8 +3944,9 @@
32533944 } else if (event.getSource() == liveCB)
32543945 {
32553946 copy.live ^= true;
3947
+ objEditor.refreshContents(true); // To show item colors
32563948 return;
3257
- } else if (event.getSource() == selectCB)
3949
+ } else if (event.getSource() == selectableCB)
32583950 {
32593951 copy.dontselect ^= true;
32603952 return;
....@@ -3262,7 +3954,7 @@
32623954 {
32633955 copy.hide ^= true;
32643956 copy.Touch(); // display list issue
3265
- objEditor.refreshContents();
3957
+ objEditor.refreshContents(true); // To show item colors
32663958 return;
32673959 } else if (event.getSource() == link2masterCB)
32683960 {
....@@ -3327,7 +4019,7 @@
33274019 //System.out.println("ObjEditor " + event);
33284020 applySelf0(true);
33294021 //parent.applySelf();
3330
- objEditor.refreshContents();
4022
+ // conflicts with requestFocus objEditor.refreshContents();
33314023 } else if (source == resetButton)
33324024 {
33334025 CameraPane.fullreset = true;
....@@ -3507,17 +4199,21 @@
35074199
35084200 void New()
35094201 {
3510
- while (copy.Size() > 1)
4202
+ while (copy.Size() > 0)
35114203 {
3512
- copy.remove(1);
4204
+ copy.remove(0);
35134205 }
35144206
4207
+ copy.selection.clear();
4208
+
35154209 ResetModel();
4210
+ SetupViews();
35164211 objEditor.refreshContents();
35174212 }
35184213
35194214 static public byte[] Compress(Object3D o)
35204215 {
4216
+ // Slower to actually compress.
35214217 try
35224218 {
35234219 ByteArrayOutputStream baos = new ByteArrayOutputStream();
....@@ -3619,6 +4315,7 @@
36194315 {
36204316 //Save(true);
36214317 Replace();
4318
+ SetVersionStates();
36224319 }
36234320
36244321 private boolean Equal(byte[] compress, byte[] name)
....@@ -3637,31 +4334,50 @@
36374334 return true;
36384335 }
36394336
3640
- 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
+ }
36414352
36424353 public boolean Save(boolean user)
36434354 {
36444355 System.err.println("Save");
4356
+ Replace();
36454357
3646
- cRadio tab = GetCurrentTab();
4358
+ //cRadio tab = GetCurrentTab();
36474359
3648
- byte[] compress = CompressCopy();
4360
+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
36494361
36504362 boolean thesame = false;
36514363
3652
- // Quick heuristic using length. Works only when stream is compressed.
3653
- if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3654
- {
3655
- thesame = true;
3656
- }
4364
+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
4365
+// {
4366
+// thesame = true;
4367
+// }
36574368
36584369 //EditorFrame.m_MainFrame.requestFocusInWindow();
36594370 if (!thesame)
36604371 {
4372
+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
4373
+ {
4374
+ copy.versionlist[i] = copy.versionlist[i-1];
4375
+ }
4376
+
36614377 //tab.user[tab.versionindex] = user;
36624378 //boolean increment = true; // tab.graphs[tab.versionindex] == null;
36634379
3664
- copy.versions[++copy.versionindex] = compress;
4380
+ copy.versionlist[++copy.versionindex] = compress;
36654381
36664382 // if (increment)
36674383 // tab.versionindex++;
....@@ -3671,13 +4387,13 @@
36714387
36724388 //assert(hashtable.isEmpty());
36734389
3674
- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3675
- {
3676
- //tab.user[i] = false;
3677
- copy.versions[i] = null;
3678
- }
4390
+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
4391
+// {
4392
+// //tab.user[i] = false;
4393
+// copy.versionlist[i] = null;
4394
+// }
36794395
3680
- SetUndoStates();
4396
+ SetVersionStates();
36814397
36824398 // test save
36834399 if (false)
....@@ -3700,27 +4416,65 @@
37004416
37014417 return !thesame;
37024418 }
3703
-
3704
- void CopyChanged(Object3D obj)
4419
+
4420
+ boolean flashIt = true;
4421
+
4422
+ void RefreshSelection()
37054423 {
3706
- 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();
37074457
37084458 boolean temp = CameraPane.SWITCH;
37094459 CameraPane.SWITCH = false;
37104460
3711
- copy.ExtractBigData(versiontable);
4461
+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
37124462
37134463 copy.clear();
37144464
4465
+ copy.skyboxname = obj.skyboxname;
4466
+ copy.skyboxext = obj.skyboxext;
4467
+
37154468 for (int i=0; i<obj.Size(); i++)
37164469 {
37174470 copy.add(obj.get(i));
37184471 }
37194472
3720
- copy.RestoreBigData(versiontable);
4473
+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
37214474
37224475 CameraPane.SWITCH = temp;
37234476
4477
+ RefreshSelection();
37244478 //assert(hashtable.isEmpty());
37254479
37264480 copy.Touch();
....@@ -3741,13 +4495,15 @@
37414495 }
37424496 }
37434497
3744
- refreshContents();
4498
+ refreshContents(true);
37454499 }
37464500
3747
- cButton undoButton;
4501
+ cButton previousVersionButton;
37484502 cButton restoreButton;
37494503 cButton replaceButton;
3750
- cButton redoButton;
4504
+ cButton nextVersionButton;
4505
+ cButton saveVersionButton;
4506
+ cButton deleteVersionButton;
37514507
37524508 boolean muteSlider;
37534509
....@@ -3755,39 +4511,64 @@
37554511 {
37564512 int count = 0;
37574513
3758
- for (int i = copy.versions.length; --i >= 0;)
4514
+ for (int i = copy.versionlist.length; --i >= 0;)
37594515 {
3760
- if (copy.versions[i] != null)
4516
+ if (copy.versionlist[i] != null)
37614517 count++;
37624518 }
37634519
37644520 return count;
37654521 }
37664522
3767
- void SetUndoStates()
4523
+ public cGridBag versionSliderPane;
4524
+
4525
+ void SetVersionStates()
37684526 {
3769
- cRadio tab = GetCurrentTab();
4527
+ //if (true)
4528
+ // return;
4529
+
4530
+ //cRadio tab = GetCurrentTab();
37704531
3771
- restoreButton.setEnabled(copy.versionindex != -1);
3772
- replaceButton.setEnabled(copy.versionindex != -1);
3773
-
3774
- undoButton.setEnabled(copy.versionindex > 0);
3775
- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3776
-
3777
- muteSlider = true;
3778
- versionSlider.setMaximum(VersionCount() - 1);
3779
- versionSlider.setInteger(copy.versionindex);
3780
- 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
+ }
37814562 }
37824563
3783
- public boolean Undo()
4564
+ public boolean PreviousVersion()
37844565 {
37854566 // Option?
37864567 Replace();
37874568
37884569 System.err.println("Undo");
37894570
3790
- cRadio tab = GetCurrentTab();
4571
+ //cRadio tab = GetCurrentTab();
37914572
37924573 if (copy.versionindex == 0)
37934574 {
....@@ -3810,7 +4591,7 @@
38104591
38114592 copy.versionindex -= 1;
38124593
3813
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4594
+ CopyChanged();
38144595
38154596 return true;
38164597 }
....@@ -3819,44 +4600,45 @@
38194600 {
38204601 System.err.println("Restore");
38214602
3822
- cRadio tab = GetCurrentTab();
4603
+ //cRadio tab = GetCurrentTab();
38234604
3824
- if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
4605
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
38254606 {
38264607 java.awt.Toolkit.getDefaultToolkit().beep();
38274608 return false;
38284609 }
38294610
3830
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4611
+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4612
+ CopyChanged();
38314613
38324614 return true;
38334615 }
38344616
38354617 public boolean Replace()
38364618 {
3837
- System.err.println("Replace");
4619
+ //System.err.println("Replace");
38384620
3839
- cRadio tab = GetCurrentTab();
4621
+ //cRadio tab = GetCurrentTab();
38404622
3841
- if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
4623
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
38424624 {
38434625 // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
38444626 return false;
38454627 }
38464628
3847
- copy.versions[copy.versionindex] = CompressCopy();
4629
+ copy.versionlist[copy.versionindex] = Duplicate(copy);
38484630
38494631 return true;
38504632 }
38514633
3852
- public void Redo()
4634
+ public void NextVersion()
38534635 {
38544636 // Option?
38554637 Replace();
38564638
3857
- cRadio tab = GetCurrentTab();
4639
+ //cRadio tab = GetCurrentTab();
38584640
3859
- if (copy.versions[copy.versionindex + 1] == null)
4641
+ if (copy.versionlist[copy.versionindex + 1] == null)
38604642 {
38614643 java.awt.Toolkit.getDefaultToolkit().beep();
38624644 return;
....@@ -3864,7 +4646,7 @@
38644646
38654647 copy.versionindex += 1;
38664648
3867
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4649
+ CopyChanged();
38684650
38694651 //if (!tab.user[tab.versionindex])
38704652 // tab.graphs[tab.versionindex] = null;
....@@ -4061,6 +4843,12 @@
40614843 // else
40624844 // applySelf(true);
40634845 // }
4846
+
4847
+ boolean Equal(double a, double b)
4848
+ {
4849
+ return Math.abs(a - b) < 0.001;
4850
+ }
4851
+
40644852 void applySelf0(boolean name)
40654853 {
40664854 if (name)
....@@ -4078,7 +4866,7 @@
40784866 //copy.material = new cMaterial(copy.GetMaterial());
40794867
40804868 current.color = (float) colorField.getFloat();
4081
- current.modulation = (float) modulationField.getFloat();
4869
+ current.modulation = (float) saturationField.getFloat();
40824870 current.metalness = (float) metalnessField.getFloat();
40834871 current.diffuse = (float) diffuseField.getFloat();
40844872 current.specular = (float) specularField.getFloat();
....@@ -4110,29 +4898,52 @@
41104898 {
41114899 cMaterial mat = copy.material;
41124900
4113
- colorField.SetToolTipValue((mat.color));
4114
- modulationField.SetToolTipValue((mat.modulation));
4115
- metalnessField.SetToolTipValue((mat.metalness));
4116
- diffuseField.SetToolTipValue((mat.diffuse));
4117
- specularField.SetToolTipValue((mat.specular));
4118
- shininessField.SetToolTipValue((mat.shininess));
4119
- shiftField.SetToolTipValue((mat.shift));
4120
- ambientField.SetToolTipValue((mat.ambient));
4121
- lightareaField.SetToolTipValue((mat.lightarea));
4122
- diffusenessField.SetToolTipValue((mat.factor));
4123
- velvetField.SetToolTipValue((mat.velvet));
4124
- sheenField.SetToolTipValue((mat.sheen));
4125
- subsurfaceField.SetToolTipValue((mat.subsurface));
4126
- backlitField.SetToolTipValue((mat.bump));
4127
- anisoField.SetToolTipValue((mat.aniso));
4128
- anisoVField.SetToolTipValue((mat.anisoV));
4129
- cameraField.SetToolTipValue((mat.cameralight));
4130
- selfshadowField.SetToolTipValue((mat.diffuseness));
4131
- shadowField.SetToolTipValue((mat.shadow));
4132
- textureField.SetToolTipValue((mat.texture));
4133
- opacityField.SetToolTipValue((mat.opacity));
4134
- fakedepthField.SetToolTipValue((mat.fakedepth));
4135
- 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));
41364947 }
41374948
41384949 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
....@@ -4167,17 +4978,20 @@
41674978
41684979 public void stateChanged(ChangeEvent e)
41694980 {
4170
- // assert(false);
4981
+ // assert(false);
41714982 if (e.getSource() == versionSlider)
41724983 {
41734984 if (muteSlider)
41744985 return;
41754986
4987
+ Replace();
4988
+
41764989 int version = versionSlider.getInteger();
41774990
4178
- if (copy.versions[version] != null)
4991
+ if (version != -1 && copy.versionlist[version] != null)
41794992 {
4180
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
4993
+ copy.versionindex = version;
4994
+ CopyChanged();
41814995 }
41824996
41834997 return;
....@@ -4217,6 +5031,12 @@
42175031 {
42185032 //System.out.println("stateChanged = " + this);
42195033 materialtouched = true;
5034
+
5035
+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
5036
+ {
5037
+ saturationField.setFloat(1);
5038
+ }
5039
+
42205040 applySelf();
42215041 //System.out.println("this = " + this);
42225042 //System.out.println("PARENT = " + parent);
....@@ -4516,6 +5336,7 @@
45165336 {
45175337 if (GetTree() != null)
45185338 {
5339
+ GetTree().revalidate();
45195340 GetTree().repaint();
45205341 }
45215342
....@@ -4524,6 +5345,11 @@
45245345 ctrlPanel.validate(); // ? new
45255346 ctrlPanel.repaint();
45265347 }
5348
+
5349
+ if (previousVersionButton != null && copy.versionlist != null)
5350
+ SetVersionStates();
5351
+
5352
+ cameraView.requestFocusInWindow();
45275353 }
45285354
45295355 static TweenManager tweenManager = new TweenManager();
....@@ -4555,7 +5381,7 @@
45555381 // group = (Composite) group.get(0);
45565382 // }
45575383
4558
- System.out.println("makeSomething of " + thing);
5384
+ //System.out.println("makeSomething of " + thing);
45595385
45605386 /*
45615387 if (deselect && jList != null)
....@@ -4772,7 +5598,9 @@
47725598 readobj.ResetDisplayList();
47735599 } catch (Exception e)
47745600 {
4775
- //e.printStackTrace();
5601
+ if (!e.toString().contains("GZIP"))
5602
+ e.printStackTrace();
5603
+
47765604 try
47775605 {
47785606 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4852,6 +5680,8 @@
48525680 {
48535681 //readobj.deepCopySelf(copy);
48545682 copy.clear(); // june 2014
5683
+ copy.skyboxname = readobj.skyboxname;
5684
+ copy.skyboxext = readobj.skyboxext;
48555685 for (int i = 0; i < readobj.size(); i++)
48565686 {
48575687 Object3D child = readobj.get(i); // reserve(i);
....@@ -4892,6 +5722,7 @@
48925722 }
48935723 } catch (ClassCastException e)
48945724 {
5725
+ e.printStackTrace();
48955726 assert (false);
48965727 Composite c = (Composite) copy;
48975728 c.children.clear();
....@@ -4902,13 +5733,17 @@
49025733 c.addChild(csg);
49035734 }
49045735
4905
- copy.versions = readobj.versions;
5736
+ copy.versionlist = readobj.versionlist;
49065737 copy.versionindex = readobj.versionindex;
5738
+ copy.versiontable = readobj.versiontable;
49075739
4908
- if (copy.versions == null)
5740
+ if (copy.versionlist == null)
49095741 {
4910
- copy.versions = new byte[100][];
5742
+ // Backward compatibility
5743
+ copy.versionlist = new Object3D[100];
49115744 copy.versionindex = -1;
5745
+
5746
+ //Save(true);
49125747 }
49135748
49145749 //? SetUndoStates();
....@@ -4923,7 +5758,7 @@
49235758 {
49245759 if (Grafreed.standAlone)
49255760 {
4926
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5761
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
49275762 browser.show();
49285763 String filename = browser.getFile();
49295764 if (filename != null && filename.length() > 0)
....@@ -5000,6 +5835,8 @@
50005835
50015836 void save()
50025837 {
5838
+ Replace();
5839
+
50035840 if (lastname == null)
50045841 {
50055842 return;
....@@ -5022,6 +5859,7 @@
50225859 //ps.print(buffer.toString());
50235860 } catch (IOException e)
50245861 {
5862
+ e.printStackTrace();
50255863 }
50265864 }
50275865
....@@ -5241,6 +6079,7 @@
52416079 ButtonGroup buttonGroup;
52426080
52436081 cGridBag toolboxPanel;
6082
+ cGridBag skyboxPanel;
52446083 cGridBag materialPanel;
52456084 cGridBag ctrlPanel;
52466085
....@@ -5252,6 +6091,7 @@
52526091 boolean materialFlushed;
52536092 Object3D latestObject;
52546093
6094
+ cGridBag transformPanel;
52556095 cGridBag XYZPanel;
52566096
52576097 JSplitPane gridPanel;
....@@ -5314,7 +6154,7 @@
53146154 JLabel colorLabel;
53156155 cNumberSlider colorField;
53166156 JLabel modulationLabel;
5317
- cNumberSlider modulationField;
6157
+ cNumberSlider saturationField;
53186158 JLabel metalnessLabel;
53196159 cNumberSlider metalnessField;
53206160 JLabel diffuseLabel;
....@@ -5345,6 +6185,7 @@
53456185 cNumberSlider anisoField;
53466186 JLabel anisoVLabel;
53476187 cNumberSlider anisoVField;
6188
+
53486189 JLabel cameraLabel;
53496190 cNumberSlider cameraField;
53506191 JLabel selfshadowLabel;
....@@ -5359,6 +6200,7 @@
53596200 cNumberSlider fakedepthField;
53606201 JLabel shadowbiasLabel;
53616202 cNumberSlider shadowbiasField;
6203
+
53626204 JLabel bumpLabel;
53636205 cNumberSlider bumpField;
53646206 JLabel noiseLabel;