Normand Briere
2019-08-26 6266c8a4b2485b29a7d5bcb217460d7aad3e1c4a
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,72 @@
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 Composite CreateCameras()
76
+ {
77
+ Composite cams = new cTemplate();
78
+ cams.name = "Cameras";
79
+ copy.insertElementAt(cams, 0);
80
+
81
+ cams.addChild(new Camera());
82
+ cams.addChild(new Camera(1));
83
+ cams.addChild(new Camera(2));
84
+ cams.addChild(new Camera(3));
85
+ cams.addChild(new Camera(4));
86
+
87
+ return cams;
88
+ }
89
+
90
+ public cGridBag GetSeparator()
91
+ {
92
+ cGridBag separator = new cGridBag();
93
+ separator.add(new JSeparator());
94
+ separator.preferredHeight = 5;
95
+ return separator;
96
+ }
4497
4598 cButton GetButton(String name, boolean border)
4699 {
47100 ImageIcon icon = GetIcon(name);
48
- return new cButton(icon, border);
101
+ if (icon != null || name.contains("/"))
102
+ return new cButton(icon, border);
103
+ else
104
+ return new cButton(name, border);
105
+ }
106
+
107
+ cLabel GetLabel(String name, boolean border)
108
+ {
109
+ //ImageIcon icon = GetIcon(name);
110
+ return new cLabel(GetImage(name), border);
49111 }
50112
51113 cToggleButton GetToggleButton(String name, boolean border)
....@@ -60,12 +122,26 @@
60122 return new cCheckBox(icon, border);
61123 }
62124
63
- ImageIcon GetIcon(String name)
125
+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
126
+
127
+ static ImageIcon GetIcon(String name)
64128 {
129
+ javax.swing.ImageIcon iconCache = icons.get(name);
130
+ if (iconCache != null)
131
+ {
132
+ return iconCache;
133
+ }
134
+
65135 try
66136 {
67
- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
68
-
137
+ BufferedImage image;
138
+
139
+ if (name.endsWith("jpg"))
140
+ // Much faster!
141
+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
142
+ else
143
+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
144
+
69145 // if (image.getWidth() > 48 && image.getHeight() > 48)
70146 // {
71147 // BufferedImage resized = new BufferedImage(48, 48, image.getType());
....@@ -79,7 +155,25 @@
79155 // }
80156
81157 javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
158
+
159
+ icons.put(name, icon);
160
+
82161 return icon;
162
+ }
163
+ catch (Exception e)
164
+ {
165
+ //icons.put(name, null);
166
+ return null;
167
+ }
168
+ }
169
+
170
+ BufferedImage GetImage(String name)
171
+ {
172
+ try
173
+ {
174
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
175
+
176
+ return image;
83177 }
84178 catch (Exception e)
85179 {
....@@ -222,6 +316,8 @@
222316 objEditor.ctrlPanel.remove(setupPanel2);
223317 objEditor.ctrlPanel.remove(objectCommandsPanel);
224318 objEditor.ctrlPanel.remove(pushPanel);
319
+ if (versionPanel != null)
320
+ objEditor.ctrlPanel.remove(versionPanel);
225321 //objEditor.ctrlPanel.remove(fillPanel);
226322
227323 //Remove(normalpushField);
....@@ -268,11 +364,13 @@
268364 client = inClient;
269365 copy = client;
270366
271
- if (copy.versions == null)
272
- {
273
- copy.versions = new byte[100][];
274
- copy.versionindex = -1;
275
- }
367
+// if (copy.versionlist == null)
368
+// {
369
+// copy.versionlist = new Object3D[100];
370
+// copy.versionindex = -1;
371
+//
372
+// callee.Save(true);
373
+// }
276374
277375 // "this" is not called: SetupUI2(objEditor);
278376 }
....@@ -287,12 +385,6 @@
287385 client = inClient;
288386 copy = client;
289387
290
- if (copy.versions == null)
291
- {
292
- copy.versions = new byte[100][];
293
- copy.versionindex = -1;
294
- }
295
-
296388 SetupUI2(callee.GetEditor());
297389 }
298390
....@@ -314,7 +406,8 @@
314406 //parent = p;
315407
316408 GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
317
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
409
+ if (Globals.DEBUG)
410
+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
318411 //gd.setFullScreenWindow(this);
319412 //setResizable(false);
320413 //if (!isDisplayable())
....@@ -325,11 +418,13 @@
325418 copy = localCopy;
326419 copy.editWindow = this;
327420
328
- if (copy.versions == null)
329
- {
330
-// copy.versions = new byte[100][];
421
+// if (copy.versionlist == null)
422
+// {
423
+// copy.versionlist = new Object3D[100];
331424 // copy.versionindex = -1;
332
- }
425
+//
426
+// Save(true);
427
+// }
333428
334429 SetupMenu();
335430
....@@ -349,6 +444,9 @@
349444
350445 static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
351446
447
+ // This is to refresh the UI of the material panel.
448
+ boolean patchMaterial;
449
+
352450 void SetupMenu()
353451 {
354452 frame.setMenuBar(menuBar = new MenuBar());
....@@ -362,8 +460,11 @@
362460 importOBJItem.addActionListener(this);
363461 import3DSItem = menu.add(new MenuItem("3DS file..."));
364462 import3DSItem.addActionListener(this);
463
+ if (Globals.ADVANCED)
464
+ {
365465 importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
366466 importVRMLX3DItem.addActionListener(this);
467
+ }
367468 menu.add("-");
368469 importGFDItem = menu.add(new MenuItem("Grafreed file..."));
369470 importGFDItem.addActionListener(this);
....@@ -398,6 +499,8 @@
398499
399500 ChangeListener changeListener = new ChangeListener()
400501 {
502
+ //String name;
503
+
401504 public void stateChanged(ChangeEvent changeEvent)
402505 {
403506 // if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -416,7 +519,37 @@
416519 // EditSelection(false);
417520 // }
418521
419
- refreshContents(false); // To refresh Info tab
522
+// if (objectPanel.getSelectedIndex() == 4)
523
+// {
524
+// name = copy.skyboxname;
525
+//
526
+// if (name == null)
527
+// {
528
+// name = "";
529
+// }
530
+//
531
+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
532
+// copy.skyboxext = "jpg";
533
+// }
534
+// else
535
+// {
536
+// if (name != null)
537
+// {
538
+// if (name.equals(""))
539
+// {
540
+// copy.skyboxname = null;
541
+// copy.skyboxext = null;
542
+// }
543
+// else
544
+// {
545
+// copy.skyboxname = name;
546
+// }
547
+// }
548
+// }
549
+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
550
+
551
+// refreshContents(false); // To refresh Info tab
552
+ cameraView.repaint();
420553 }
421554 };
422555 objectPanel.addChangeListener(changeListener);
....@@ -439,7 +572,9 @@
439572 toolboxPanel = new cGridBag().setVertical(true);
440573 //toolboxPanel.setName("Toolbox");
441574
442
- materialPanel = new cGridBag().setVertical(true);
575
+ skyboxPanel = new cGridBag().setVertical(true);
576
+
577
+ materialPanel = new cGridBag().setVertical(false);
443578 //materialPanel.setName("Material");
444579
445580 /*JTextPane*/
....@@ -723,6 +858,7 @@
723858 boolean maximized;
724859
725860 cButton fullscreenLayout;
861
+ cButton expandedLayout;
726862
727863 void Minimize()
728864 {
....@@ -762,10 +898,12 @@
762898 cButton minButton;
763899 cButton maxButton;
764900 cButton fullButton;
901
+ cButton collapseButton;
902
+ cButton maximize3DButton;
765903
766904 void ToggleFullScreen()
767905 {
768
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
906
+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
769907
770908 cameraView.ToggleFullScreen();
771909
....@@ -786,13 +924,13 @@
786924 // X frame.getContentPane().remove(/*"Center",*/bigThree);
787925 // X framePanel.add(bigThree);
788926 // X frame.getContentPane().add(/*"Center",*/framePanel);
789
- framePanel.setDividerLocation(46);
927
+// framePanel.setDividerLocation(46); // icons are 24x24
790928
791929 //frame.setVisible(true);
792
- radio.layout = keepButton;
930
+// radio.layout = keepButton;
793931 //theFrame = null;
794932 keepButton = null;
795
- radio.layout.doClick();
933
+// radio.layout.doClick();
796934
797935 } else
798936 {
....@@ -813,31 +951,53 @@
813951 // X frame.getContentPane().remove(/*"Center",*/framePanel);
814952 // X framePanel.remove(bigThree);
815953 // X frame.getContentPane().add(/*"Center",*/bigThree);
816
- framePanel.setDividerLocation(0);
954
+// framePanel.setDividerLocation(0);
817955
818
- radio.layout = fullscreenLayout;
819
- radio.layout.doClick();
956
+// radio.layout = fullscreenLayout;
957
+// radio.layout.doClick();
820958 //frame.setVisible(true);
821959 }
822960 frame.validate();
961
+
962
+ cameraView.requestFocusInWindow();
823963 }
824964
825
- private byte[] CompressCopy()
965
+ void CollapseToolbar()
966
+ {
967
+ framePanel.setDividerLocation(0);
968
+ //frame.validate();
969
+
970
+ cameraView.requestFocusInWindow();
971
+ }
972
+
973
+ private Object3D Duplicate(Object3D object)
826974 {
827975 boolean temp = CameraPane.SWITCH;
828976 CameraPane.SWITCH = false;
829977
830
- copy.ExtractBigData(versiontable);
978
+ if (Grafreed.grafreed.universe.versiontable == null)
979
+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
980
+
981
+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
831982 // if (copy == client)
832983
833
- byte[] versions[] = copy.versions;
834
- copy.versions = null;
984
+ Object3D versions[] = object.versionlist;
985
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
986
+ object.versionlist = null;
987
+ object.versiontable = null;
835988
836
- byte[] compress = Compress(copy);
989
+ Object3D parent = object.parent;
990
+ object.parent = null;
837991
838
- copy.versions = versions;
992
+ //byte[] compress = Compress(copy);
993
+ Object3D compress = (Object3D)Grafreed.clone(object);
839994
840
- copy.RestoreBigData(versiontable);
995
+ object.parent = parent;
996
+
997
+ object.versionlist = versions;
998
+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
999
+
1000
+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
8411001
8421002 CameraPane.SWITCH = temp;
8431003
....@@ -965,6 +1125,7 @@
9651125 {
9661126 SetupMaterial(materialPanel);
9671127 }
1128
+
9681129 //SetupName();
9691130 //SetupViews();
9701131 }
....@@ -1004,6 +1165,7 @@
10041165 cGridBag setupPanel2;
10051166 cGridBag objectCommandsPanel;
10061167 cGridBag pushPanel;
1168
+ cGridBag versionPanel;
10071169 cGridBag fillPanel;
10081170
10091171 JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
....@@ -1173,6 +1335,18 @@
11731335
11741336 namePanel = new cGridBag();
11751337
1338
+ //if (copy.pinned)
1339
+ {
1340
+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1341
+ pinButton.setSelected(copy.pinned);
1342
+ cGridBag t = new cGridBag();
1343
+ t.preferredWidth = 2;
1344
+ t.add(pinButton);
1345
+ namePanel.add(t);
1346
+
1347
+ pinButton.addItemListener(this);
1348
+ }
1349
+
11761350 nameField = AddText(namePanel, copy.GetName());
11771351 namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
11781352 oe.ctrlPanel.add(namePanel);
....@@ -1186,14 +1360,14 @@
11861360
11871361 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
11881362 liveCB.setToolTipText("Animate object");
1363
+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1364
+ markCB.setToolTipText("Set target transform");
11891365 selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
11901366 selectableCB.setToolTipText("Make object selectable");
11911367 // Return();
11921368
11931369 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
11941370 hideCB.setToolTipText("Hide object");
1195
- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1196
- markCB.setToolTipText("As animation target transform");
11971371
11981372 ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
11991373
....@@ -1238,9 +1412,14 @@
12381412 oe.ctrlPanel.add(objectCommandsPanel);
12391413 oe.ctrlPanel.Return();
12401414
1241
- pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1415
+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH * 100, 1.1); // To have the buttons
12421416 normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1243
- //Return();
1417
+ if (false && copy.versionlist != null && copy.versionindex != -1)
1418
+ {
1419
+ oe.ctrlPanel.Return();
1420
+ versionPanel = AddSlider(oe.ctrlPanel, "Version", 0, copy.VersionCount() - 1, copy.versionindex);
1421
+ versionField = (cNumberSlider)versionPanel.getComponent(1);
1422
+ }
12441423
12451424 oe.ctrlPanel.Return();
12461425
....@@ -1395,22 +1574,9 @@
13951574
13961575 if (cam == null || !(copy.get(0) instanceof cGroup))
13971576 {
1398
- System.out.println("CREATE CAMERAS");
1399
- cams = new cTemplate();
1400
- cams.name = "Cameras";
1401
- copy.insertElementAt(cams, 0);
1402
- //cams.parent = copy;
1403
-
1404
- cam = new Camera(); // LA.newVector(3, 2, 1));
1405
- cams.addChild(cam);
1406
- cam = new Camera(1);
1407
- cams.addChild(cam);
1408
- cam = new Camera(2);
1409
- cams.addChild(cam);
1410
- cam = new Camera(3);
1411
- cams.addChild(cam);
1412
- cam = new Camera(4); // Light
1413
- cams.addChild(cam);
1577
+ if (Globals.DEBUG)
1578
+ System.out.println("CREATE CAMERAS");
1579
+ cams = CreateCameras();
14141580 } else
14151581 {
14161582 cams = (cGroup) copy.get(0);
....@@ -1476,6 +1642,45 @@
14761642 //frontView.object = copy;
14771643 //sideView.object = copy;
14781644
1645
+ transformPanel = new cGridBag().setVertical(true);
1646
+
1647
+ cGridBag resetTransformPanel = new cGridBag();
1648
+
1649
+ resetTransformPanel.preferredHeight = 2;
1650
+
1651
+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
1652
+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
1653
+ resetTransform.addMouseListener(new MouseAdapter()
1654
+ {
1655
+ public void mouseClicked(MouseEvent e)
1656
+ {
1657
+ ResetTransform();
1658
+ }
1659
+ });
1660
+ resetTransformPanel.add(resetTransform);
1661
+
1662
+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
1663
+ resetTransform.setToolTipText("Reset Translation only");
1664
+ resetTransform.addMouseListener(new MouseAdapter()
1665
+ {
1666
+ public void mouseClicked(MouseEvent e)
1667
+ {
1668
+ ResetTransform(1);
1669
+ }
1670
+ });
1671
+ resetTransformPanel.add(resetTransform);
1672
+
1673
+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
1674
+ resetTransform.setToolTipText("Reset Rotation and Scale only");
1675
+ resetTransform.addMouseListener(new MouseAdapter()
1676
+ {
1677
+ public void mouseClicked(MouseEvent e)
1678
+ {
1679
+ ResetTransform(2);
1680
+ }
1681
+ });
1682
+ resetTransformPanel.add(resetTransform);
1683
+
14791684 XYZPanel = new cGridBag().setVertical(true);
14801685 //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
14811686
....@@ -1485,6 +1690,9 @@
14851690 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
14861691 //XYZPanel.setName("XYZ");
14871692
1693
+ transformPanel.add(resetTransformPanel);
1694
+ transformPanel.add(XYZPanel);
1695
+
14881696 /*
14891697 gridPanel = new JPanel(); //new BorderLayout());
14901698 gridPanel.setLayout(new GridLayout(1, 2));
....@@ -1492,12 +1700,12 @@
14921700 gridPanel.add(cameraView);
14931701 gridPanel.add(XYZPanel);
14941702 */
1495
- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1496
- gridPanel.setContinuousLayout(true);
1497
- gridPanel.setOneTouchExpandable(true);
1498
- gridPanel.setDividerLocation(1.0);
1499
- gridPanel.setDividerSize(9);
1500
- gridPanel.setResizeWeight(0.85);
1703
+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1704
+// gridPanel.setContinuousLayout(true);
1705
+// gridPanel.setOneTouchExpandable(true);
1706
+// gridPanel.setDividerLocation(1.0);
1707
+// gridPanel.setDividerSize(9);
1708
+// gridPanel.setResizeWeight(0.85);
15011709
15021710 // aConstraints.weighty = 0;
15031711 //System.out.println("THIS = " + this);
....@@ -1520,25 +1728,34 @@
15201728
15211729 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15221730 //tmp.setName("Edit");
1731
+ objectPanel.add(skyboxPanel);
1732
+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
1733
+ objectPanel.setToolTipTextAt(0, "Backgrounds");
1734
+
1735
+ objectPanel.add(toolboxPanel);
1736
+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1737
+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1738
+
15231739 objectPanel.add(materialPanel);
1524
- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1740
+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
1741
+ objectPanel.setToolTipTextAt(2, "Material");
1742
+
15251743 // JPanel north = new JPanel(new BorderLayout());
15261744 // north.setName("Edit");
15271745 // north.add(ctrlPanel, BorderLayout.NORTH);
15281746 // objectPanel.add(north);
15291747 objectPanel.add(editPanel);
1530
- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1748
+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1749
+ objectPanel.setToolTipTextAt(3, "Edit controls");
15311750
1532
- //if (Globals.ADVANCED)
1533
- objectPanel.add(infoPanel);
1534
- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1751
+ objectPanel.add(transformPanel);
1752
+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1753
+ objectPanel.setToolTipTextAt(4, "TRS transform");
15351754
1536
- objectPanel.add(XYZPanel);
1537
- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1538
-
1539
- objectPanel.add(toolboxPanel);
1540
- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1541
-
1755
+ patchMaterial = true;
1756
+ cameraView.patchMaterial = this;
1757
+ objectPanel.setSelectedIndex(2);
1758
+
15421759 /*
15431760 aConstraints.gridx = 0;
15441761 aConstraints.gridwidth = 1;
....@@ -1569,11 +1786,108 @@
15691786
15701787 AddOptions(optionsPanel); //, aConstraints);
15711788
1572
- tabbedPane.add(optionsPanel);
1573
-
15741789 tabbedPane.add(FSPane = new cFileSystemPane(this));
15751790
1791
+ tabbedPane.add(optionsPanel);
1792
+
15761793 scenePanel.add(tabbedPane);
1794
+
1795
+ cGridBag creditsPanel = new cGridBag().setVertical(true);
1796
+ creditsPanel.setName("Credits");
1797
+
1798
+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
1799
+ creditsPanel.add(ogaLabel);
1800
+
1801
+ cButton creditButton;
1802
+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
1803
+ creditButton.setToolTipText("https://opengameart.org");
1804
+
1805
+ creditButton.addMouseListener(new MouseAdapter()
1806
+ {
1807
+ public void mouseClicked(MouseEvent e)
1808
+ {
1809
+ try
1810
+ {
1811
+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
1812
+ } catch (Exception e1)
1813
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
1814
+ {
1815
+ e1.printStackTrace();
1816
+ }
1817
+ }
1818
+ });
1819
+
1820
+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
1821
+ creditsPanel.add(ogaLabel);
1822
+
1823
+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
1824
+ creditButton.setToolTipText("https://3delicious.net");
1825
+
1826
+ creditButton.addMouseListener(new MouseAdapter()
1827
+ {
1828
+ public void mouseClicked(MouseEvent e)
1829
+ {
1830
+ try
1831
+ {
1832
+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
1833
+ } catch (Exception e1)
1834
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
1835
+ {
1836
+ e1.printStackTrace();
1837
+ }
1838
+ }
1839
+ });
1840
+
1841
+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
1842
+ creditButton.setToolTipText("https://archive3d.net");
1843
+
1844
+ creditButton.addMouseListener(new MouseAdapter()
1845
+ {
1846
+ public void mouseClicked(MouseEvent e)
1847
+ {
1848
+ try
1849
+ {
1850
+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
1851
+ } catch (Exception e1)
1852
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
1853
+ {
1854
+ e1.printStackTrace();
1855
+ }
1856
+ }
1857
+ });
1858
+
1859
+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
1860
+ creditButton.setToolTipText("https://turbosquid.com");
1861
+
1862
+ creditButton.addMouseListener(new MouseAdapter()
1863
+ {
1864
+ public void mouseClicked(MouseEvent e)
1865
+ {
1866
+ try
1867
+ {
1868
+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
1869
+ } catch (Exception e1)
1870
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
1871
+ {
1872
+ e1.printStackTrace();
1873
+ }
1874
+ }
1875
+ });
1876
+
1877
+ for (int i=6; --i>=0;)
1878
+ {
1879
+ creditsPanel.add(new cGridBag());
1880
+ }
1881
+
1882
+ tabbedPane.add(creditsPanel);
1883
+ tabbedPane.setToolTipTextAt(3, "Credits");
1884
+
1885
+ if (Globals.ADVANCED)
1886
+ {
1887
+ objectPanel.add(infoPanel);
1888
+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
1889
+ objectPanel.setToolTipTextAt(4, "Information");
1890
+ }
15771891
15781892 /*
15791893 cTree jTree = new cTree(null);
....@@ -1595,13 +1909,13 @@
15951909 jtp.add(tree);
15961910 */
15971911
1598
- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1599
- bigPanel.setContinuousLayout(true);
1600
- bigPanel.setOneTouchExpandable(true);
1601
- bigPanel.setDividerLocation(0.8);
1602
- bigPanel.setDividerSize(15);
1603
- bigPanel.setResizeWeight(0.15);
1604
- bigPanel.setName("Scene");
1912
+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1913
+// bigPanel.setContinuousLayout(true);
1914
+// bigPanel.setOneTouchExpandable(true);
1915
+// bigPanel.setDividerLocation(0.8);
1916
+// bigPanel.setDividerSize(15);
1917
+// bigPanel.setResizeWeight(0.15);
1918
+// bigPanel.setName("Scene");
16051919
16061920 //bigPanel.setLayout(new BorderLayout());
16071921 //bigPanel.setSize(new Dimension(10,10));
....@@ -1634,8 +1948,8 @@
16341948 /**/
16351949
16361950 bigThree = new cGridBag();
1637
- bigThree.addComponent(centralPanel);
16381951 bigThree.addComponent(scenePanel);
1952
+ bigThree.addComponent(centralPanel);
16391953 //bigThree.addComponent(XYZPanel);
16401954
16411955 // // SIDE EFFECT!!!
....@@ -1645,6 +1959,23 @@
16451959 // aConstraints.gridheight = 1;
16461960
16471961 framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1962
+
1963
+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1964
+ new java.beans.PropertyChangeListener()
1965
+ {
1966
+ public void propertyChange(java.beans.PropertyChangeEvent pce)
1967
+ {
1968
+ if ((Integer)pce.getOldValue() == 1)
1969
+ {
1970
+ if (radio.layout != expandedLayout)
1971
+ {
1972
+ radio.layout = expandedLayout;
1973
+ radio.layout.doClick();
1974
+ }
1975
+ }
1976
+ }
1977
+ });
1978
+
16481979 framePanel.setContinuousLayout(false);
16491980 framePanel.setOneTouchExpandable(false);
16501981 //.setDividerLocation(0.8);
....@@ -1654,7 +1985,7 @@
16541985
16551986 frame.getContentPane().setLayout(new BorderLayout());
16561987 /**/
1657
- JTabbedPane worldPane = new JTabbedPane();
1988
+ //JTabbedPane worldPane = new JTabbedPane();
16581989 //worldPane.add(bigPanel);
16591990 //worldPane.add(worldPanel);
16601991 /**/
....@@ -1668,7 +1999,7 @@
16681999
16692000 cameraView.requestFocusInWindow();
16702001
1671
- gridPanel.setDividerLocation(1.0);
2002
+// gridPanel.setDividerLocation(1.0);
16722003
16732004 frame.validate();
16742005
....@@ -1677,7 +2008,6 @@
16772008 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16782009 frame.addWindowListener(new WindowAdapter()
16792010 {
1680
-
16812011 public void windowClosing(WindowEvent e)
16822012 {
16832013 Close();
....@@ -1700,28 +2030,484 @@
17002030 ctrlPanel.removeAll();
17012031 }
17022032
1703
- void SetupMaterial(cGridBag panel)
2033
+ void SetupMaterial(cGridBag materialpanel)
17042034 {
1705
- /*
2035
+ cGridBag presetpanel = new cGridBag().setVertical(true);
2036
+
2037
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
2038
+ skin.setToolTipText("Skin");
2039
+ skin.addMouseListener(new MouseAdapter()
2040
+ {
2041
+ public void mouseClicked(MouseEvent e)
2042
+ {
2043
+ Object3D object = Grafreed.materials.versionlist[0].get(0);
2044
+ cMaterial material = object.material;
2045
+
2046
+ // Skin
2047
+ colorField.setFloat(material.color);
2048
+ float saturation = material.modulation;
2049
+
2050
+ if (!cameraView.Skinshader)
2051
+ {
2052
+ saturation /= 1.5;
2053
+ }
2054
+
2055
+ saturationField.setFloat(saturation);
2056
+
2057
+ subsurfaceField.setFloat(material.subsurface);
2058
+ selfshadowField.setFloat(material.diffuseness);
2059
+ diffusenessField.setFloat(material.factor);
2060
+ shininessField.setFloat(material.shininess);
2061
+ shadowbiasField.setFloat(material.shadowbias);
2062
+ diffuseField.setFloat(material.diffuse);
2063
+ specularField.setFloat(material.specular);
2064
+
2065
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2066
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2067
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2068
+
2069
+ materialtouched = true;
2070
+ applySelf();
2071
+ }
2072
+ });
2073
+ presetpanel.add(skin);
2074
+
2075
+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
2076
+ lambert.setToolTipText("Diffuse");
2077
+ lambert.addMouseListener(new MouseAdapter()
2078
+ {
2079
+ public void mouseClicked(MouseEvent e)
2080
+ {
2081
+ Object3D object = Grafreed.materials.versionlist[2].get(0);
2082
+ cMaterial material = object.material;
2083
+
2084
+ diffusenessField.setFloat(material.factor);
2085
+ selfshadowField.setFloat(material.diffuseness);
2086
+
2087
+ materialtouched = true;
2088
+ applySelf();
2089
+ }
2090
+ });
2091
+ presetpanel.add(lambert);
2092
+
2093
+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
2094
+ diffuse2.setToolTipText("Diffuse2");
2095
+ diffuse2.addMouseListener(new MouseAdapter()
2096
+ {
2097
+ public void mouseClicked(MouseEvent e)
2098
+ {
2099
+ Object3D object = Grafreed.materials.versionlist[3].get(0);
2100
+ cMaterial material = object.material;
2101
+
2102
+ diffusenessField.setFloat(material.factor);
2103
+ selfshadowField.setFloat(material.diffuseness);
2104
+
2105
+ materialtouched = true;
2106
+ applySelf();
2107
+ }
2108
+ });
2109
+ presetpanel.add(diffuse2);
2110
+
2111
+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
2112
+ diffusemoon.setToolTipText("Moon");
2113
+ diffusemoon.addMouseListener(new MouseAdapter()
2114
+ {
2115
+ public void mouseClicked(MouseEvent e)
2116
+ {
2117
+ Object3D object = Grafreed.materials.versionlist[4].get(0);
2118
+ cMaterial material = object.material;
2119
+
2120
+ diffusenessField.setFloat(material.factor);
2121
+ selfshadowField.setFloat(material.diffuseness);
2122
+
2123
+ materialtouched = true;
2124
+ applySelf();
2125
+ }
2126
+ });
2127
+ presetpanel.add(diffusemoon);
2128
+
2129
+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
2130
+ diffusemoon2.setToolTipText("Moon2");
2131
+ diffusemoon2.addMouseListener(new MouseAdapter()
2132
+ {
2133
+ public void mouseClicked(MouseEvent e)
2134
+ {
2135
+ Object3D object = Grafreed.materials.versionlist[5].get(0);
2136
+ cMaterial material = object.material;
2137
+
2138
+ diffusenessField.setFloat(material.factor);
2139
+ selfshadowField.setFloat(material.diffuseness);
2140
+
2141
+ materialtouched = true;
2142
+ applySelf();
2143
+ }
2144
+ });
2145
+ presetpanel.add(diffusemoon2);
2146
+
2147
+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
2148
+ diffusemoon3.setToolTipText("Moon3");
2149
+ diffusemoon3.addMouseListener(new MouseAdapter()
2150
+ {
2151
+ public void mouseClicked(MouseEvent e)
2152
+ {
2153
+ Object3D object = Grafreed.materials.versionlist[6].get(0);
2154
+ cMaterial material = object.material;
2155
+
2156
+ diffusenessField.setFloat(material.factor);
2157
+ selfshadowField.setFloat(material.diffuseness);
2158
+
2159
+ materialtouched = true;
2160
+ applySelf();
2161
+ }
2162
+ });
2163
+ presetpanel.add(diffusemoon3);
2164
+
2165
+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
2166
+ diffusesheen.setToolTipText("Sheen");
2167
+ diffusesheen.addMouseListener(new MouseAdapter()
2168
+ {
2169
+ public void mouseClicked(MouseEvent e)
2170
+ {
2171
+ Object3D object = Grafreed.materials.versionlist[7].get(0);
2172
+ cMaterial material = object.material;
2173
+
2174
+ sheenField.setFloat(material.sheen);
2175
+
2176
+ materialtouched = true;
2177
+ applySelf();
2178
+ }
2179
+ });
2180
+ presetpanel.add(diffusesheen);
2181
+
2182
+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
2183
+ rough.setToolTipText("Rough metal");
2184
+ rough.addMouseListener(new MouseAdapter()
2185
+ {
2186
+ public void mouseClicked(MouseEvent e)
2187
+ {
2188
+ Object3D object = Grafreed.materials.versionlist[1].get(0);
2189
+ cMaterial material = object.material;
2190
+
2191
+ shininessField.setFloat(material.shininess);
2192
+ velvetField.setFloat(material.velvet);
2193
+
2194
+ materialtouched = true;
2195
+ applySelf();
2196
+ }
2197
+ });
2198
+ presetpanel.add(rough);
2199
+
2200
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
2201
+ rough2.setToolTipText("Medium metal");
2202
+ rough2.addMouseListener(new MouseAdapter()
2203
+ {
2204
+ public void mouseClicked(MouseEvent e)
2205
+ {
2206
+ Object3D object = Grafreed.materials.versionlist[13].get(0);
2207
+ cMaterial material = object.material;
2208
+
2209
+ shininessField.setFloat(material.shininess);
2210
+ lightareaField.setFloat(material.lightarea);
2211
+
2212
+ materialtouched = true;
2213
+ applySelf();
2214
+ }
2215
+ });
2216
+ presetpanel.add(rough2);
2217
+
2218
+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2219
+ shini0.setToolTipText("Shiny");
2220
+ shini0.addMouseListener(new MouseAdapter()
2221
+ {
2222
+ public void mouseClicked(MouseEvent e)
2223
+ {
2224
+ Object3D object = Grafreed.materials.versionlist[14].get(0);
2225
+ cMaterial material = object.material;
2226
+
2227
+ shininessField.setFloat(material.shininess);
2228
+ lightareaField.setFloat(material.lightarea);
2229
+
2230
+ materialtouched = true;
2231
+ applySelf();
2232
+ }
2233
+ });
2234
+ presetpanel.add(shini0);
2235
+
2236
+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2237
+ shini1.setToolTipText("Shiny2");
2238
+ shini1.addMouseListener(new MouseAdapter()
2239
+ {
2240
+ public void mouseClicked(MouseEvent e)
2241
+ {
2242
+ Object3D object = Grafreed.materials.versionlist[11].get(0);
2243
+ cMaterial material = object.material;
2244
+
2245
+ shininessField.setFloat(material.shininess);
2246
+ lightareaField.setFloat(material.lightarea);
2247
+
2248
+ materialtouched = true;
2249
+ applySelf();
2250
+ }
2251
+ });
2252
+ presetpanel.add(shini1);
2253
+
2254
+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2255
+ shini2.setToolTipText("Shiny3");
2256
+ shini2.addMouseListener(new MouseAdapter()
2257
+ {
2258
+ public void mouseClicked(MouseEvent e)
2259
+ {
2260
+ Object3D object = Grafreed.materials.versionlist[12].get(0);
2261
+ cMaterial material = object.material;
2262
+
2263
+ shininessField.setFloat(material.shininess);
2264
+ lightareaField.setFloat(material.lightarea);
2265
+
2266
+ materialtouched = true;
2267
+ applySelf();
2268
+ }
2269
+ });
2270
+ presetpanel.add(shini2);
2271
+
2272
+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2273
+ aniso.setToolTipText("AnisoU");
2274
+ aniso.addMouseListener(new MouseAdapter()
2275
+ {
2276
+ public void mouseClicked(MouseEvent e)
2277
+ {
2278
+ Object3D object = Grafreed.materials.versionlist[8].get(0);
2279
+ cMaterial material = object.material;
2280
+
2281
+ anisoField.setFloat(material.aniso);
2282
+ anisoVField.setFloat(material.anisoV);
2283
+
2284
+ materialtouched = true;
2285
+ applySelf();
2286
+ }
2287
+ });
2288
+ presetpanel.add(aniso);
2289
+
2290
+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2291
+ aniso2.setToolTipText("AnisoV");
2292
+ aniso2.addMouseListener(new MouseAdapter()
2293
+ {
2294
+ public void mouseClicked(MouseEvent e)
2295
+ {
2296
+ Object3D object = Grafreed.materials.versionlist[9].get(0);
2297
+ cMaterial material = object.material;
2298
+
2299
+ anisoField.setFloat(material.aniso);
2300
+ anisoVField.setFloat(material.anisoV);
2301
+
2302
+ materialtouched = true;
2303
+ applySelf();
2304
+ }
2305
+ });
2306
+ presetpanel.add(aniso2);
2307
+
2308
+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2309
+ aniso3.setToolTipText("AnisoUV");
2310
+ aniso3.addMouseListener(new MouseAdapter()
2311
+ {
2312
+ public void mouseClicked(MouseEvent e)
2313
+ {
2314
+ Object3D object = Grafreed.materials.versionlist[10].get(0);
2315
+ cMaterial material = object.material;
2316
+
2317
+ anisoField.setFloat(material.aniso);
2318
+ anisoVField.setFloat(material.anisoV);
2319
+
2320
+ materialtouched = true;
2321
+ applySelf();
2322
+ }
2323
+ });
2324
+ presetpanel.add(aniso3);
2325
+
2326
+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2327
+ velvet0.setToolTipText("Velvet");
2328
+ velvet0.addMouseListener(new MouseAdapter()
2329
+ {
2330
+ public void mouseClicked(MouseEvent e)
2331
+ {
2332
+ Object3D object = Grafreed.materials.versionlist[15].get(0);
2333
+ cMaterial material = object.material;
2334
+
2335
+ diffusenessField.setFloat(material.factor);
2336
+ selfshadowField.setFloat(material.diffuseness);
2337
+ sheenField.setFloat(material.sheen);
2338
+ shininessField.setFloat(material.shininess);
2339
+ velvetField.setFloat(material.velvet);
2340
+ shiftField.setFloat(material.shift);
2341
+
2342
+ materialtouched = true;
2343
+ applySelf();
2344
+ }
2345
+ });
2346
+ presetpanel.add(velvet0);
2347
+
2348
+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2349
+ bump0.setToolTipText("Bump texture");
2350
+ bump0.addMouseListener(new MouseAdapter()
2351
+ {
2352
+ public void mouseClicked(MouseEvent e)
2353
+ {
2354
+ Object3D object = Grafreed.materials.versionlist[16].get(0);
2355
+ cMaterial material = object.material;
2356
+
2357
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2358
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2359
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2360
+
2361
+ materialtouched = true;
2362
+ applySelf();
2363
+ }
2364
+ });
2365
+ presetpanel.add(bump0);
2366
+
2367
+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2368
+ borderShader.setToolTipText("Border fade");
2369
+ borderShader.addMouseListener(new MouseAdapter()
2370
+ {
2371
+ public void mouseClicked(MouseEvent e)
2372
+ {
2373
+ borderfadeField.setFloat(0.4);
2374
+ opacityField.setFloat(0.75);
2375
+
2376
+ materialtouched = true;
2377
+ applySelf();
2378
+ }
2379
+ });
2380
+ presetpanel.add(borderShader);
2381
+
2382
+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2383
+ halo.setToolTipText("Halo");
2384
+ halo.addMouseListener(new MouseAdapter()
2385
+ {
2386
+ public void mouseClicked(MouseEvent e)
2387
+ {
2388
+ Object3D object = Grafreed.materials.versionlist[17].get(0);
2389
+ cMaterial material = object.material;
2390
+
2391
+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2392
+
2393
+ materialtouched = true;
2394
+ applySelf();
2395
+ }
2396
+ });
2397
+ presetpanel.add(halo);
2398
+
2399
+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2400
+ candle.setToolTipText("Candle");
2401
+ candle.addMouseListener(new MouseAdapter()
2402
+ {
2403
+ public void mouseClicked(MouseEvent e)
2404
+ {
2405
+ Object3D object = Grafreed.materials.versionlist[18].get(0);
2406
+ cMaterial material = object.material;
2407
+
2408
+ subsurfaceField.setFloat(material.subsurface);
2409
+ shadowbiasField.setFloat(material.shadowbias);
2410
+ ambientField.setFloat(material.ambient);
2411
+ specularField.setFloat(material.specular);
2412
+ lightareaField.setFloat(material.lightarea);
2413
+ shininessField.setFloat(material.shininess);
2414
+
2415
+ materialtouched = true;
2416
+ applySelf();
2417
+ }
2418
+ });
2419
+ presetpanel.add(candle);
2420
+
2421
+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2422
+ shadowShader.setToolTipText("Shadow");
2423
+ shadowShader.addMouseListener(new MouseAdapter()
2424
+ {
2425
+ public void mouseClicked(MouseEvent e)
2426
+ {
2427
+ diffuseField.setFloat(0.001);
2428
+ ambientField.setFloat(0.001);
2429
+ cameraField.setFloat(0.001);
2430
+ specularField.setFloat(0.001);
2431
+ fakedepthField.setFloat(0.001);
2432
+ opacityField.setFloat(0.4);
2433
+
2434
+ materialtouched = true;
2435
+ applySelf();
2436
+ }
2437
+ });
2438
+ presetpanel.add(shadowShader);
2439
+
2440
+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
2441
+ para0.setToolTipText("No parallax");
2442
+ para0.addMouseListener(new MouseAdapter()
2443
+ {
2444
+ public void mouseClicked(MouseEvent e)
2445
+ {
2446
+ parallaxField.setFloat(0.125);
2447
+
2448
+ materialtouched = true;
2449
+ applySelf();
2450
+ }
2451
+ });
2452
+ presetpanel.add(para0);
2453
+
2454
+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
2455
+ para1.setToolTipText("With parallax");
2456
+ para1.addMouseListener(new MouseAdapter()
2457
+ {
2458
+ public void mouseClicked(MouseEvent e)
2459
+ {
2460
+ parallaxField.setFloat(0.13);
2461
+
2462
+ materialtouched = true;
2463
+ applySelf();
2464
+ }
2465
+ });
2466
+ presetpanel.add(para1);
2467
+
2468
+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
2469
+ para2.setToolTipText("Reset parallax");
2470
+ para2.addMouseListener(new MouseAdapter()
2471
+ {
2472
+ public void mouseClicked(MouseEvent e)
2473
+ {
2474
+ parallaxField.setFloat(0.14);
2475
+
2476
+ materialtouched = true;
2477
+ applySelf();
2478
+ }
2479
+ });
2480
+ presetpanel.add(para2);
2481
+
2482
+ cGridBag panel = new cGridBag().setVertical(true);
2483
+
2484
+ presetpanel.preferredWidth = 1;
2485
+
2486
+ materialpanel.add(presetpanel);
2487
+ materialpanel.add(panel);
2488
+
2489
+ panel.preferredWidth = 8;
2490
+
2491
+ /*
17062492 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
17072493 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1708
- */
2494
+ */
17092495
17102496 cGridBag editBar = new cGridBag().setVertical(false);
17112497
1712
- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
2498
+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
17132499 createMaterialButton.setToolTipText("Create material");
17142500
17152501 /*
17162502 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
17172503 */
17182504
1719
- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
2505
+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
17202506 clearMaterialButton.setToolTipText("Clear material");
17212507
17222508 if (Globals.ADVANCED)
17232509 {
1724
- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
2510
+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
17252511 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
17262512 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
17272513 }
....@@ -1739,27 +2525,61 @@
17392525 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17402526
17412527 cGridBag colorSection = new cGridBag().setVertical(true);
2528
+
2529
+ cGridBag huepanel = new cGridBag();
2530
+ cGridBag huelabel = new cGridBag();
2531
+ cLabel hue = GetLabel("icons/hue.png", false);
2532
+ hue.fit = true;
2533
+
2534
+ hue.addMouseListener(new MouseAdapter()
2535
+ {
2536
+ public void mousePressed(MouseEvent e)
2537
+ {
2538
+ int x = e.getX();
2539
+
2540
+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2541
+ }
2542
+ });
2543
+
2544
+ huelabel.add(hue);
2545
+ huelabel.preferredWidth = 20;
2546
+ huepanel.add(new cGridBag()); // Label
2547
+ huepanel.add(huelabel); // Field/slider
2548
+
2549
+ huepanel.preferredHeight = 7;
2550
+
2551
+ colorSection.add(huepanel);
17422552
17432553 cGridBag color = new cGridBag();
1744
- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1745
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1746
- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2554
+
2555
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
2556
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2557
+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2558
+
17472559 //colorField.preferredWidth = 200;
17482560 colorSection.add(color);
17492561
17502562 cGridBag modulation = new cGridBag();
17512563 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
17522564 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2565
+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
17542566 colorSection.add(modulation);
17552567
2568
+ cGridBag opacity = new cGridBag();
2569
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
2570
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2571
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2572
+ colorSection.add(opacity);
2573
+
2574
+ colorSection.add(GetSeparator());
2575
+
17562576 cGridBag texture = new cGridBag();
17572577 texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
17582578 textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17592579 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
17602580 colorSection.add(texture);
17612581
1762
- panel.add(new JSeparator());
2582
+ panel.add(GetSeparator());
17632583
17642584 panel.add(colorSection);
17652585
....@@ -1815,7 +2635,7 @@
18152635 shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
18162636 diffuseSection.add(shadowbias);
18172637
1818
- panel.add(new JSeparator());
2638
+ panel.add(GetSeparator());
18192639
18202640 panel.add(diffuseSection);
18212641
....@@ -1878,7 +2698,7 @@
18782698 specularSection.add(anisoV);
18792699
18802700
1881
- panel.add(new JSeparator());
2701
+ panel.add(GetSeparator());
18822702
18832703 panel.add(specularSection);
18842704
....@@ -1904,12 +2724,12 @@
19042724 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
19052725 colorSection.add(backlit);
19062726
1907
- cGridBag opacity = new cGridBag();
1908
- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1909
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1910
- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1911
- colorSection.add(opacity);
1912
-
2727
+ cGridBag parallax = new cGridBag();
2728
+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
2729
+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2730
+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
2731
+ colorSection.add(parallax);
2732
+
19132733 //panel.add(new JSeparator());
19142734
19152735 //panel.add(globalSection);
....@@ -1954,7 +2774,7 @@
19542774 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
19552775 textureSection.add(opacityPower);
19562776
1957
- panel.add(new JSeparator());
2777
+ panel.add(GetSeparator());
19582778
19592779 panel.add(textureSection);
19602780
....@@ -2941,7 +3761,7 @@
29413761
29423762 freezematerial = true;
29433763 colorField.setFloat(mat.color);
2944
- modulationField.setFloat(mat.modulation);
3764
+ saturationField.setFloat(mat.modulation);
29453765 metalnessField.setFloat(mat.metalness);
29463766 diffuseField.setFloat(mat.diffuse);
29473767 specularField.setFloat(mat.specular);
....@@ -2961,6 +3781,7 @@
29613781 shadowField.setFloat(mat.shadow);
29623782 textureField.setFloat(mat.texture);
29633783 opacityField.setFloat(mat.opacity);
3784
+ parallaxField.setFloat(mat.parallax + 0.125f);
29643785 fakedepthField.setFloat(mat.fakedepth);
29653786 shadowbiasField.setFloat(mat.shadowbias);
29663787 bumpField.setInteger(1); // dec 2013
....@@ -3003,32 +3824,8 @@
30033824
30043825 if (multiplyToggle != null)
30053826 multiplyToggle.setSelected(mat.multiply);
3006
-
3007
- assert (object.projectedVertices != null);
3008
-
3009
- if (object.projectedVertices.length <= 2)
3010
- {
3011
- // Side effect...
3012
- Object3D.cVector2[] keep = object.projectedVertices;
3013
- object.projectedVertices = new Object3D.cVector2[3];
3014
- for (int i = 0; i < 3; i++)
3015
- {
3016
- if (i < keep.length)
3017
- {
3018
- object.projectedVertices[i] = keep[i];
3019
- } else
3020
- {
3021
- object.projectedVertices[i] = new Object3D.cVector2();
3022
- }
3023
- /*
3024
- if(keep.length == 0)
3025
- object.projectedVertices[0] = new Object3D.cVector2();
3026
- else
3027
- object.projectedVertices[0] = keep[0];
3028
- object.projectedVertices[1] = new Object3D.cVector2();
3029
- */
3030
- }
3031
- }
3827
+
3828
+ AllocProjectedVertices(object);
30323829
30333830 SetMaterial(mat, object.projectedVertices);
30343831 }
....@@ -3148,6 +3945,17 @@
31483945 public void itemStateChanged(ItemEvent event)
31493946 {
31503947 // System.out.println("Propagate = " + propagate);
3948
+ if (event.getSource() == pinButton)
3949
+ {
3950
+ copy.pinned ^= true;
3951
+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3952
+ {
3953
+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
3954
+ copy.CloseUI();
3955
+ //copy.editWindow.refreshContents();
3956
+ }
3957
+ }
3958
+ else
31513959 if (event.getSource() == propagateToggle)
31523960 {
31533961 propagate ^= true;
....@@ -3252,6 +4060,7 @@
32524060 } else if (event.getSource() == liveCB)
32534061 {
32544062 copy.live ^= true;
4063
+ objEditor.refreshContents(true); // To show item colors
32554064 return;
32564065 } else if (event.getSource() == selectableCB)
32574066 {
....@@ -3261,11 +4070,12 @@
32614070 {
32624071 copy.hide ^= true;
32634072 copy.Touch(); // display list issue
3264
- objEditor.refreshContents();
4073
+ objEditor.refreshContents(true); // To show item colors
32654074 return;
32664075 } else if (event.getSource() == link2masterCB)
32674076 {
32684077 copy.link2master ^= true;
4078
+ objEditor.refreshContents();
32694079 return;
32704080 }
32714081 if (event.getSource() == randomCB)
....@@ -3326,7 +4136,7 @@
33264136 //System.out.println("ObjEditor " + event);
33274137 applySelf0(true);
33284138 //parent.applySelf();
3329
- objEditor.refreshContents();
4139
+ // conflicts with requestFocus objEditor.refreshContents();
33304140 } else if (source == resetButton)
33314141 {
33324142 CameraPane.fullreset = true;
....@@ -3506,17 +4316,25 @@
35064316
35074317 void New()
35084318 {
3509
- while (copy.Size() > 1)
4319
+ while (copy.Size() > 0)
35104320 {
3511
- copy.remove(1);
4321
+ copy.remove(0);
35124322 }
35134323
4324
+ copy.selection.clear();
4325
+
4326
+ if (copy == Grafreed.grafreed.universe)
4327
+ {
4328
+ CreateCameras();
4329
+ cameraView.SetCamera(GetCamera(copy, 0));
4330
+ }
35144331 ResetModel();
35154332 objEditor.refreshContents();
35164333 }
35174334
35184335 static public byte[] Compress(Object3D o)
35194336 {
4337
+ // Slower to actually compress.
35204338 try
35214339 {
35224340 ByteArrayOutputStream baos = new ByteArrayOutputStream();
....@@ -3618,6 +4436,7 @@
36184436 {
36194437 //Save(true);
36204438 Replace();
4439
+ SetVersionStates();
36214440 }
36224441
36234442 private boolean Equal(byte[] compress, byte[] name)
....@@ -3636,31 +4455,54 @@
36364455 return true;
36374456 }
36384457
3639
- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4458
+ void DeleteVersion()
4459
+ {
4460
+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
4461
+ {
4462
+ copy.versionlist[i] = copy.versionlist[i+1];
4463
+ }
4464
+
4465
+ if (copy.versionlist[copy.versionindex] == null)
4466
+ copy.versionindex -= 1;
4467
+
4468
+ if (copy.versionindex != -1)
4469
+ CopyChanged(copy);
4470
+
4471
+ SetVersionStates();
4472
+ }
36404473
36414474 public boolean Save(boolean user)
36424475 {
36434476 System.err.println("Save");
4477
+ Replace();
36444478
3645
- cRadio tab = GetCurrentTab();
4479
+ if (copy.versionlist == null)
4480
+ {
4481
+ copy.versionlist = new Object3D[100];
4482
+ copy.versionindex = -1;
4483
+ }
36464484
3647
- byte[] compress = CompressCopy();
4485
+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
36484486
36494487 boolean thesame = false;
36504488
3651
- // Quick heuristic using length. Works only when stream is compressed.
3652
- if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3653
- {
3654
- thesame = true;
3655
- }
4489
+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
4490
+// {
4491
+// thesame = true;
4492
+// }
36564493
36574494 //EditorFrame.m_MainFrame.requestFocusInWindow();
36584495 if (!thesame)
36594496 {
4497
+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
4498
+ {
4499
+ copy.versionlist[i] = copy.versionlist[i-1];
4500
+ }
4501
+
36604502 //tab.user[tab.versionindex] = user;
36614503 //boolean increment = true; // tab.graphs[tab.versionindex] == null;
36624504
3663
- copy.versions[++copy.versionindex] = compress;
4505
+ copy.versionlist[++copy.versionindex] = compress;
36644506
36654507 // if (increment)
36664508 // tab.versionindex++;
....@@ -3670,13 +4512,13 @@
36704512
36714513 //assert(hashtable.isEmpty());
36724514
3673
- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3674
- {
3675
- //tab.user[i] = false;
3676
- copy.versions[i] = null;
3677
- }
4515
+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
4516
+// {
4517
+// //tab.user[i] = false;
4518
+// copy.versionlist[i] = null;
4519
+// }
36784520
3679
- SetUndoStates();
4521
+ SetVersionStates();
36804522
36814523 // test save
36824524 if (false)
....@@ -3699,39 +4541,76 @@
36994541
37004542 return !thesame;
37014543 }
3702
-
3703
- void CopyChanged(Object3D obj)
4544
+
4545
+ boolean flashIt = true;
4546
+
4547
+ void RefreshSelection()
37044548 {
3705
- SetUndoStates();
4549
+ Object3D selection = new Object3D();
4550
+
4551
+ for (int i = 0; i < objEditor.copy.selection.size(); i++)
4552
+ {
4553
+ Object3D elem = objEditor.copy.selection.elementAt(i);
4554
+
4555
+ Object3D obj = objEditor.copy.GetObject(elem.GetUUID());
4556
+
4557
+ if (obj == null)
4558
+ {
4559
+ objEditor.copy.selection.remove(i--);
4560
+ }
4561
+ else
4562
+ {
4563
+ selection.add(obj);
4564
+ objEditor.copy.selection.setElementAt(obj, i);
4565
+ }
4566
+ }
4567
+
4568
+ flashIt = false;
4569
+ GetTree().clearSelection();
4570
+ for (int i = 0; i < selection.size(); i++)
4571
+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
4572
+ flashIt = true;
4573
+
4574
+ //refreshContents(false);
4575
+ }
4576
+
4577
+ void CopyChanged(Object3D changed)
4578
+ {
4579
+ Object3D obj = (Object3D)Grafreed.clone(changed.versionlist[copy.versionindex]);
37064580
37074581 boolean temp = CameraPane.SWITCH;
37084582 CameraPane.SWITCH = false;
37094583
3710
- copy.ExtractBigData(versiontable);
4584
+ changed.ExtractBigData(Grafreed.grafreed.universe.versiontable);
37114585
3712
- copy.clear();
4586
+ changed.clear();
37134587
4588
+ changed.skyboxname = obj.skyboxname;
4589
+ changed.skyboxext = obj.skyboxext;
4590
+
37144591 for (int i=0; i<obj.Size(); i++)
37154592 {
3716
- copy.add(obj.get(i));
4593
+ changed.add(obj.get(i));
37174594 }
37184595
3719
- copy.RestoreBigData(versiontable);
4596
+ changed.RestoreBigData(Grafreed.grafreed.universe.versiontable);
37204597
37214598 CameraPane.SWITCH = temp;
37224599
4600
+ if (objEditor == this)
4601
+ RefreshSelection();
37234602 //assert(hashtable.isEmpty());
37244603
3725
- copy.Touch();
4604
+ objEditor.copy.Touch();
37264605
37274606 ResetModel();
3728
- copy.HardTouch(); // recompile?
4607
+ objEditor.copy.HardTouch(); // recompile?
37294608
37304609 cRadio ab;
3731
- for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
4610
+ for (java.util.Enumeration e = objEditor.buttonGroup.getElements(); e.hasMoreElements();)
37324611 {
37334612 ab = (cRadio)e.nextElement();
3734
- Object3D test = copy.GetObject(ab.object.GetUUID());
4613
+ Object3D test = objEditor.copy.GetObject(ab.object.GetUUID());
37354614 //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
37364615 if (test != null)
37374616 {
....@@ -3740,53 +4619,72 @@
37404619 }
37414620 }
37424621
3743
- refreshContents();
4622
+ objEditor.refreshContents(true);
37444623 }
37454624
3746
- cButton undoButton;
4625
+ cButton previousVersionButton;
37474626 cButton restoreButton;
37484627 cButton replaceButton;
3749
- cButton redoButton;
4628
+ cButton nextVersionButton;
4629
+ cButton saveVersionButton;
4630
+ cButton deleteVersionButton;
37504631
37514632 boolean muteSlider;
37524633
37534634 int VersionCount()
37544635 {
3755
- int count = 0;
3756
-
3757
- for (int i = copy.versions.length; --i >= 0;)
3758
- {
3759
- if (copy.versions[i] != null)
3760
- count++;
3761
- }
3762
-
3763
- return count;
4636
+ return copy.VersionCount();
37644637 }
37654638
3766
- void SetUndoStates()
4639
+ public cGridBag versionSliderPane;
4640
+
4641
+ void SetVersionStates()
37674642 {
3768
- cRadio tab = GetCurrentTab();
4643
+ //if (true)
4644
+ // return;
4645
+
4646
+ //cRadio tab = GetCurrentTab();
37694647
3770
- restoreButton.setEnabled(copy.versionindex != -1);
3771
- replaceButton.setEnabled(copy.versionindex != -1);
3772
-
3773
- undoButton.setEnabled(copy.versionindex > 0);
3774
- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3775
-
3776
- muteSlider = true;
3777
- versionSlider.setMaximum(VersionCount() - 1);
3778
- versionSlider.setInteger(copy.versionindex);
3779
- muteSlider = false;
4648
+ if (copy.versionindex == -2)
4649
+ {
4650
+ saveVersionButton.setEnabled(false);
4651
+ restoreButton.setEnabled(false);
4652
+ replaceButton.setEnabled(false);
4653
+ previousVersionButton.setEnabled(false);
4654
+ nextVersionButton.setEnabled(false);
4655
+ deleteVersionButton.setEnabled(false);
4656
+ versionSliderPane.setVisible(false);
4657
+ }
4658
+ else
4659
+ {
4660
+ restoreButton.setEnabled(copy.versionindex != -1);
4661
+ replaceButton.setEnabled(copy.versionindex != -1);
4662
+
4663
+ previousVersionButton.setEnabled(copy.versionindex > 0);
4664
+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4665
+
4666
+ deleteVersionButton.setEnabled(copy.versionindex != -1);
4667
+ //copy.versionlist[copy.versionindex + 1] != null);
4668
+
4669
+ muteSlider = true;
4670
+ versionSlider.setMinimum(0);
4671
+ versionSlider.setMaximum(VersionCount() - 1);
4672
+ versionSlider.setInteger(copy.versionindex);
4673
+ versionSlider.setEnabled(copy.versionindex != -1);
4674
+ muteSlider = false;
4675
+
4676
+ versionSliderPane.setVisible(true);
4677
+ }
37804678 }
37814679
3782
- public boolean Undo()
4680
+ public boolean PreviousVersion()
37834681 {
37844682 // Option?
37854683 Replace();
37864684
37874685 System.err.println("Undo");
37884686
3789
- cRadio tab = GetCurrentTab();
4687
+ //cRadio tab = GetCurrentTab();
37904688
37914689 if (copy.versionindex == 0)
37924690 {
....@@ -3809,7 +4707,9 @@
38094707
38104708 copy.versionindex -= 1;
38114709
3812
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4710
+ CopyChanged(copy);
4711
+
4712
+ SetVersionStates();
38134713
38144714 return true;
38154715 }
....@@ -3818,44 +4718,47 @@
38184718 {
38194719 System.err.println("Restore");
38204720
3821
- cRadio tab = GetCurrentTab();
4721
+ //cRadio tab = GetCurrentTab();
38224722
3823
- if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
4723
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
38244724 {
38254725 java.awt.Toolkit.getDefaultToolkit().beep();
38264726 return false;
38274727 }
38284728
3829
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4729
+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4730
+ CopyChanged(copy);
4731
+
4732
+ SetVersionStates();
38304733
38314734 return true;
38324735 }
38334736
38344737 public boolean Replace()
38354738 {
3836
- System.err.println("Replace");
4739
+ //System.err.println("Replace");
38374740
3838
- cRadio tab = GetCurrentTab();
4741
+ //cRadio tab = GetCurrentTab();
38394742
3840
- if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
4743
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
38414744 {
38424745 // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
38434746 return false;
38444747 }
38454748
3846
- copy.versions[copy.versionindex] = CompressCopy();
4749
+ copy.versionlist[copy.versionindex] = Duplicate(copy);
38474750
38484751 return true;
38494752 }
38504753
3851
- public void Redo()
4754
+ public void NextVersion()
38524755 {
38534756 // Option?
38544757 Replace();
38554758
3856
- cRadio tab = GetCurrentTab();
4759
+ //cRadio tab = GetCurrentTab();
38574760
3858
- if (copy.versions[copy.versionindex + 1] == null)
4761
+ if (copy.versionlist[copy.versionindex + 1] == null)
38594762 {
38604763 java.awt.Toolkit.getDefaultToolkit().beep();
38614764 return;
....@@ -3863,10 +4766,12 @@
38634766
38644767 copy.versionindex += 1;
38654768
3866
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4769
+ CopyChanged(copy);
38674770
38684771 //if (!tab.user[tab.versionindex])
38694772 // tab.graphs[tab.versionindex] = null;
4773
+
4774
+ SetVersionStates();
38704775 }
38714776
38724777 void ImportGFD()
....@@ -4060,6 +4965,12 @@
40604965 // else
40614966 // applySelf(true);
40624967 // }
4968
+
4969
+ boolean Equal(double a, double b)
4970
+ {
4971
+ return Math.abs(a - b) < 0.001;
4972
+ }
4973
+
40634974 void applySelf0(boolean name)
40644975 {
40654976 if (name)
....@@ -4077,7 +4988,7 @@
40774988 //copy.material = new cMaterial(copy.GetMaterial());
40784989
40794990 current.color = (float) colorField.getFloat();
4080
- current.modulation = (float) modulationField.getFloat();
4991
+ current.modulation = (float) saturationField.getFloat();
40814992 current.metalness = (float) metalnessField.getFloat();
40824993 current.diffuse = (float) diffuseField.getFloat();
40834994 current.specular = (float) specularField.getFloat();
....@@ -4097,6 +5008,7 @@
40975008 current.shadow = (float) shadowField.getFloat();
40985009 current.texture = (float) textureField.getFloat();
40995010 current.opacity = (float) opacityField.getFloat();
5011
+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
41005012 current.fakedepth = (float) fakedepthField.getFloat();
41015013 current.shadowbias = (float) shadowbiasField.getFloat();
41025014
....@@ -4109,29 +5021,54 @@
41095021 {
41105022 cMaterial mat = copy.material;
41115023
4112
- colorField.SetToolTipValue((mat.color));
4113
- modulationField.SetToolTipValue((mat.modulation));
4114
- metalnessField.SetToolTipValue((mat.metalness));
4115
- diffuseField.SetToolTipValue((mat.diffuse));
4116
- specularField.SetToolTipValue((mat.specular));
4117
- shininessField.SetToolTipValue((mat.shininess));
4118
- shiftField.SetToolTipValue((mat.shift));
4119
- ambientField.SetToolTipValue((mat.ambient));
4120
- lightareaField.SetToolTipValue((mat.lightarea));
4121
- diffusenessField.SetToolTipValue((mat.factor));
4122
- velvetField.SetToolTipValue((mat.velvet));
4123
- sheenField.SetToolTipValue((mat.sheen));
4124
- subsurfaceField.SetToolTipValue((mat.subsurface));
4125
- backlitField.SetToolTipValue((mat.bump));
4126
- anisoField.SetToolTipValue((mat.aniso));
4127
- anisoVField.SetToolTipValue((mat.anisoV));
4128
- cameraField.SetToolTipValue((mat.cameralight));
4129
- selfshadowField.SetToolTipValue((mat.diffuseness));
4130
- shadowField.SetToolTipValue((mat.shadow));
4131
- textureField.SetToolTipValue((mat.texture));
4132
- opacityField.SetToolTipValue((mat.opacity));
4133
- fakedepthField.SetToolTipValue((mat.fakedepth));
4134
- shadowbiasField.SetToolTipValue((mat.shadowbias));
5024
+ if (!Equal(colorField.getFloat(), mat.color))
5025
+ colorField.SetToolTipValue((mat.color));
5026
+ if (!Equal(saturationField.getFloat(), mat.modulation))
5027
+ saturationField.SetToolTipValue((mat.modulation));
5028
+ if (!Equal(metalnessField.getFloat(), mat.metalness))
5029
+ metalnessField.SetToolTipValue((mat.metalness));
5030
+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
5031
+ diffuseField.SetToolTipValue((mat.diffuse));
5032
+ if (!Equal(specularField.getFloat(), mat.specular))
5033
+ specularField.SetToolTipValue((mat.specular));
5034
+ if (!Equal(shininessField.getFloat(), mat.shininess))
5035
+ shininessField.SetToolTipValue((mat.shininess));
5036
+ if (!Equal(shiftField.getFloat(), mat.shift))
5037
+ shiftField.SetToolTipValue((mat.shift));
5038
+ if (!Equal(ambientField.getFloat(), mat.ambient))
5039
+ ambientField.SetToolTipValue((mat.ambient));
5040
+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
5041
+ lightareaField.SetToolTipValue((mat.lightarea));
5042
+ if (!Equal(diffusenessField.getFloat(), mat.factor))
5043
+ diffusenessField.SetToolTipValue((mat.factor));
5044
+ if (!Equal(velvetField.getFloat(), mat.velvet))
5045
+ velvetField.SetToolTipValue((mat.velvet));
5046
+ if (!Equal(sheenField.getFloat(), mat.sheen))
5047
+ sheenField.SetToolTipValue((mat.sheen));
5048
+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
5049
+ subsurfaceField.SetToolTipValue((mat.subsurface));
5050
+ if (!Equal(backlitField.getFloat(), mat.bump))
5051
+ backlitField.SetToolTipValue((mat.bump));
5052
+ if (!Equal(anisoField.getFloat(), mat.aniso))
5053
+ anisoField.SetToolTipValue((mat.aniso));
5054
+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
5055
+ anisoVField.SetToolTipValue((mat.anisoV));
5056
+ if (!Equal(cameraField.getFloat(), mat.cameralight))
5057
+ cameraField.SetToolTipValue((mat.cameralight));
5058
+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
5059
+ selfshadowField.SetToolTipValue((mat.diffuseness));
5060
+ if (!Equal(shadowField.getFloat(), mat.shadow))
5061
+ shadowField.SetToolTipValue((mat.shadow));
5062
+ if (!Equal(textureField.getFloat(), mat.texture))
5063
+ textureField.SetToolTipValue((mat.texture));
5064
+ if (!Equal(opacityField.getFloat(), mat.opacity))
5065
+ opacityField.SetToolTipValue((mat.opacity));
5066
+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
5067
+ parallaxField.SetToolTipValue((mat.parallax));
5068
+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
5069
+ fakedepthField.SetToolTipValue((mat.fakedepth));
5070
+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
5071
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
41355072 }
41365073
41375074 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
....@@ -4163,25 +5100,43 @@
41635100 }
41645101
41655102 cNumberSlider versionSlider;
5103
+ cNumberSlider versionField;
41665104
41675105 public void stateChanged(ChangeEvent e)
41685106 {
4169
- // assert(false);
5107
+ // assert(false);
41705108 if (e.getSource() == versionSlider)
41715109 {
41725110 if (muteSlider)
41735111 return;
41745112
5113
+ Replace();
5114
+
41755115 int version = versionSlider.getInteger();
41765116
4177
- if (copy.versions[version] != null)
5117
+ if (version != -1 && copy.versionlist[version] != null)
41785118 {
4179
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
5119
+ copy.versionindex = version;
5120
+ CopyChanged(copy);
5121
+ SetVersionStates();
41805122 }
41815123
41825124 return;
41835125 }
41845126
5127
+ if (e.getSource() == versionField)
5128
+ {
5129
+ int version = versionField.getInteger();
5130
+
5131
+ if (version != -1 && copy.versionindex != version && copy.versionlist[version] != null)
5132
+ {
5133
+ copy.versionindex = version;
5134
+ CopyChanged(copy);
5135
+ }
5136
+
5137
+ return;
5138
+ }
5139
+
41855140 if (freezematerial)
41865141 {
41875142 return;
....@@ -4216,6 +5171,12 @@
42165171 {
42175172 //System.out.println("stateChanged = " + this);
42185173 materialtouched = true;
5174
+
5175
+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
5176
+ {
5177
+ saturationField.setFloat(1);
5178
+ }
5179
+
42195180 applySelf();
42205181 //System.out.println("this = " + this);
42215182 //System.out.println("PARENT = " + parent);
....@@ -4265,7 +5226,7 @@
42655226 }
42665227
42675228 if (normalpushField != null)
4268
- copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
5229
+ copy.NORMALPUSH = (float)normalpushField.getFloat() / 100;
42695230 }
42705231
42715232 void SnapObject()
....@@ -4515,6 +5476,7 @@
45155476 {
45165477 if (GetTree() != null)
45175478 {
5479
+ GetTree().revalidate();
45185480 GetTree().repaint();
45195481 }
45205482
....@@ -4523,6 +5485,11 @@
45235485 ctrlPanel.validate(); // ? new
45245486 ctrlPanel.repaint();
45255487 }
5488
+
5489
+ if (previousVersionButton != null && copy.versionlist != null)
5490
+ SetVersionStates();
5491
+
5492
+ cameraView.requestFocusInWindow();
45265493 }
45275494
45285495 static TweenManager tweenManager = new TweenManager();
....@@ -4554,7 +5521,7 @@
45545521 // group = (Composite) group.get(0);
45555522 // }
45565523
4557
- System.out.println("makeSomething of " + thing);
5524
+ //System.out.println("makeSomething of " + thing);
45585525
45595526 /*
45605527 if (deselect && jList != null)
....@@ -4633,7 +5600,7 @@
46335600 void ResetModel()
46345601 {
46355602 //assert(copy instanceof Composite);
4636
- Object3D /*Composite*/ group = (Object3D /*Composite*/) copy;
5603
+ Object3D /*Composite*/ group = (Object3D /*Composite*/) objEditor.copy;
46375604
46385605 // necessary? group.selection = new Object3D(); // java.util.Vector();
46395606
....@@ -4644,14 +5611,14 @@
46445611 //group.refreshEditWindow();
46455612 //refreshContents();
46465613
4647
- if (copy.selection == null)
5614
+ if (objEditor.copy.selection == null)
46485615 {
4649
- copy.selection = new Object3D();
5616
+ objEditor.copy.selection = new Object3D();
46505617 }
46515618
4652
- for (int j = 0; j < copy.selection.size(); j++)
5619
+ for (int j = 0; j < objEditor.copy.selection.size(); j++)
46535620 {
4654
- Object3D item = copy.selection.get(j);
5621
+ Object3D item = objEditor.copy.selection.get(j);
46555622
46565623 if (item instanceof cGroup && ((cGroup) item).transientlink)
46575624 {
....@@ -4660,15 +5627,15 @@
46605627
46615628 if (item.count <= 1) // ??? == 0)
46625629 {
4663
- copy.selection.remove(item);
5630
+ objEditor.copy.selection.remove(item);
46645631 }
46655632 }
46665633
46675634 boolean first = true;
46685635
4669
- for (int i = copy.selection.size(); --i >= 0;)
5636
+ for (int i = objEditor.copy.selection.size(); --i >= 0;)
46705637 {
4671
- Object3D item = copy.selection.get(i);
5638
+ Object3D item = objEditor.copy.selection.get(i);
46725639
46735640 if (item instanceof cGroup && ((cGroup) item).transientlink)
46745641 {
....@@ -4853,6 +5820,8 @@
48535820 {
48545821 //readobj.deepCopySelf(copy);
48555822 copy.clear(); // june 2014
5823
+ copy.skyboxname = readobj.skyboxname;
5824
+ copy.skyboxext = readobj.skyboxext;
48565825 for (int i = 0; i < readobj.size(); i++)
48575826 {
48585827 Object3D child = readobj.get(i); // reserve(i);
....@@ -4904,13 +5873,17 @@
49045873 c.addChild(csg);
49055874 }
49065875
4907
- copy.versions = readobj.versions;
5876
+ copy.versionlist = readobj.versionlist;
49085877 copy.versionindex = readobj.versionindex;
5878
+ copy.versiontable = readobj.versiontable;
49095879
4910
- if (copy.versions == null)
5880
+ if (copy.versionlist == null)
49115881 {
4912
- copy.versions = new byte[100][];
5882
+ // Backward compatibility
5883
+ copy.versionlist = new Object3D[100];
49135884 copy.versionindex = -1;
5885
+
5886
+ //Save(true);
49145887 }
49155888
49165889 //? SetUndoStates();
....@@ -4925,7 +5898,7 @@
49255898 {
49265899 if (Grafreed.standAlone)
49275900 {
4928
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5901
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
49295902 browser.show();
49305903 String filename = browser.getFile();
49315904 if (filename != null && filename.length() > 0)
....@@ -5002,6 +5975,8 @@
50025975
50035976 void save()
50045977 {
5978
+ Replace();
5979
+
50055980 if (lastname == null)
50065981 {
50075982 return;
....@@ -5244,6 +6219,7 @@
52446219 ButtonGroup buttonGroup;
52456220
52466221 cGridBag toolboxPanel;
6222
+ cGridBag skyboxPanel;
52476223 cGridBag materialPanel;
52486224 cGridBag ctrlPanel;
52496225
....@@ -5255,6 +6231,7 @@
52556231 boolean materialFlushed;
52566232 Object3D latestObject;
52576233
6234
+ cGridBag transformPanel;
52586235 cGridBag XYZPanel;
52596236
52606237 JSplitPane gridPanel;
....@@ -5317,7 +6294,7 @@
53176294 JLabel colorLabel;
53186295 cNumberSlider colorField;
53196296 JLabel modulationLabel;
5320
- cNumberSlider modulationField;
6297
+ cNumberSlider saturationField;
53216298 JLabel metalnessLabel;
53226299 cNumberSlider metalnessField;
53236300 JLabel diffuseLabel;
....@@ -5348,6 +6325,7 @@
53486325 cNumberSlider anisoField;
53496326 JLabel anisoVLabel;
53506327 cNumberSlider anisoVField;
6328
+
53516329 JLabel cameraLabel;
53526330 cNumberSlider cameraField;
53536331 JLabel selfshadowLabel;
....@@ -5358,10 +6336,13 @@
53586336 cNumberSlider textureField;
53596337 JLabel opacityLabel;
53606338 cNumberSlider opacityField;
6339
+ JLabel parallaxLabel;
6340
+ cNumberSlider parallaxField;
53616341 JLabel fakedepthLabel;
53626342 cNumberSlider fakedepthField;
53636343 JLabel shadowbiasLabel;
53646344 cNumberSlider shadowbiasField;
6345
+
53656346 JLabel bumpLabel;
53666347 cNumberSlider bumpField;
53676348 JLabel noiseLabel;