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,6 +42,50 @@
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
+ }
4489
4590 public cGridBag GetSeparator()
4691 {
....@@ -53,7 +98,10 @@
5398 cButton GetButton(String name, boolean border)
5499 {
55100 ImageIcon icon = GetIcon(name);
56
- 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);
57105 }
58106
59107 cLabel GetLabel(String name, boolean border)
....@@ -74,12 +122,26 @@
74122 return new cCheckBox(icon, border);
75123 }
76124
77
- 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)
78128 {
129
+ javax.swing.ImageIcon iconCache = icons.get(name);
130
+ if (iconCache != null)
131
+ {
132
+ return iconCache;
133
+ }
134
+
79135 try
80136 {
81
- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
82
-
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
+
83145 // if (image.getWidth() > 48 && image.getHeight() > 48)
84146 // {
85147 // BufferedImage resized = new BufferedImage(48, 48, image.getType());
....@@ -93,10 +155,14 @@
93155 // }
94156
95157 javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
158
+
159
+ icons.put(name, icon);
160
+
96161 return icon;
97162 }
98163 catch (Exception e)
99164 {
165
+ //icons.put(name, null);
100166 return null;
101167 }
102168 }
....@@ -250,6 +316,8 @@
250316 objEditor.ctrlPanel.remove(setupPanel2);
251317 objEditor.ctrlPanel.remove(objectCommandsPanel);
252318 objEditor.ctrlPanel.remove(pushPanel);
319
+ if (versionPanel != null)
320
+ objEditor.ctrlPanel.remove(versionPanel);
253321 //objEditor.ctrlPanel.remove(fillPanel);
254322
255323 //Remove(normalpushField);
....@@ -296,11 +364,13 @@
296364 client = inClient;
297365 copy = client;
298366
299
- if (copy.versionlist == null)
300
- {
301
- copy.versionlist = new Object3D[100];
302
- copy.versionindex = -1;
303
- }
367
+// if (copy.versionlist == null)
368
+// {
369
+// copy.versionlist = new Object3D[100];
370
+// copy.versionindex = -1;
371
+//
372
+// callee.Save(true);
373
+// }
304374
305375 // "this" is not called: SetupUI2(objEditor);
306376 }
....@@ -315,12 +385,6 @@
315385 client = inClient;
316386 copy = client;
317387
318
- if (copy.versionlist == null)
319
- {
320
- copy.versionlist = new Object3D[100];
321
- copy.versionindex = -1;
322
- }
323
-
324388 SetupUI2(callee.GetEditor());
325389 }
326390
....@@ -342,7 +406,8 @@
342406 //parent = p;
343407
344408 GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
345
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
409
+ if (Globals.DEBUG)
410
+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
346411 //gd.setFullScreenWindow(this);
347412 //setResizable(false);
348413 //if (!isDisplayable())
....@@ -353,11 +418,13 @@
353418 copy = localCopy;
354419 copy.editWindow = this;
355420
356
- if (copy.versionlist == null)
357
- {
358
-// copy.versions = new byte[100][];
421
+// if (copy.versionlist == null)
422
+// {
423
+// copy.versionlist = new Object3D[100];
359424 // copy.versionindex = -1;
360
- }
425
+//
426
+// Save(true);
427
+// }
361428
362429 SetupMenu();
363430
....@@ -377,6 +444,9 @@
377444
378445 static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
379446
447
+ // This is to refresh the UI of the material panel.
448
+ boolean patchMaterial;
449
+
380450 void SetupMenu()
381451 {
382452 frame.setMenuBar(menuBar = new MenuBar());
....@@ -390,8 +460,11 @@
390460 importOBJItem.addActionListener(this);
391461 import3DSItem = menu.add(new MenuItem("3DS file..."));
392462 import3DSItem.addActionListener(this);
463
+ if (Globals.ADVANCED)
464
+ {
393465 importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
394466 importVRMLX3DItem.addActionListener(this);
467
+ }
395468 menu.add("-");
396469 importGFDItem = menu.add(new MenuItem("Grafreed file..."));
397470 importGFDItem.addActionListener(this);
....@@ -426,6 +499,8 @@
426499
427500 ChangeListener changeListener = new ChangeListener()
428501 {
502
+ //String name;
503
+
429504 public void stateChanged(ChangeEvent changeEvent)
430505 {
431506 // if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -444,7 +519,37 @@
444519 // EditSelection(false);
445520 // }
446521
447
- 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();
448553 }
449554 };
450555 objectPanel.addChangeListener(changeListener);
....@@ -466,6 +571,8 @@
466571
467572 toolboxPanel = new cGridBag().setVertical(true);
468573 //toolboxPanel.setName("Toolbox");
574
+
575
+ skyboxPanel = new cGridBag().setVertical(true);
469576
470577 materialPanel = new cGridBag().setVertical(false);
471578 //materialPanel.setName("Material");
....@@ -751,6 +858,7 @@
751858 boolean maximized;
752859
753860 cButton fullscreenLayout;
861
+ cButton expandedLayout;
754862
755863 void Minimize()
756864 {
....@@ -790,10 +898,12 @@
790898 cButton minButton;
791899 cButton maxButton;
792900 cButton fullButton;
901
+ cButton collapseButton;
902
+ cButton maximize3DButton;
793903
794904 void ToggleFullScreen()
795905 {
796
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
906
+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797907
798908 cameraView.ToggleFullScreen();
799909
....@@ -814,13 +924,13 @@
814924 // X frame.getContentPane().remove(/*"Center",*/bigThree);
815925 // X framePanel.add(bigThree);
816926 // X frame.getContentPane().add(/*"Center",*/framePanel);
817
- framePanel.setDividerLocation(46);
927
+// framePanel.setDividerLocation(46); // icons are 24x24
818928
819929 //frame.setVisible(true);
820
- radio.layout = keepButton;
930
+// radio.layout = keepButton;
821931 //theFrame = null;
822932 keepButton = null;
823
- radio.layout.doClick();
933
+// radio.layout.doClick();
824934
825935 } else
826936 {
....@@ -841,10 +951,10 @@
841951 // X frame.getContentPane().remove(/*"Center",*/framePanel);
842952 // X framePanel.remove(bigThree);
843953 // X frame.getContentPane().add(/*"Center",*/bigThree);
844
- framePanel.setDividerLocation(0);
954
+// framePanel.setDividerLocation(0);
845955
846
- radio.layout = fullscreenLayout;
847
- radio.layout.doClick();
956
+// radio.layout = fullscreenLayout;
957
+// radio.layout.doClick();
848958 //frame.setVisible(true);
849959 }
850960 frame.validate();
....@@ -852,23 +962,42 @@
852962 cameraView.requestFocusInWindow();
853963 }
854964
855
- private Object3D CompressCopy()
965
+ void CollapseToolbar()
966
+ {
967
+ framePanel.setDividerLocation(0);
968
+ //frame.validate();
969
+
970
+ cameraView.requestFocusInWindow();
971
+ }
972
+
973
+ private Object3D Duplicate(Object3D object)
856974 {
857975 boolean temp = CameraPane.SWITCH;
858976 CameraPane.SWITCH = false;
859977
860
- 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);
861982 // if (copy == client)
862983
863
- Object3D versions[] = copy.versionlist;
864
- copy.versionlist = 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;
988
+
989
+ Object3D parent = object.parent;
990
+ object.parent = null;
865991
866992 //byte[] compress = Compress(copy);
867
- Object3D compress = (Object3D)Grafreed.clone(copy);
993
+ Object3D compress = (Object3D)Grafreed.clone(object);
868994
869
- copy.versionlist = versions;
995
+ object.parent = parent;
870996
871
- copy.RestoreBigData(versiontable);
997
+ object.versionlist = versions;
998
+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
999
+
1000
+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
8721001
8731002 CameraPane.SWITCH = temp;
8741003
....@@ -1036,6 +1165,7 @@
10361165 cGridBag setupPanel2;
10371166 cGridBag objectCommandsPanel;
10381167 cGridBag pushPanel;
1168
+ cGridBag versionPanel;
10391169 cGridBag fillPanel;
10401170
10411171 JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
....@@ -1205,6 +1335,18 @@
12051335
12061336 namePanel = new cGridBag();
12071337
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
+
12081350 nameField = AddText(namePanel, copy.GetName());
12091351 namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
12101352 oe.ctrlPanel.add(namePanel);
....@@ -1218,14 +1360,14 @@
12181360
12191361 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12201362 liveCB.setToolTipText("Animate object");
1363
+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1364
+ markCB.setToolTipText("Set target transform");
12211365 selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12221366 selectableCB.setToolTipText("Make object selectable");
12231367 // Return();
12241368
12251369 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12261370 hideCB.setToolTipText("Hide object");
1227
- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1228
- markCB.setToolTipText("As animation target transform");
12291371
12301372 ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12311373
....@@ -1270,9 +1412,14 @@
12701412 oe.ctrlPanel.add(objectCommandsPanel);
12711413 oe.ctrlPanel.Return();
12721414
1273
- 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
12741416 normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1275
- //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
+ }
12761423
12771424 oe.ctrlPanel.Return();
12781425
....@@ -1427,22 +1574,9 @@
14271574
14281575 if (cam == null || !(copy.get(0) instanceof cGroup))
14291576 {
1430
- System.out.println("CREATE CAMERAS");
1431
- cams = new cTemplate();
1432
- cams.name = "Cameras";
1433
- copy.insertElementAt(cams, 0);
1434
- //cams.parent = copy;
1435
-
1436
- cam = new Camera(); // LA.newVector(3, 2, 1));
1437
- cams.addChild(cam);
1438
- cam = new Camera(1);
1439
- cams.addChild(cam);
1440
- cam = new Camera(2);
1441
- cams.addChild(cam);
1442
- cam = new Camera(3);
1443
- cams.addChild(cam);
1444
- cam = new Camera(4); // Light
1445
- cams.addChild(cam);
1577
+ if (Globals.DEBUG)
1578
+ System.out.println("CREATE CAMERAS");
1579
+ cams = CreateCameras();
14461580 } else
14471581 {
14481582 cams = (cGroup) copy.get(0);
....@@ -1508,6 +1642,45 @@
15081642 //frontView.object = copy;
15091643 //sideView.object = copy;
15101644
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
+
15111684 XYZPanel = new cGridBag().setVertical(true);
15121685 //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
15131686
....@@ -1517,6 +1690,9 @@
15171690 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
15181691 //XYZPanel.setName("XYZ");
15191692
1693
+ transformPanel.add(resetTransformPanel);
1694
+ transformPanel.add(XYZPanel);
1695
+
15201696 /*
15211697 gridPanel = new JPanel(); //new BorderLayout());
15221698 gridPanel.setLayout(new GridLayout(1, 2));
....@@ -1524,12 +1700,12 @@
15241700 gridPanel.add(cameraView);
15251701 gridPanel.add(XYZPanel);
15261702 */
1527
- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1528
- gridPanel.setContinuousLayout(true);
1529
- gridPanel.setOneTouchExpandable(true);
1530
- gridPanel.setDividerLocation(1.0);
1531
- gridPanel.setDividerSize(9);
1532
- 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);
15331709
15341710 // aConstraints.weighty = 0;
15351711 //System.out.println("THIS = " + this);
....@@ -1552,31 +1728,34 @@
15521728
15531729 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15541730 //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
+
15551739 objectPanel.add(materialPanel);
1556
- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1557
- objectPanel.setToolTipTextAt(0, "Material");
1740
+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
1741
+ objectPanel.setToolTipTextAt(2, "Material");
15581742
15591743 // JPanel north = new JPanel(new BorderLayout());
15601744 // north.setName("Edit");
15611745 // north.add(ctrlPanel, BorderLayout.NORTH);
15621746 // objectPanel.add(north);
15631747 objectPanel.add(editPanel);
1564
- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1565
- objectPanel.setToolTipTextAt(1, "Edit controls");
1748
+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1749
+ objectPanel.setToolTipTextAt(3, "Edit controls");
15661750
1567
- //if (Globals.ADVANCED)
1568
- objectPanel.add(infoPanel);
1569
- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1570
- objectPanel.setToolTipTextAt(2, "Information");
1751
+ objectPanel.add(transformPanel);
1752
+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1753
+ objectPanel.setToolTipTextAt(4, "TRS transform");
15711754
1572
- objectPanel.add(XYZPanel);
1573
- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1574
- objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1575
-
1576
- objectPanel.add(toolboxPanel);
1577
- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1578
- objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1579
-
1755
+ patchMaterial = true;
1756
+ cameraView.patchMaterial = this;
1757
+ objectPanel.setSelectedIndex(2);
1758
+
15801759 /*
15811760 aConstraints.gridx = 0;
15821761 aConstraints.gridwidth = 1;
....@@ -1607,11 +1786,108 @@
16071786
16081787 AddOptions(optionsPanel); //, aConstraints);
16091788
1610
- tabbedPane.add(optionsPanel);
1611
-
16121789 tabbedPane.add(FSPane = new cFileSystemPane(this));
16131790
1791
+ tabbedPane.add(optionsPanel);
1792
+
16141793 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
+ }
16151891
16161892 /*
16171893 cTree jTree = new cTree(null);
....@@ -1633,13 +1909,13 @@
16331909 jtp.add(tree);
16341910 */
16351911
1636
- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1637
- bigPanel.setContinuousLayout(true);
1638
- bigPanel.setOneTouchExpandable(true);
1639
- bigPanel.setDividerLocation(0.8);
1640
- bigPanel.setDividerSize(15);
1641
- bigPanel.setResizeWeight(0.15);
1642
- 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");
16431919
16441920 //bigPanel.setLayout(new BorderLayout());
16451921 //bigPanel.setSize(new Dimension(10,10));
....@@ -1683,6 +1959,23 @@
16831959 // aConstraints.gridheight = 1;
16841960
16851961 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
+
16861979 framePanel.setContinuousLayout(false);
16871980 framePanel.setOneTouchExpandable(false);
16881981 //.setDividerLocation(0.8);
....@@ -1692,7 +1985,7 @@
16921985
16931986 frame.getContentPane().setLayout(new BorderLayout());
16941987 /**/
1695
- JTabbedPane worldPane = new JTabbedPane();
1988
+ //JTabbedPane worldPane = new JTabbedPane();
16961989 //worldPane.add(bigPanel);
16971990 //worldPane.add(worldPanel);
16981991 /**/
....@@ -1706,7 +1999,7 @@
17061999
17072000 cameraView.requestFocusInWindow();
17082001
1709
- gridPanel.setDividerLocation(1.0);
2002
+// gridPanel.setDividerLocation(1.0);
17102003
17112004 frame.validate();
17122005
....@@ -1740,7 +2033,9 @@
17402033 void SetupMaterial(cGridBag materialpanel)
17412034 {
17422035 cGridBag presetpanel = new cGridBag().setVertical(true);
1743
- cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
2036
+
2037
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
2038
+ skin.setToolTipText("Skin");
17442039 skin.addMouseListener(new MouseAdapter()
17452040 {
17462041 public void mouseClicked(MouseEvent e)
....@@ -1750,7 +2045,15 @@
17502045
17512046 // Skin
17522047 colorField.setFloat(material.color);
1753
- saturationField.setFloat(material.modulation);
2048
+ float saturation = material.modulation;
2049
+
2050
+ if (!cameraView.Skinshader)
2051
+ {
2052
+ saturation /= 1.5;
2053
+ }
2054
+
2055
+ saturationField.setFloat(saturation);
2056
+
17542057 subsurfaceField.setFloat(material.subsurface);
17552058 selfshadowField.setFloat(material.diffuseness);
17562059 diffusenessField.setFloat(material.factor);
....@@ -1769,8 +2072,116 @@
17692072 });
17702073 presetpanel.add(skin);
17712074
1772
- cLabel rough2 = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1773
- rough2.addMouseListener(new MouseAdapter()
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()
17742185 {
17752186 public void mouseClicked(MouseEvent e)
17762187 {
....@@ -1784,31 +2195,296 @@
17842195 applySelf();
17852196 }
17862197 });
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
+ });
17872216 presetpanel.add(rough2);
17882217
1789
- presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
1790
- presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
1791
- presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
1792
- presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
1793
- presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
1794
- presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
1795
- presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
1796
- presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
1797
- presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
1798
- presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
1799
- presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
1800
- presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
1801
- presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
1802
- presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
1803
- presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
1804
- presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
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);
18052481
18062482 cGridBag panel = new cGridBag().setVertical(true);
18072483
18082484 presetpanel.preferredWidth = 1;
18092485
1810
- materialpanel.add(panel);
18112486 materialpanel.add(presetpanel);
2487
+ materialpanel.add(panel);
18122488
18132489 panel.preferredWidth = 8;
18142490
....@@ -1819,19 +2495,19 @@
18192495
18202496 cGridBag editBar = new cGridBag().setVertical(false);
18212497
1822
- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
2498
+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
18232499 createMaterialButton.setToolTipText("Create material");
18242500
18252501 /*
18262502 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
18272503 */
18282504
1829
- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
2505
+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
18302506 clearMaterialButton.setToolTipText("Clear material");
18312507
18322508 if (Globals.ADVANCED)
18332509 {
1834
- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
2510
+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
18352511 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
18362512 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
18372513 }
....@@ -1852,9 +2528,20 @@
18522528
18532529 cGridBag huepanel = new cGridBag();
18542530 cGridBag huelabel = new cGridBag();
1855
- skin = GetLabel("icons/hue.png", false);
1856
- skin.fit = true;
1857
- huelabel.add(skin);
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);
18582545 huelabel.preferredWidth = 20;
18592546 huepanel.add(new cGridBag()); // Label
18602547 huepanel.add(huelabel); // Field/slider
....@@ -2037,6 +2724,12 @@
20372724 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
20382725 colorSection.add(backlit);
20392726
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
+
20402733 //panel.add(new JSeparator());
20412734
20422735 //panel.add(globalSection);
....@@ -3088,6 +3781,7 @@
30883781 shadowField.setFloat(mat.shadow);
30893782 textureField.setFloat(mat.texture);
30903783 opacityField.setFloat(mat.opacity);
3784
+ parallaxField.setFloat(mat.parallax + 0.125f);
30913785 fakedepthField.setFloat(mat.fakedepth);
30923786 shadowbiasField.setFloat(mat.shadowbias);
30933787 bumpField.setInteger(1); // dec 2013
....@@ -3130,32 +3824,8 @@
31303824
31313825 if (multiplyToggle != null)
31323826 multiplyToggle.setSelected(mat.multiply);
3133
-
3134
- assert (object.projectedVertices != null);
3135
-
3136
- if (object.projectedVertices.length <= 2)
3137
- {
3138
- // Side effect...
3139
- Object3D.cVector2[] keep = object.projectedVertices;
3140
- object.projectedVertices = new Object3D.cVector2[3];
3141
- for (int i = 0; i < 3; i++)
3142
- {
3143
- if (i < keep.length)
3144
- {
3145
- object.projectedVertices[i] = keep[i];
3146
- } else
3147
- {
3148
- object.projectedVertices[i] = new Object3D.cVector2();
3149
- }
3150
- /*
3151
- if(keep.length == 0)
3152
- object.projectedVertices[0] = new Object3D.cVector2();
3153
- else
3154
- object.projectedVertices[0] = keep[0];
3155
- object.projectedVertices[1] = new Object3D.cVector2();
3156
- */
3157
- }
3158
- }
3827
+
3828
+ AllocProjectedVertices(object);
31593829
31603830 SetMaterial(mat, object.projectedVertices);
31613831 }
....@@ -3275,6 +3945,17 @@
32753945 public void itemStateChanged(ItemEvent event)
32763946 {
32773947 // 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
32783959 if (event.getSource() == propagateToggle)
32793960 {
32803961 propagate ^= true;
....@@ -3394,6 +4075,7 @@
33944075 } else if (event.getSource() == link2masterCB)
33954076 {
33964077 copy.link2master ^= true;
4078
+ objEditor.refreshContents();
33974079 return;
33984080 }
33994081 if (event.getSource() == randomCB)
....@@ -3454,7 +4136,7 @@
34544136 //System.out.println("ObjEditor " + event);
34554137 applySelf0(true);
34564138 //parent.applySelf();
3457
- objEditor.refreshContents();
4139
+ // conflicts with requestFocus objEditor.refreshContents();
34584140 } else if (source == resetButton)
34594141 {
34604142 CameraPane.fullreset = true;
....@@ -3634,11 +4316,18 @@
36344316
36354317 void New()
36364318 {
3637
- while (copy.Size() > 1)
4319
+ while (copy.Size() > 0)
36384320 {
3639
- copy.remove(1);
4321
+ copy.remove(0);
36404322 }
36414323
4324
+ copy.selection.clear();
4325
+
4326
+ if (copy == Grafreed.grafreed.universe)
4327
+ {
4328
+ CreateCameras();
4329
+ cameraView.SetCamera(GetCamera(copy, 0));
4330
+ }
36424331 ResetModel();
36434332 objEditor.refreshContents();
36444333 }
....@@ -3747,7 +4436,7 @@
37474436 {
37484437 //Save(true);
37494438 Replace();
3750
- SetUndoStates();
4439
+ SetVersionStates();
37514440 }
37524441
37534442 private boolean Equal(byte[] compress, byte[] name)
....@@ -3766,8 +4455,6 @@
37664455 return true;
37674456 }
37684457
3769
- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3770
-
37714458 void DeleteVersion()
37724459 {
37734460 for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -3775,19 +4462,27 @@
37754462 copy.versionlist[i] = copy.versionlist[i+1];
37764463 }
37774464
3778
- CopyChanged();
4465
+ if (copy.versionlist[copy.versionindex] == null)
4466
+ copy.versionindex -= 1;
37794467
3780
- SetUndoStates();
4468
+ if (copy.versionindex != -1)
4469
+ CopyChanged(copy);
4470
+
4471
+ SetVersionStates();
37814472 }
37824473
37834474 public boolean Save(boolean user)
37844475 {
37854476 System.err.println("Save");
3786
- //Replace();
4477
+ Replace();
37874478
3788
- cRadio tab = GetCurrentTab();
4479
+ if (copy.versionlist == null)
4480
+ {
4481
+ copy.versionlist = new Object3D[100];
4482
+ copy.versionindex = -1;
4483
+ }
37894484
3790
- Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
4485
+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
37914486
37924487 boolean thesame = false;
37934488
....@@ -3823,7 +4518,7 @@
38234518 // copy.versionlist[i] = null;
38244519 // }
38254520
3826
- SetUndoStates();
4521
+ SetVersionStates();
38274522
38284523 // test save
38294524 if (false)
....@@ -3853,20 +4548,20 @@
38534548 {
38544549 Object3D selection = new Object3D();
38554550
3856
- for (int i = 0; i < copy.selection.size(); i++)
4551
+ for (int i = 0; i < objEditor.copy.selection.size(); i++)
38574552 {
3858
- Object3D elem = copy.selection.elementAt(i);
4553
+ Object3D elem = objEditor.copy.selection.elementAt(i);
38594554
3860
- Object3D obj = copy.GetObject(elem.GetUUID());
4555
+ Object3D obj = objEditor.copy.GetObject(elem.GetUUID());
38614556
38624557 if (obj == null)
38634558 {
3864
- copy.selection.remove(i--);
4559
+ objEditor.copy.selection.remove(i--);
38654560 }
38664561 else
38674562 {
38684563 selection.add(obj);
3869
- copy.selection.setElementAt(obj, i);
4564
+ objEditor.copy.selection.setElementAt(obj, i);
38704565 }
38714566 }
38724567
....@@ -3879,44 +4574,43 @@
38794574 //refreshContents(false);
38804575 }
38814576
3882
- void CopyChanged()
4577
+ void CopyChanged(Object3D changed)
38834578 {
3884
- Object3D obj = copy.versionlist[copy.versionindex];
3885
-
3886
- SetUndoStates();
4579
+ Object3D obj = (Object3D)Grafreed.clone(changed.versionlist[copy.versionindex]);
38874580
38884581 boolean temp = CameraPane.SWITCH;
38894582 CameraPane.SWITCH = false;
38904583
3891
- copy.ExtractBigData(versiontable);
4584
+ changed.ExtractBigData(Grafreed.grafreed.universe.versiontable);
38924585
3893
- copy.clear();
4586
+ changed.clear();
38944587
3895
- copy.skyboxname = obj.skyboxname;
3896
- copy.skyboxext = obj.skyboxext;
4588
+ changed.skyboxname = obj.skyboxname;
4589
+ changed.skyboxext = obj.skyboxext;
38974590
38984591 for (int i=0; i<obj.Size(); i++)
38994592 {
3900
- copy.add(obj.get(i));
4593
+ changed.add(obj.get(i));
39014594 }
39024595
3903
- copy.RestoreBigData(versiontable);
4596
+ changed.RestoreBigData(Grafreed.grafreed.universe.versiontable);
39044597
39054598 CameraPane.SWITCH = temp;
39064599
3907
- RefreshSelection();
4600
+ if (objEditor == this)
4601
+ RefreshSelection();
39084602 //assert(hashtable.isEmpty());
39094603
3910
- copy.Touch();
4604
+ objEditor.copy.Touch();
39114605
39124606 ResetModel();
3913
- copy.HardTouch(); // recompile?
4607
+ objEditor.copy.HardTouch(); // recompile?
39144608
39154609 cRadio ab;
3916
- for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
4610
+ for (java.util.Enumeration e = objEditor.buttonGroup.getElements(); e.hasMoreElements();)
39174611 {
39184612 ab = (cRadio)e.nextElement();
3919
- Object3D test = copy.GetObject(ab.object.GetUUID());
4613
+ Object3D test = objEditor.copy.GetObject(ab.object.GetUUID());
39204614 //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
39214615 if (test != null)
39224616 {
....@@ -3925,7 +4619,7 @@
39254619 }
39264620 }
39274621
3928
- refreshContents(true);
4622
+ objEditor.refreshContents(true);
39294623 }
39304624
39314625 cButton previousVersionButton;
....@@ -3939,34 +4633,48 @@
39394633
39404634 int VersionCount()
39414635 {
3942
- int count = 0;
3943
-
3944
- for (int i = copy.versionlist.length; --i >= 0;)
3945
- {
3946
- if (copy.versionlist[i] != null)
3947
- count++;
3948
- }
3949
-
3950
- return count;
4636
+ return copy.VersionCount();
39514637 }
39524638
3953
- void SetUndoStates()
4639
+ public cGridBag versionSliderPane;
4640
+
4641
+ void SetVersionStates()
39544642 {
3955
- cRadio tab = GetCurrentTab();
4643
+ //if (true)
4644
+ // return;
4645
+
4646
+ //cRadio tab = GetCurrentTab();
39564647
3957
- restoreButton.setEnabled(true); // copy.versionindex != -1);
3958
- replaceButton.setEnabled(true); // copy.versionindex != -1);
3959
-
3960
- previousVersionButton.setEnabled(copy.versionindex > 0);
3961
- nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
3962
-
3963
- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
3964
- copy.versionlist[copy.versionindex + 1] != null);
3965
-
3966
- muteSlider = true;
3967
- versionSlider.setMaximum(VersionCount() - 1);
3968
- versionSlider.setInteger(copy.versionindex);
3969
- 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
+ }
39704678 }
39714679
39724680 public boolean PreviousVersion()
....@@ -3976,7 +4684,7 @@
39764684
39774685 System.err.println("Undo");
39784686
3979
- cRadio tab = GetCurrentTab();
4687
+ //cRadio tab = GetCurrentTab();
39804688
39814689 if (copy.versionindex == 0)
39824690 {
....@@ -3999,7 +4707,9 @@
39994707
40004708 copy.versionindex -= 1;
40014709
4002
- CopyChanged();
4710
+ CopyChanged(copy);
4711
+
4712
+ SetVersionStates();
40034713
40044714 return true;
40054715 }
....@@ -4008,7 +4718,7 @@
40084718 {
40094719 System.err.println("Restore");
40104720
4011
- cRadio tab = GetCurrentTab();
4721
+ //cRadio tab = GetCurrentTab();
40124722
40134723 if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
40144724 {
....@@ -4017,16 +4727,18 @@
40174727 }
40184728
40194729 //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4020
- CopyChanged();
4730
+ CopyChanged(copy);
4731
+
4732
+ SetVersionStates();
40214733
40224734 return true;
40234735 }
40244736
40254737 public boolean Replace()
40264738 {
4027
- System.err.println("Replace");
4739
+ //System.err.println("Replace");
40284740
4029
- cRadio tab = GetCurrentTab();
4741
+ //cRadio tab = GetCurrentTab();
40304742
40314743 if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
40324744 {
....@@ -4034,7 +4746,7 @@
40344746 return false;
40354747 }
40364748
4037
- copy.versionlist[copy.versionindex] = CompressCopy();
4749
+ copy.versionlist[copy.versionindex] = Duplicate(copy);
40384750
40394751 return true;
40404752 }
....@@ -4044,7 +4756,7 @@
40444756 // Option?
40454757 Replace();
40464758
4047
- cRadio tab = GetCurrentTab();
4759
+ //cRadio tab = GetCurrentTab();
40484760
40494761 if (copy.versionlist[copy.versionindex + 1] == null)
40504762 {
....@@ -4054,10 +4766,12 @@
40544766
40554767 copy.versionindex += 1;
40564768
4057
- CopyChanged();
4769
+ CopyChanged(copy);
40584770
40594771 //if (!tab.user[tab.versionindex])
40604772 // tab.graphs[tab.versionindex] = null;
4773
+
4774
+ SetVersionStates();
40614775 }
40624776
40634777 void ImportGFD()
....@@ -4251,6 +4965,12 @@
42514965 // else
42524966 // applySelf(true);
42534967 // }
4968
+
4969
+ boolean Equal(double a, double b)
4970
+ {
4971
+ return Math.abs(a - b) < 0.001;
4972
+ }
4973
+
42544974 void applySelf0(boolean name)
42554975 {
42564976 if (name)
....@@ -4288,6 +5008,7 @@
42885008 current.shadow = (float) shadowField.getFloat();
42895009 current.texture = (float) textureField.getFloat();
42905010 current.opacity = (float) opacityField.getFloat();
5011
+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
42915012 current.fakedepth = (float) fakedepthField.getFloat();
42925013 current.shadowbias = (float) shadowbiasField.getFloat();
42935014
....@@ -4300,29 +5021,54 @@
43005021 {
43015022 cMaterial mat = copy.material;
43025023
4303
- colorField.SetToolTipValue((mat.color));
4304
- saturationField.SetToolTipValue((mat.modulation));
4305
- metalnessField.SetToolTipValue((mat.metalness));
4306
- diffuseField.SetToolTipValue((mat.diffuse));
4307
- specularField.SetToolTipValue((mat.specular));
4308
- shininessField.SetToolTipValue((mat.shininess));
4309
- shiftField.SetToolTipValue((mat.shift));
4310
- ambientField.SetToolTipValue((mat.ambient));
4311
- lightareaField.SetToolTipValue((mat.lightarea));
4312
- diffusenessField.SetToolTipValue((mat.factor));
4313
- velvetField.SetToolTipValue((mat.velvet));
4314
- sheenField.SetToolTipValue((mat.sheen));
4315
- subsurfaceField.SetToolTipValue((mat.subsurface));
4316
- backlitField.SetToolTipValue((mat.bump));
4317
- anisoField.SetToolTipValue((mat.aniso));
4318
- anisoVField.SetToolTipValue((mat.anisoV));
4319
- cameraField.SetToolTipValue((mat.cameralight));
4320
- selfshadowField.SetToolTipValue((mat.diffuseness));
4321
- shadowField.SetToolTipValue((mat.shadow));
4322
- textureField.SetToolTipValue((mat.texture));
4323
- opacityField.SetToolTipValue((mat.opacity));
4324
- fakedepthField.SetToolTipValue((mat.fakedepth));
4325
- 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));
43265072 }
43275073
43285074 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
....@@ -4354,26 +5100,43 @@
43545100 }
43555101
43565102 cNumberSlider versionSlider;
5103
+ cNumberSlider versionField;
43575104
43585105 public void stateChanged(ChangeEvent e)
43595106 {
4360
- // assert(false);
5107
+ // assert(false);
43615108 if (e.getSource() == versionSlider)
43625109 {
43635110 if (muteSlider)
43645111 return;
43655112
5113
+ Replace();
5114
+
43665115 int version = versionSlider.getInteger();
43675116
4368
- if (copy.versionlist[version] != null)
5117
+ if (version != -1 && copy.versionlist[version] != null)
43695118 {
43705119 copy.versionindex = version;
4371
- CopyChanged();
5120
+ CopyChanged(copy);
5121
+ SetVersionStates();
43725122 }
43735123
43745124 return;
43755125 }
43765126
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
+
43775140 if (freezematerial)
43785141 {
43795142 return;
....@@ -4409,7 +5172,7 @@
44095172 //System.out.println("stateChanged = " + this);
44105173 materialtouched = true;
44115174
4412
- if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
5175
+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
44135176 {
44145177 saturationField.setFloat(1);
44155178 }
....@@ -4463,7 +5226,7 @@
44635226 }
44645227
44655228 if (normalpushField != null)
4466
- copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
5229
+ copy.NORMALPUSH = (float)normalpushField.getFloat() / 100;
44675230 }
44685231
44695232 void SnapObject()
....@@ -4724,7 +5487,9 @@
47245487 }
47255488
47265489 if (previousVersionButton != null && copy.versionlist != null)
4727
- SetUndoStates();
5490
+ SetVersionStates();
5491
+
5492
+ cameraView.requestFocusInWindow();
47285493 }
47295494
47305495 static TweenManager tweenManager = new TweenManager();
....@@ -4756,7 +5521,7 @@
47565521 // group = (Composite) group.get(0);
47575522 // }
47585523
4759
- System.out.println("makeSomething of " + thing);
5524
+ //System.out.println("makeSomething of " + thing);
47605525
47615526 /*
47625527 if (deselect && jList != null)
....@@ -4835,7 +5600,7 @@
48355600 void ResetModel()
48365601 {
48375602 //assert(copy instanceof Composite);
4838
- Object3D /*Composite*/ group = (Object3D /*Composite*/) copy;
5603
+ Object3D /*Composite*/ group = (Object3D /*Composite*/) objEditor.copy;
48395604
48405605 // necessary? group.selection = new Object3D(); // java.util.Vector();
48415606
....@@ -4846,14 +5611,14 @@
48465611 //group.refreshEditWindow();
48475612 //refreshContents();
48485613
4849
- if (copy.selection == null)
5614
+ if (objEditor.copy.selection == null)
48505615 {
4851
- copy.selection = new Object3D();
5616
+ objEditor.copy.selection = new Object3D();
48525617 }
48535618
4854
- for (int j = 0; j < copy.selection.size(); j++)
5619
+ for (int j = 0; j < objEditor.copy.selection.size(); j++)
48555620 {
4856
- Object3D item = copy.selection.get(j);
5621
+ Object3D item = objEditor.copy.selection.get(j);
48575622
48585623 if (item instanceof cGroup && ((cGroup) item).transientlink)
48595624 {
....@@ -4862,15 +5627,15 @@
48625627
48635628 if (item.count <= 1) // ??? == 0)
48645629 {
4865
- copy.selection.remove(item);
5630
+ objEditor.copy.selection.remove(item);
48665631 }
48675632 }
48685633
48695634 boolean first = true;
48705635
4871
- for (int i = copy.selection.size(); --i >= 0;)
5636
+ for (int i = objEditor.copy.selection.size(); --i >= 0;)
48725637 {
4873
- Object3D item = copy.selection.get(i);
5638
+ Object3D item = objEditor.copy.selection.get(i);
48745639
48755640 if (item instanceof cGroup && ((cGroup) item).transientlink)
48765641 {
....@@ -5110,11 +5875,15 @@
51105875
51115876 copy.versionlist = readobj.versionlist;
51125877 copy.versionindex = readobj.versionindex;
5878
+ copy.versiontable = readobj.versiontable;
51135879
51145880 if (copy.versionlist == null)
51155881 {
5882
+ // Backward compatibility
51165883 copy.versionlist = new Object3D[100];
51175884 copy.versionindex = -1;
5885
+
5886
+ //Save(true);
51185887 }
51195888
51205889 //? SetUndoStates();
....@@ -5206,6 +5975,8 @@
52065975
52075976 void save()
52085977 {
5978
+ Replace();
5979
+
52095980 if (lastname == null)
52105981 {
52115982 return;
....@@ -5448,6 +6219,7 @@
54486219 ButtonGroup buttonGroup;
54496220
54506221 cGridBag toolboxPanel;
6222
+ cGridBag skyboxPanel;
54516223 cGridBag materialPanel;
54526224 cGridBag ctrlPanel;
54536225
....@@ -5459,6 +6231,7 @@
54596231 boolean materialFlushed;
54606232 Object3D latestObject;
54616233
6234
+ cGridBag transformPanel;
54626235 cGridBag XYZPanel;
54636236
54646237 JSplitPane gridPanel;
....@@ -5552,6 +6325,7 @@
55526325 cNumberSlider anisoField;
55536326 JLabel anisoVLabel;
55546327 cNumberSlider anisoVField;
6328
+
55556329 JLabel cameraLabel;
55566330 cNumberSlider cameraField;
55576331 JLabel selfshadowLabel;
....@@ -5562,10 +6336,13 @@
55626336 cNumberSlider textureField;
55636337 JLabel opacityLabel;
55646338 cNumberSlider opacityField;
6339
+ JLabel parallaxLabel;
6340
+ cNumberSlider parallaxField;
55656341 JLabel fakedepthLabel;
55666342 cNumberSlider fakedepthField;
55676343 JLabel shadowbiasLabel;
55686344 cNumberSlider shadowbiasField;
6345
+
55696346 JLabel bumpLabel;
55706347 cNumberSlider bumpField;
55716348 JLabel noiseLabel;