Normand Briere
2019-08-18 480ad70047e54b2b92f974e6c2ac5a6c0bdc5a5c
ObjEditor.java
....@@ -34,6 +34,7 @@
3434 iSendInfo
3535 //KeyListener
3636 {
37
+ public cToggleButton pinButton;
3738 boolean timeline;
3839 boolean wasFullScreen;
3940
....@@ -41,64 +42,137 @@
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 {
47
- try
48
- {
49
- ImageIcon icon = GetIcon(name);
100
+ ImageIcon icon = GetIcon(name);
101
+ if (icon != null || name.contains("/"))
50102 return new cButton(icon, border);
51
- }
52
- catch (Exception e)
53
- {
103
+ else
54104 return new cButton(name, border);
55
- }
105
+ }
106
+
107
+ cLabel GetLabel(String name, boolean border)
108
+ {
109
+ //ImageIcon icon = GetIcon(name);
110
+ return new cLabel(GetImage(name), border);
56111 }
57112
58113 cToggleButton GetToggleButton(String name, boolean border)
59114 {
60
- try
61
- {
62
- ImageIcon icon = GetIcon(name);
63
- return new cToggleButton(icon, border);
64
- }
65
- catch (Exception e)
66
- {
67
- return new cToggleButton(name, border);
68
- }
115
+ ImageIcon icon = GetIcon(name);
116
+ return new cToggleButton(icon, border);
69117 }
70118
71119 cCheckBox GetCheckBox(String name, boolean border)
72120 {
121
+ ImageIcon icon = GetIcon(name);
122
+ return new cCheckBox(icon, border);
123
+ }
124
+
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)
128
+ {
129
+ javax.swing.ImageIcon iconCache = icons.get(name);
130
+ if (iconCache != null)
131
+ {
132
+ return iconCache;
133
+ }
134
+
73135 try
74136 {
75
- ImageIcon icon = GetIcon(name);
76
- return new cCheckBox(icon, border);
137
+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
138
+
139
+// if (image.getWidth() > 48 && image.getHeight() > 48)
140
+// {
141
+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
142
+// Graphics2D g = resized.createGraphics();
143
+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
144
+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
145
+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
146
+// g.dispose();
147
+//
148
+// image = resized;
149
+// }
150
+
151
+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
152
+
153
+ icons.put(name, icon);
154
+
155
+ return icon;
77156 }
78157 catch (Exception e)
79158 {
80
- return new cCheckBox(name, border);
159
+ //icons.put(name, null);
160
+ return null;
81161 }
82162 }
83
-
84
- private ImageIcon GetIcon(String name) throws IOException
163
+
164
+ BufferedImage GetImage(String name)
85165 {
86
- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87
-
88
- if (image.getWidth() != 24 && image.getHeight() != 24)
166
+ try
89167 {
90
- BufferedImage resized = new BufferedImage(24, 24, image.getType());
91
- Graphics2D g = resized.createGraphics();
92
- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93
- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94
- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95
- g.dispose();
96
-
97
- image = resized;
168
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
169
+
170
+ return image;
98171 }
99
-
100
- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101
- return icon;
172
+ catch (Exception e)
173
+ {
174
+ return null;
175
+ }
102176 }
103177
104178 // SCRIPT
....@@ -282,11 +356,13 @@
282356 client = inClient;
283357 copy = client;
284358
285
- if (copy.versions == null)
286
- {
287
- copy.versions = new byte[100][];
288
- copy.versionindex = -1;
289
- }
359
+// if (copy.versionlist == null)
360
+// {
361
+// copy.versionlist = new Object3D[100];
362
+// copy.versionindex = -1;
363
+//
364
+// callee.Save(true);
365
+// }
290366
291367 // "this" is not called: SetupUI2(objEditor);
292368 }
....@@ -301,10 +377,12 @@
301377 client = inClient;
302378 copy = client;
303379
304
- if (copy.versions == null)
380
+ if (copy.versionlist == null)
305381 {
306
- copy.versions = new byte[100][];
382
+ copy.versionlist = new Object3D[100];
307383 copy.versionindex = -1;
384
+
385
+// Save(true);
308386 }
309387
310388 SetupUI2(callee.GetEditor());
....@@ -328,7 +406,8 @@
328406 //parent = p;
329407
330408 GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
331
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
409
+ if (Globals.DEBUG)
410
+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
332411 //gd.setFullScreenWindow(this);
333412 //setResizable(false);
334413 //if (!isDisplayable())
....@@ -339,11 +418,13 @@
339418 copy = localCopy;
340419 copy.editWindow = this;
341420
342
- if (copy.versions == null)
343
- {
344
- copy.versions = new byte[100][];
345
- copy.versionindex = -1;
346
- }
421
+// if (copy.versionlist == null)
422
+// {
423
+// copy.versionlist = new Object3D[100];
424
+// copy.versionindex = -1;
425
+//
426
+// Save(true);
427
+// }
347428
348429 SetupMenu();
349430
....@@ -363,6 +444,9 @@
363444
364445 static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
365446
447
+ // This is to refresh the UI of the material panel.
448
+ boolean patchMaterial;
449
+
366450 void SetupMenu()
367451 {
368452 frame.setMenuBar(menuBar = new MenuBar());
....@@ -412,6 +496,8 @@
412496
413497 ChangeListener changeListener = new ChangeListener()
414498 {
499
+ //String name;
500
+
415501 public void stateChanged(ChangeEvent changeEvent)
416502 {
417503 // if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -430,18 +516,49 @@
430516 // EditSelection(false);
431517 // }
432518
433
- refreshContents(false); // To refresh Info tab
519
+// if (objectPanel.getSelectedIndex() == 4)
520
+// {
521
+// name = copy.skyboxname;
522
+//
523
+// if (name == null)
524
+// {
525
+// name = "";
526
+// }
527
+//
528
+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
529
+// copy.skyboxext = "jpg";
530
+// }
531
+// else
532
+// {
533
+// if (name != null)
534
+// {
535
+// if (name.equals(""))
536
+// {
537
+// copy.skyboxname = null;
538
+// copy.skyboxext = null;
539
+// }
540
+// else
541
+// {
542
+// copy.skyboxname = name;
543
+// }
544
+// }
545
+// }
546
+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
547
+
548
+// refreshContents(false); // To refresh Info tab
549
+ cameraView.repaint();
434550 }
435551 };
436552 objectPanel.addChangeListener(changeListener);
437553
438554 toolbarPanel = new JPanel();
439555 toolbarPanel.setName("Toolbar");
556
+
440557 treePanel = new cGridBag();
441558 treePanel.setName("Tree");
442559
443560 editPanel = new cGridBag().setVertical(true);
444
- editPanel.setName("Edit");
561
+ //editPanel.setName("Edit");
445562
446563 ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
447564
....@@ -449,11 +566,13 @@
449566 editPanel.add(editCommandsPanel);
450567 editPanel.add(ctrlPanel);
451568
452
- toolboxPanel = new cGridBag().setVertical(false);
453
- toolboxPanel.setName("Toolbox");
569
+ toolboxPanel = new cGridBag().setVertical(true);
570
+ //toolboxPanel.setName("Toolbox");
454571
455
- materialPanel = new cGridBag().setVertical(true);
456
- materialPanel.setName("Material");
572
+ skyboxPanel = new cGridBag().setVertical(true);
573
+
574
+ materialPanel = new cGridBag().setVertical(false);
575
+ //materialPanel.setName("Material");
457576
458577 /*JTextPane*/
459578 infoarea = createTextPane();
....@@ -461,6 +580,7 @@
461580
462581 infoarea.setEditable(true);
463582 SetText();
583
+
464584 // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
465585 // infoarea.setOpaque(false);
466586 // //infoarea.setForeground(textcolor);
....@@ -468,7 +588,7 @@
468588 // TEXTAREA infoarea.setWrapStyleWord(true);
469589 infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
470590 infoPanel.setPreferredSize(new Dimension(1, 1));
471
- infoPanel.setName("Info");
591
+ //infoPanel.setName("Info");
472592 //infoPanel.setLayout(new BorderLayout());
473593 //infoPanel.add(createTextPane());
474594
....@@ -735,6 +855,7 @@
735855 boolean maximized;
736856
737857 cButton fullscreenLayout;
858
+ cButton expandedLayout;
738859
739860 void Minimize()
740861 {
....@@ -774,10 +895,12 @@
774895 cButton minButton;
775896 cButton maxButton;
776897 cButton fullButton;
898
+ cButton collapseButton;
899
+ cButton maximize3DButton;
777900
778901 void ToggleFullScreen()
779902 {
780
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
903
+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
781904
782905 cameraView.ToggleFullScreen();
783906
....@@ -798,13 +921,13 @@
798921 // X frame.getContentPane().remove(/*"Center",*/bigThree);
799922 // X framePanel.add(bigThree);
800923 // X frame.getContentPane().add(/*"Center",*/framePanel);
801
- framePanel.setDividerLocation(46);
924
+// framePanel.setDividerLocation(46); // icons are 24x24
802925
803926 //frame.setVisible(true);
804
- radio.layout = keepButton;
927
+// radio.layout = keepButton;
805928 //theFrame = null;
806929 keepButton = null;
807
- radio.layout.doClick();
930
+// radio.layout.doClick();
808931
809932 } else
810933 {
....@@ -825,31 +948,53 @@
825948 // X frame.getContentPane().remove(/*"Center",*/framePanel);
826949 // X framePanel.remove(bigThree);
827950 // X frame.getContentPane().add(/*"Center",*/bigThree);
828
- framePanel.setDividerLocation(0);
951
+// framePanel.setDividerLocation(0);
829952
830
- radio.layout = fullscreenLayout;
831
- radio.layout.doClick();
953
+// radio.layout = fullscreenLayout;
954
+// radio.layout.doClick();
832955 //frame.setVisible(true);
833956 }
834957 frame.validate();
958
+
959
+ cameraView.requestFocusInWindow();
835960 }
836961
837
- private byte[] CompressCopy()
962
+ void CollapseToolbar()
963
+ {
964
+ framePanel.setDividerLocation(0);
965
+ //frame.validate();
966
+
967
+ cameraView.requestFocusInWindow();
968
+ }
969
+
970
+ private Object3D Duplicate(Object3D object)
838971 {
839972 boolean temp = CameraPane.SWITCH;
840973 CameraPane.SWITCH = false;
841974
842
- copy.ExtractBigData(versiontable);
975
+ if (Grafreed.grafreed.universe.versiontable == null)
976
+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
977
+
978
+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
843979 // if (copy == client)
844980
845
- byte[] versions[] = copy.versions;
846
- copy.versions = null;
981
+ Object3D versions[] = object.versionlist;
982
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
983
+ object.versionlist = null;
984
+ object.versiontable = null;
847985
848
- byte[] compress = Compress(copy);
986
+ Object3D parent = object.parent;
987
+ object.parent = null;
849988
850
- copy.versions = versions;
989
+ //byte[] compress = Compress(copy);
990
+ Object3D compress = (Object3D)Grafreed.clone(object);
851991
852
- copy.RestoreBigData(versiontable);
992
+ object.parent = parent;
993
+
994
+ object.versionlist = versions;
995
+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
996
+
997
+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
853998
854999 CameraPane.SWITCH = temp;
8551000
....@@ -977,6 +1122,7 @@
9771122 {
9781123 SetupMaterial(materialPanel);
9791124 }
1125
+
9801126 //SetupName();
9811127 //SetupViews();
9821128 }
....@@ -986,7 +1132,7 @@
9861132 // NumberSlider vDivsField;
9871133 // JCheckBox endcaps;
9881134 JCheckBox liveCB;
989
- JCheckBox selectCB;
1135
+ JCheckBox selectableCB;
9901136 JCheckBox hideCB;
9911137 JCheckBox link2masterCB;
9921138 JCheckBox markCB;
....@@ -1185,6 +1331,18 @@
11851331
11861332 namePanel = new cGridBag();
11871333
1334
+ //if (copy.pinned)
1335
+ {
1336
+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
1337
+ pinButton.setSelected(copy.pinned);
1338
+ cGridBag t = new cGridBag();
1339
+ t.preferredWidth = 2;
1340
+ t.add(pinButton);
1341
+ namePanel.add(t);
1342
+
1343
+ pinButton.addItemListener(this);
1344
+ }
1345
+
11881346 nameField = AddText(namePanel, copy.GetName());
11891347 namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
11901348 oe.ctrlPanel.add(namePanel);
....@@ -1198,13 +1356,16 @@
11981356
11991357 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12001358 liveCB.setToolTipText("Animate object");
1201
- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1202
- selectCB.setToolTipText("Make object selectable");
1359
+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1360
+ markCB.setToolTipText("Set target transform");
1361
+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1362
+ selectableCB.setToolTipText("Make object selectable");
12031363 // Return();
1364
+
12041365 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12051366 hideCB.setToolTipText("Hide object");
1206
- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1207
- markCB.setToolTipText("As animation target transform");
1367
+
1368
+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12081369
12091370 setupPanel2 = new cGridBag().setVertical(false);
12101371
....@@ -1404,22 +1565,9 @@
14041565
14051566 if (cam == null || !(copy.get(0) instanceof cGroup))
14061567 {
1407
- System.out.println("CREATE CAMERAS");
1408
- cams = new cTemplate();
1409
- cams.name = "Cameras";
1410
- copy.insertElementAt(cams, 0);
1411
- //cams.parent = copy;
1412
-
1413
- cam = new Camera(); // LA.newVector(3, 2, 1));
1414
- cams.addChild(cam);
1415
- cam = new Camera(1);
1416
- cams.addChild(cam);
1417
- cam = new Camera(2);
1418
- cams.addChild(cam);
1419
- cam = new Camera(3);
1420
- cams.addChild(cam);
1421
- cam = new Camera(4); // Light
1422
- cams.addChild(cam);
1568
+ if (Globals.DEBUG)
1569
+ System.out.println("CREATE CAMERAS");
1570
+ cams = CreateCameras();
14231571 } else
14241572 {
14251573 cams = (cGroup) copy.get(0);
....@@ -1485,6 +1633,45 @@
14851633 //frontView.object = copy;
14861634 //sideView.object = copy;
14871635
1636
+ transformPanel = new cGridBag().setVertical(true);
1637
+
1638
+ cGridBag resetTransformPanel = new cGridBag();
1639
+
1640
+ resetTransformPanel.preferredHeight = 2;
1641
+
1642
+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
1643
+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
1644
+ resetTransform.addMouseListener(new MouseAdapter()
1645
+ {
1646
+ public void mouseClicked(MouseEvent e)
1647
+ {
1648
+ ResetTransform();
1649
+ }
1650
+ });
1651
+ resetTransformPanel.add(resetTransform);
1652
+
1653
+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
1654
+ resetTransform.setToolTipText("Reset Translation only");
1655
+ resetTransform.addMouseListener(new MouseAdapter()
1656
+ {
1657
+ public void mouseClicked(MouseEvent e)
1658
+ {
1659
+ ResetTransform(1);
1660
+ }
1661
+ });
1662
+ resetTransformPanel.add(resetTransform);
1663
+
1664
+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
1665
+ resetTransform.setToolTipText("Reset Rotation and Scale only");
1666
+ resetTransform.addMouseListener(new MouseAdapter()
1667
+ {
1668
+ public void mouseClicked(MouseEvent e)
1669
+ {
1670
+ ResetTransform(2);
1671
+ }
1672
+ });
1673
+ resetTransformPanel.add(resetTransform);
1674
+
14881675 XYZPanel = new cGridBag().setVertical(true);
14891676 //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
14901677
....@@ -1492,7 +1679,11 @@
14921679 XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
14931680 XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
14941681 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1682
+ //XYZPanel.setName("XYZ");
14951683
1684
+ transformPanel.add(resetTransformPanel);
1685
+ transformPanel.add(XYZPanel);
1686
+
14961687 /*
14971688 gridPanel = new JPanel(); //new BorderLayout());
14981689 gridPanel.setLayout(new GridLayout(1, 2));
....@@ -1500,12 +1691,12 @@
15001691 gridPanel.add(cameraView);
15011692 gridPanel.add(XYZPanel);
15021693 */
1503
- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1504
- gridPanel.setContinuousLayout(true);
1505
- gridPanel.setOneTouchExpandable(true);
1506
- gridPanel.setDividerLocation(1.0);
1507
- gridPanel.setDividerSize(9);
1508
- gridPanel.setResizeWeight(0.85);
1694
+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1695
+// gridPanel.setContinuousLayout(true);
1696
+// gridPanel.setOneTouchExpandable(true);
1697
+// gridPanel.setDividerLocation(1.0);
1698
+// gridPanel.setDividerSize(9);
1699
+// gridPanel.setResizeWeight(0.85);
15091700
15101701 // aConstraints.weighty = 0;
15111702 //System.out.println("THIS = " + this);
....@@ -1528,18 +1719,34 @@
15281719
15291720 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15301721 //tmp.setName("Edit");
1722
+ objectPanel.add(skyboxPanel);
1723
+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
1724
+ objectPanel.setToolTipTextAt(0, "Backgrounds");
1725
+
1726
+ objectPanel.add(toolboxPanel);
1727
+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1728
+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1729
+
15311730 objectPanel.add(materialPanel);
1731
+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
1732
+ objectPanel.setToolTipTextAt(2, "Material");
1733
+
15321734 // JPanel north = new JPanel(new BorderLayout());
15331735 // north.setName("Edit");
15341736 // north.add(ctrlPanel, BorderLayout.NORTH);
15351737 // objectPanel.add(north);
15361738 objectPanel.add(editPanel);
1739
+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1740
+ objectPanel.setToolTipTextAt(3, "Edit controls");
15371741
1538
- //if (Globals.ADVANCED)
1539
- objectPanel.add(infoPanel);
1742
+ objectPanel.add(transformPanel);
1743
+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1744
+ objectPanel.setToolTipTextAt(4, "TRS transform");
15401745
1541
- objectPanel.add(toolboxPanel);
1542
-
1746
+ patchMaterial = true;
1747
+ cameraView.patchMaterial = this;
1748
+ objectPanel.setSelectedIndex(2);
1749
+
15431750 /*
15441751 aConstraints.gridx = 0;
15451752 aConstraints.gridwidth = 1;
....@@ -1570,11 +1777,51 @@
15701777
15711778 AddOptions(optionsPanel); //, aConstraints);
15721779
1573
- tabbedPane.add(optionsPanel);
1574
-
15751780 tabbedPane.add(FSPane = new cFileSystemPane(this));
15761781
1782
+ tabbedPane.add(optionsPanel);
1783
+
15771784 scenePanel.add(tabbedPane);
1785
+
1786
+ cGridBag creditsPanel = new cGridBag().setVertical(true);
1787
+ creditsPanel.setName("Credits");
1788
+
1789
+ cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
1790
+ creditsPanel.add(ogaLabel);
1791
+
1792
+ cButton opengameartButton;
1793
+ creditsPanel.add(opengameartButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
1794
+ opengameartButton.setToolTipText("https://opengameart.org");
1795
+
1796
+ opengameartButton.addMouseListener(new MouseAdapter()
1797
+ {
1798
+ public void mouseClicked(MouseEvent e)
1799
+ {
1800
+ try
1801
+ {
1802
+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
1803
+ } catch (Exception e1)
1804
+// } catch (java.io.IOException | java.net.URISyntaxException e1)
1805
+ {
1806
+ e1.printStackTrace();
1807
+ }
1808
+ }
1809
+ });
1810
+
1811
+ for (int i=10; --i>=0;)
1812
+ {
1813
+ creditsPanel.add(new cGridBag());
1814
+ }
1815
+
1816
+ tabbedPane.add(creditsPanel);
1817
+ tabbedPane.setToolTipTextAt(3, "Credits");
1818
+
1819
+ if (Globals.ADVANCED)
1820
+ {
1821
+ tabbedPane.add(infoPanel);
1822
+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
1823
+ tabbedPane.setToolTipTextAt(4, "Information");
1824
+ }
15781825
15791826 /*
15801827 cTree jTree = new cTree(null);
....@@ -1596,13 +1843,13 @@
15961843 jtp.add(tree);
15971844 */
15981845
1599
- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1600
- bigPanel.setContinuousLayout(true);
1601
- bigPanel.setOneTouchExpandable(true);
1602
- bigPanel.setDividerLocation(0.8);
1603
- bigPanel.setDividerSize(15);
1604
- bigPanel.setResizeWeight(0.15);
1605
- bigPanel.setName("Scene");
1846
+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1847
+// bigPanel.setContinuousLayout(true);
1848
+// bigPanel.setOneTouchExpandable(true);
1849
+// bigPanel.setDividerLocation(0.8);
1850
+// bigPanel.setDividerSize(15);
1851
+// bigPanel.setResizeWeight(0.15);
1852
+// bigPanel.setName("Scene");
16061853
16071854 //bigPanel.setLayout(new BorderLayout());
16081855 //bigPanel.setSize(new Dimension(10,10));
....@@ -1637,7 +1884,7 @@
16371884 bigThree = new cGridBag();
16381885 bigThree.addComponent(scenePanel);
16391886 bigThree.addComponent(centralPanel);
1640
- bigThree.addComponent(XYZPanel);
1887
+ //bigThree.addComponent(XYZPanel);
16411888
16421889 // // SIDE EFFECT!!!
16431890 // aConstraints.gridx = 0;
....@@ -1646,6 +1893,23 @@
16461893 // aConstraints.gridheight = 1;
16471894
16481895 framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1896
+
1897
+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1898
+ new java.beans.PropertyChangeListener()
1899
+ {
1900
+ public void propertyChange(java.beans.PropertyChangeEvent pce)
1901
+ {
1902
+ if ((Integer)pce.getOldValue() == 1)
1903
+ {
1904
+ if (radio.layout != expandedLayout)
1905
+ {
1906
+ radio.layout = expandedLayout;
1907
+ radio.layout.doClick();
1908
+ }
1909
+ }
1910
+ }
1911
+ });
1912
+
16491913 framePanel.setContinuousLayout(false);
16501914 framePanel.setOneTouchExpandable(false);
16511915 //.setDividerLocation(0.8);
....@@ -1655,7 +1919,7 @@
16551919
16561920 frame.getContentPane().setLayout(new BorderLayout());
16571921 /**/
1658
- JTabbedPane worldPane = new JTabbedPane();
1922
+ //JTabbedPane worldPane = new JTabbedPane();
16591923 //worldPane.add(bigPanel);
16601924 //worldPane.add(worldPanel);
16611925 /**/
....@@ -1669,7 +1933,7 @@
16691933
16701934 cameraView.requestFocusInWindow();
16711935
1672
- gridPanel.setDividerLocation(1.0);
1936
+// gridPanel.setDividerLocation(1.0);
16731937
16741938 frame.validate();
16751939
....@@ -1678,7 +1942,6 @@
16781942 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16791943 frame.addWindowListener(new WindowAdapter()
16801944 {
1681
-
16821945 public void windowClosing(WindowEvent e)
16831946 {
16841947 Close();
....@@ -1701,28 +1964,442 @@
17011964 ctrlPanel.removeAll();
17021965 }
17031966
1704
- void SetupMaterial(cGridBag panel)
1967
+ void SetupMaterial(cGridBag materialpanel)
17051968 {
1706
- /*
1969
+ cGridBag presetpanel = new cGridBag().setVertical(true);
1970
+
1971
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
1972
+ skin.setToolTipText("Skin");
1973
+ skin.addMouseListener(new MouseAdapter()
1974
+ {
1975
+ public void mouseClicked(MouseEvent e)
1976
+ {
1977
+ Object3D object = Grafreed.materials.versionlist[0].get(0);
1978
+ cMaterial material = object.material;
1979
+
1980
+ // Skin
1981
+ colorField.setFloat(material.color);
1982
+ float saturation = material.modulation;
1983
+
1984
+ if (!cameraView.Skinshader)
1985
+ {
1986
+ saturation /= 1.5;
1987
+ }
1988
+
1989
+ saturationField.setFloat(saturation);
1990
+
1991
+ subsurfaceField.setFloat(material.subsurface);
1992
+ selfshadowField.setFloat(material.diffuseness);
1993
+ diffusenessField.setFloat(material.factor);
1994
+ shininessField.setFloat(material.shininess);
1995
+ shadowbiasField.setFloat(material.shadowbias);
1996
+ diffuseField.setFloat(material.diffuse);
1997
+ specularField.setFloat(material.specular);
1998
+
1999
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2000
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2001
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2002
+
2003
+ materialtouched = true;
2004
+ applySelf();
2005
+ }
2006
+ });
2007
+ presetpanel.add(skin);
2008
+
2009
+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
2010
+ lambert.setToolTipText("Diffuse");
2011
+ lambert.addMouseListener(new MouseAdapter()
2012
+ {
2013
+ public void mouseClicked(MouseEvent e)
2014
+ {
2015
+ Object3D object = Grafreed.materials.versionlist[2].get(0);
2016
+ cMaterial material = object.material;
2017
+
2018
+ diffusenessField.setFloat(material.factor);
2019
+ selfshadowField.setFloat(material.diffuseness);
2020
+
2021
+ materialtouched = true;
2022
+ applySelf();
2023
+ }
2024
+ });
2025
+ presetpanel.add(lambert);
2026
+
2027
+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
2028
+ diffuse2.setToolTipText("Diffuse2");
2029
+ diffuse2.addMouseListener(new MouseAdapter()
2030
+ {
2031
+ public void mouseClicked(MouseEvent e)
2032
+ {
2033
+ Object3D object = Grafreed.materials.versionlist[3].get(0);
2034
+ cMaterial material = object.material;
2035
+
2036
+ diffusenessField.setFloat(material.factor);
2037
+ selfshadowField.setFloat(material.diffuseness);
2038
+
2039
+ materialtouched = true;
2040
+ applySelf();
2041
+ }
2042
+ });
2043
+ presetpanel.add(diffuse2);
2044
+
2045
+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
2046
+ diffusemoon.setToolTipText("Moon");
2047
+ diffusemoon.addMouseListener(new MouseAdapter()
2048
+ {
2049
+ public void mouseClicked(MouseEvent e)
2050
+ {
2051
+ Object3D object = Grafreed.materials.versionlist[4].get(0);
2052
+ cMaterial material = object.material;
2053
+
2054
+ diffusenessField.setFloat(material.factor);
2055
+ selfshadowField.setFloat(material.diffuseness);
2056
+
2057
+ materialtouched = true;
2058
+ applySelf();
2059
+ }
2060
+ });
2061
+ presetpanel.add(diffusemoon);
2062
+
2063
+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
2064
+ diffusemoon2.setToolTipText("Moon2");
2065
+ diffusemoon2.addMouseListener(new MouseAdapter()
2066
+ {
2067
+ public void mouseClicked(MouseEvent e)
2068
+ {
2069
+ Object3D object = Grafreed.materials.versionlist[5].get(0);
2070
+ cMaterial material = object.material;
2071
+
2072
+ diffusenessField.setFloat(material.factor);
2073
+ selfshadowField.setFloat(material.diffuseness);
2074
+
2075
+ materialtouched = true;
2076
+ applySelf();
2077
+ }
2078
+ });
2079
+ presetpanel.add(diffusemoon2);
2080
+
2081
+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
2082
+ diffusemoon3.setToolTipText("Moon3");
2083
+ diffusemoon3.addMouseListener(new MouseAdapter()
2084
+ {
2085
+ public void mouseClicked(MouseEvent e)
2086
+ {
2087
+ Object3D object = Grafreed.materials.versionlist[6].get(0);
2088
+ cMaterial material = object.material;
2089
+
2090
+ diffusenessField.setFloat(material.factor);
2091
+ selfshadowField.setFloat(material.diffuseness);
2092
+
2093
+ materialtouched = true;
2094
+ applySelf();
2095
+ }
2096
+ });
2097
+ presetpanel.add(diffusemoon3);
2098
+
2099
+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
2100
+ diffusesheen.setToolTipText("Sheen");
2101
+ diffusesheen.addMouseListener(new MouseAdapter()
2102
+ {
2103
+ public void mouseClicked(MouseEvent e)
2104
+ {
2105
+ Object3D object = Grafreed.materials.versionlist[7].get(0);
2106
+ cMaterial material = object.material;
2107
+
2108
+ sheenField.setFloat(material.sheen);
2109
+
2110
+ materialtouched = true;
2111
+ applySelf();
2112
+ }
2113
+ });
2114
+ presetpanel.add(diffusesheen);
2115
+
2116
+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
2117
+ rough.setToolTipText("Rough metal");
2118
+ rough.addMouseListener(new MouseAdapter()
2119
+ {
2120
+ public void mouseClicked(MouseEvent e)
2121
+ {
2122
+ Object3D object = Grafreed.materials.versionlist[1].get(0);
2123
+ cMaterial material = object.material;
2124
+
2125
+ shininessField.setFloat(material.shininess);
2126
+ velvetField.setFloat(material.velvet);
2127
+
2128
+ materialtouched = true;
2129
+ applySelf();
2130
+ }
2131
+ });
2132
+ presetpanel.add(rough);
2133
+
2134
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
2135
+ rough2.setToolTipText("Medium metal");
2136
+ rough2.addMouseListener(new MouseAdapter()
2137
+ {
2138
+ public void mouseClicked(MouseEvent e)
2139
+ {
2140
+ Object3D object = Grafreed.materials.versionlist[13].get(0);
2141
+ cMaterial material = object.material;
2142
+
2143
+ shininessField.setFloat(material.shininess);
2144
+ lightareaField.setFloat(material.lightarea);
2145
+
2146
+ materialtouched = true;
2147
+ applySelf();
2148
+ }
2149
+ });
2150
+ presetpanel.add(rough2);
2151
+
2152
+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
2153
+ shini0.setToolTipText("Shiny");
2154
+ shini0.addMouseListener(new MouseAdapter()
2155
+ {
2156
+ public void mouseClicked(MouseEvent e)
2157
+ {
2158
+ Object3D object = Grafreed.materials.versionlist[14].get(0);
2159
+ cMaterial material = object.material;
2160
+
2161
+ shininessField.setFloat(material.shininess);
2162
+ lightareaField.setFloat(material.lightarea);
2163
+
2164
+ materialtouched = true;
2165
+ applySelf();
2166
+ }
2167
+ });
2168
+ presetpanel.add(shini0);
2169
+
2170
+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
2171
+ shini1.setToolTipText("Shiny2");
2172
+ shini1.addMouseListener(new MouseAdapter()
2173
+ {
2174
+ public void mouseClicked(MouseEvent e)
2175
+ {
2176
+ Object3D object = Grafreed.materials.versionlist[11].get(0);
2177
+ cMaterial material = object.material;
2178
+
2179
+ shininessField.setFloat(material.shininess);
2180
+ lightareaField.setFloat(material.lightarea);
2181
+
2182
+ materialtouched = true;
2183
+ applySelf();
2184
+ }
2185
+ });
2186
+ presetpanel.add(shini1);
2187
+
2188
+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
2189
+ shini2.setToolTipText("Shiny3");
2190
+ shini2.addMouseListener(new MouseAdapter()
2191
+ {
2192
+ public void mouseClicked(MouseEvent e)
2193
+ {
2194
+ Object3D object = Grafreed.materials.versionlist[12].get(0);
2195
+ cMaterial material = object.material;
2196
+
2197
+ shininessField.setFloat(material.shininess);
2198
+ lightareaField.setFloat(material.lightarea);
2199
+
2200
+ materialtouched = true;
2201
+ applySelf();
2202
+ }
2203
+ });
2204
+ presetpanel.add(shini2);
2205
+
2206
+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
2207
+ aniso.setToolTipText("AnisoU");
2208
+ aniso.addMouseListener(new MouseAdapter()
2209
+ {
2210
+ public void mouseClicked(MouseEvent e)
2211
+ {
2212
+ Object3D object = Grafreed.materials.versionlist[8].get(0);
2213
+ cMaterial material = object.material;
2214
+
2215
+ anisoField.setFloat(material.aniso);
2216
+ anisoVField.setFloat(material.anisoV);
2217
+
2218
+ materialtouched = true;
2219
+ applySelf();
2220
+ }
2221
+ });
2222
+ presetpanel.add(aniso);
2223
+
2224
+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
2225
+ aniso2.setToolTipText("AnisoV");
2226
+ aniso2.addMouseListener(new MouseAdapter()
2227
+ {
2228
+ public void mouseClicked(MouseEvent e)
2229
+ {
2230
+ Object3D object = Grafreed.materials.versionlist[9].get(0);
2231
+ cMaterial material = object.material;
2232
+
2233
+ anisoField.setFloat(material.aniso);
2234
+ anisoVField.setFloat(material.anisoV);
2235
+
2236
+ materialtouched = true;
2237
+ applySelf();
2238
+ }
2239
+ });
2240
+ presetpanel.add(aniso2);
2241
+
2242
+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
2243
+ aniso3.setToolTipText("AnisoUV");
2244
+ aniso3.addMouseListener(new MouseAdapter()
2245
+ {
2246
+ public void mouseClicked(MouseEvent e)
2247
+ {
2248
+ Object3D object = Grafreed.materials.versionlist[10].get(0);
2249
+ cMaterial material = object.material;
2250
+
2251
+ anisoField.setFloat(material.aniso);
2252
+ anisoVField.setFloat(material.anisoV);
2253
+
2254
+ materialtouched = true;
2255
+ applySelf();
2256
+ }
2257
+ });
2258
+ presetpanel.add(aniso3);
2259
+
2260
+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
2261
+ velvet0.setToolTipText("Velvet");
2262
+ velvet0.addMouseListener(new MouseAdapter()
2263
+ {
2264
+ public void mouseClicked(MouseEvent e)
2265
+ {
2266
+ Object3D object = Grafreed.materials.versionlist[15].get(0);
2267
+ cMaterial material = object.material;
2268
+
2269
+ diffusenessField.setFloat(material.factor);
2270
+ selfshadowField.setFloat(material.diffuseness);
2271
+ sheenField.setFloat(material.sheen);
2272
+ shininessField.setFloat(material.shininess);
2273
+ velvetField.setFloat(material.velvet);
2274
+ shiftField.setFloat(material.shift);
2275
+
2276
+ materialtouched = true;
2277
+ applySelf();
2278
+ }
2279
+ });
2280
+ presetpanel.add(velvet0);
2281
+
2282
+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
2283
+ bump0.setToolTipText("Bump texture");
2284
+ bump0.addMouseListener(new MouseAdapter()
2285
+ {
2286
+ public void mouseClicked(MouseEvent e)
2287
+ {
2288
+ Object3D object = Grafreed.materials.versionlist[16].get(0);
2289
+ cMaterial material = object.material;
2290
+
2291
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2292
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2293
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2294
+
2295
+ materialtouched = true;
2296
+ applySelf();
2297
+ }
2298
+ });
2299
+ presetpanel.add(bump0);
2300
+
2301
+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
2302
+ borderShader.setToolTipText("Border fade");
2303
+ borderShader.addMouseListener(new MouseAdapter()
2304
+ {
2305
+ public void mouseClicked(MouseEvent e)
2306
+ {
2307
+ borderfadeField.setFloat(0.5);
2308
+ opacityField.setFloat(0.75);
2309
+
2310
+ materialtouched = true;
2311
+ applySelf();
2312
+ }
2313
+ });
2314
+ presetpanel.add(borderShader);
2315
+
2316
+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
2317
+ halo.setToolTipText("Halo");
2318
+ halo.addMouseListener(new MouseAdapter()
2319
+ {
2320
+ public void mouseClicked(MouseEvent e)
2321
+ {
2322
+ Object3D object = Grafreed.materials.versionlist[17].get(0);
2323
+ cMaterial material = object.material;
2324
+
2325
+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2326
+
2327
+ materialtouched = true;
2328
+ applySelf();
2329
+ }
2330
+ });
2331
+ presetpanel.add(halo);
2332
+
2333
+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
2334
+ candle.setToolTipText("Candle");
2335
+ candle.addMouseListener(new MouseAdapter()
2336
+ {
2337
+ public void mouseClicked(MouseEvent e)
2338
+ {
2339
+ Object3D object = Grafreed.materials.versionlist[18].get(0);
2340
+ cMaterial material = object.material;
2341
+
2342
+ subsurfaceField.setFloat(material.subsurface);
2343
+ shadowbiasField.setFloat(material.shadowbias);
2344
+ ambientField.setFloat(material.ambient);
2345
+ specularField.setFloat(material.specular);
2346
+ lightareaField.setFloat(material.lightarea);
2347
+ shininessField.setFloat(material.shininess);
2348
+
2349
+ materialtouched = true;
2350
+ applySelf();
2351
+ }
2352
+ });
2353
+ presetpanel.add(candle);
2354
+
2355
+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
2356
+ shadowShader.setToolTipText("Shadow");
2357
+ shadowShader.addMouseListener(new MouseAdapter()
2358
+ {
2359
+ public void mouseClicked(MouseEvent e)
2360
+ {
2361
+ diffuseField.setFloat(0.001);
2362
+ ambientField.setFloat(0.001);
2363
+ cameraField.setFloat(0.001);
2364
+ specularField.setFloat(0.001);
2365
+ fakedepthField.setFloat(0.001);
2366
+ opacityField.setFloat(0.6);
2367
+
2368
+ materialtouched = true;
2369
+ applySelf();
2370
+ }
2371
+ });
2372
+ presetpanel.add(shadowShader);
2373
+
2374
+ cGridBag panel = new cGridBag().setVertical(true);
2375
+
2376
+ presetpanel.preferredWidth = 1;
2377
+
2378
+ materialpanel.add(presetpanel);
2379
+ materialpanel.add(panel);
2380
+
2381
+ panel.preferredWidth = 8;
2382
+
2383
+ /*
17072384 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
17082385 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1709
- */
2386
+ */
17102387
17112388 cGridBag editBar = new cGridBag().setVertical(false);
17122389
1713
- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
2390
+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
17142391 createMaterialButton.setToolTipText("Create material");
17152392
17162393 /*
17172394 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
17182395 */
17192396
1720
- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
2397
+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
17212398 clearMaterialButton.setToolTipText("Clear material");
17222399
17232400 if (Globals.ADVANCED)
17242401 {
1725
- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
2402
+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
17262403 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
17272404 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
17282405 }
....@@ -1740,27 +2417,61 @@
17402417 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17412418
17422419 cGridBag colorSection = new cGridBag().setVertical(true);
2420
+
2421
+ cGridBag huepanel = new cGridBag();
2422
+ cGridBag huelabel = new cGridBag();
2423
+ cLabel hue = GetLabel("icons/hue.png", false);
2424
+ hue.fit = true;
2425
+
2426
+ hue.addMouseListener(new MouseAdapter()
2427
+ {
2428
+ public void mousePressed(MouseEvent e)
2429
+ {
2430
+ int x = e.getX();
2431
+
2432
+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2433
+ }
2434
+ });
2435
+
2436
+ huelabel.add(hue);
2437
+ huelabel.preferredWidth = 20;
2438
+ huepanel.add(new cGridBag()); // Label
2439
+ huepanel.add(huelabel); // Field/slider
2440
+
2441
+ huepanel.preferredHeight = 7;
2442
+
2443
+ colorSection.add(huepanel);
17432444
17442445 cGridBag color = new cGridBag();
1745
- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1746
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1747
- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2446
+
2447
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
2448
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2449
+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2450
+
17482451 //colorField.preferredWidth = 200;
17492452 colorSection.add(color);
17502453
17512454 cGridBag modulation = new cGridBag();
17522455 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
17532456 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1754
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2457
+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
17552458 colorSection.add(modulation);
17562459
2460
+ cGridBag opacity = new cGridBag();
2461
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
2462
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2463
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2464
+ colorSection.add(opacity);
2465
+
2466
+ colorSection.add(GetSeparator());
2467
+
17572468 cGridBag texture = new cGridBag();
17582469 texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
17592470 textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17602471 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
17612472 colorSection.add(texture);
17622473
1763
- panel.add(new JSeparator());
2474
+ panel.add(GetSeparator());
17642475
17652476 panel.add(colorSection);
17662477
....@@ -1816,7 +2527,7 @@
18162527 shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
18172528 diffuseSection.add(shadowbias);
18182529
1819
- panel.add(new JSeparator());
2530
+ panel.add(GetSeparator());
18202531
18212532 panel.add(diffuseSection);
18222533
....@@ -1879,7 +2590,7 @@
18792590 specularSection.add(anisoV);
18802591
18812592
1882
- panel.add(new JSeparator());
2593
+ panel.add(GetSeparator());
18832594
18842595 panel.add(specularSection);
18852596
....@@ -1904,12 +2615,6 @@
19042615 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
19052616 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
19062617 colorSection.add(backlit);
1907
-
1908
- cGridBag opacity = new cGridBag();
1909
- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1910
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1911
- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1912
- colorSection.add(opacity);
19132618
19142619 //panel.add(new JSeparator());
19152620
....@@ -1955,7 +2660,7 @@
19552660 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
19562661 textureSection.add(opacityPower);
19572662
1958
- panel.add(new JSeparator());
2663
+ panel.add(GetSeparator());
19592664
19602665 panel.add(textureSection);
19612666
....@@ -2942,7 +3647,7 @@
29423647
29433648 freezematerial = true;
29443649 colorField.setFloat(mat.color);
2945
- modulationField.setFloat(mat.modulation);
3650
+ saturationField.setFloat(mat.modulation);
29463651 metalnessField.setFloat(mat.metalness);
29473652 diffuseField.setFloat(mat.diffuse);
29483653 specularField.setFloat(mat.specular);
....@@ -3004,32 +3709,8 @@
30043709
30053710 if (multiplyToggle != null)
30063711 multiplyToggle.setSelected(mat.multiply);
3007
-
3008
- assert (object.projectedVertices != null);
3009
-
3010
- if (object.projectedVertices.length <= 2)
3011
- {
3012
- // Side effect...
3013
- Object3D.cVector2[] keep = object.projectedVertices;
3014
- object.projectedVertices = new Object3D.cVector2[3];
3015
- for (int i = 0; i < 3; i++)
3016
- {
3017
- if (i < keep.length)
3018
- {
3019
- object.projectedVertices[i] = keep[i];
3020
- } else
3021
- {
3022
- object.projectedVertices[i] = new Object3D.cVector2();
3023
- }
3024
- /*
3025
- if(keep.length == 0)
3026
- object.projectedVertices[0] = new Object3D.cVector2();
3027
- else
3028
- object.projectedVertices[0] = keep[0];
3029
- object.projectedVertices[1] = new Object3D.cVector2();
3030
- */
3031
- }
3032
- }
3712
+
3713
+ AllocProjectedVertices(object);
30333714
30343715 SetMaterial(mat, object.projectedVertices);
30353716 }
....@@ -3149,6 +3830,17 @@
31493830 public void itemStateChanged(ItemEvent event)
31503831 {
31513832 // System.out.println("Propagate = " + propagate);
3833
+ if (event.getSource() == pinButton)
3834
+ {
3835
+ copy.pinned ^= true;
3836
+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3837
+ {
3838
+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
3839
+ copy.CloseUI();
3840
+ //copy.editWindow.refreshContents();
3841
+ }
3842
+ }
3843
+ else
31523844 if (event.getSource() == propagateToggle)
31533845 {
31543846 propagate ^= true;
....@@ -3253,8 +3945,9 @@
32533945 } else if (event.getSource() == liveCB)
32543946 {
32553947 copy.live ^= true;
3948
+ objEditor.refreshContents(true); // To show item colors
32563949 return;
3257
- } else if (event.getSource() == selectCB)
3950
+ } else if (event.getSource() == selectableCB)
32583951 {
32593952 copy.dontselect ^= true;
32603953 return;
....@@ -3262,7 +3955,7 @@
32623955 {
32633956 copy.hide ^= true;
32643957 copy.Touch(); // display list issue
3265
- objEditor.refreshContents();
3958
+ objEditor.refreshContents(true); // To show item colors
32663959 return;
32673960 } else if (event.getSource() == link2masterCB)
32683961 {
....@@ -3327,7 +4020,7 @@
33274020 //System.out.println("ObjEditor " + event);
33284021 applySelf0(true);
33294022 //parent.applySelf();
3330
- objEditor.refreshContents();
4023
+ // conflicts with requestFocus objEditor.refreshContents();
33314024 } else if (source == resetButton)
33324025 {
33334026 CameraPane.fullreset = true;
....@@ -3507,17 +4200,25 @@
35074200
35084201 void New()
35094202 {
3510
- while (copy.Size() > 1)
4203
+ while (copy.Size() > 0)
35114204 {
3512
- copy.remove(1);
4205
+ copy.remove(0);
35134206 }
35144207
4208
+ copy.selection.clear();
4209
+
4210
+ if (copy == Grafreed.grafreed.universe)
4211
+ {
4212
+ CreateCameras();
4213
+ cameraView.SetCamera(GetCamera(copy, 0));
4214
+ }
35154215 ResetModel();
35164216 objEditor.refreshContents();
35174217 }
35184218
35194219 static public byte[] Compress(Object3D o)
35204220 {
4221
+ // Slower to actually compress.
35214222 try
35224223 {
35234224 ByteArrayOutputStream baos = new ByteArrayOutputStream();
....@@ -3619,6 +4320,7 @@
36194320 {
36204321 //Save(true);
36214322 Replace();
4323
+ SetVersionStates();
36224324 }
36234325
36244326 private boolean Equal(byte[] compress, byte[] name)
....@@ -3637,31 +4339,50 @@
36374339 return true;
36384340 }
36394341
3640
- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4342
+ void DeleteVersion()
4343
+ {
4344
+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
4345
+ {
4346
+ copy.versionlist[i] = copy.versionlist[i+1];
4347
+ }
4348
+
4349
+ if (copy.versionlist[copy.versionindex] == null)
4350
+ copy.versionindex -= 1;
4351
+
4352
+ if (copy.versionindex != -1)
4353
+ CopyChanged();
4354
+
4355
+ SetVersionStates();
4356
+ }
36414357
36424358 public boolean Save(boolean user)
36434359 {
36444360 System.err.println("Save");
4361
+ Replace();
36454362
3646
- cRadio tab = GetCurrentTab();
4363
+ //cRadio tab = GetCurrentTab();
36474364
3648
- byte[] compress = CompressCopy();
4365
+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
36494366
36504367 boolean thesame = false;
36514368
3652
- // Quick heuristic using length. Works only when stream is compressed.
3653
- if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3654
- {
3655
- thesame = true;
3656
- }
4369
+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
4370
+// {
4371
+// thesame = true;
4372
+// }
36574373
36584374 //EditorFrame.m_MainFrame.requestFocusInWindow();
36594375 if (!thesame)
36604376 {
4377
+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
4378
+ {
4379
+ copy.versionlist[i] = copy.versionlist[i-1];
4380
+ }
4381
+
36614382 //tab.user[tab.versionindex] = user;
36624383 //boolean increment = true; // tab.graphs[tab.versionindex] == null;
36634384
3664
- copy.versions[++copy.versionindex] = compress;
4385
+ copy.versionlist[++copy.versionindex] = compress;
36654386
36664387 // if (increment)
36674388 // tab.versionindex++;
....@@ -3671,13 +4392,13 @@
36714392
36724393 //assert(hashtable.isEmpty());
36734394
3674
- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3675
- {
3676
- //tab.user[i] = false;
3677
- copy.versions[i] = null;
3678
- }
4395
+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
4396
+// {
4397
+// //tab.user[i] = false;
4398
+// copy.versionlist[i] = null;
4399
+// }
36794400
3680
- SetUndoStates();
4401
+ SetVersionStates();
36814402
36824403 // test save
36834404 if (false)
....@@ -3700,27 +4421,65 @@
37004421
37014422 return !thesame;
37024423 }
3703
-
3704
- void CopyChanged(Object3D obj)
4424
+
4425
+ boolean flashIt = true;
4426
+
4427
+ void RefreshSelection()
37054428 {
3706
- SetUndoStates();
4429
+ Object3D selection = new Object3D();
4430
+
4431
+ for (int i = 0; i < copy.selection.size(); i++)
4432
+ {
4433
+ Object3D elem = copy.selection.elementAt(i);
4434
+
4435
+ Object3D obj = copy.GetObject(elem.GetUUID());
4436
+
4437
+ if (obj == null)
4438
+ {
4439
+ copy.selection.remove(i--);
4440
+ }
4441
+ else
4442
+ {
4443
+ selection.add(obj);
4444
+ copy.selection.setElementAt(obj, i);
4445
+ }
4446
+ }
4447
+
4448
+ flashIt = false;
4449
+ GetTree().clearSelection();
4450
+ for (int i = 0; i < selection.size(); i++)
4451
+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
4452
+ flashIt = true;
4453
+
4454
+ //refreshContents(false);
4455
+ }
4456
+
4457
+ void CopyChanged()
4458
+ {
4459
+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4460
+
4461
+ SetVersionStates();
37074462
37084463 boolean temp = CameraPane.SWITCH;
37094464 CameraPane.SWITCH = false;
37104465
3711
- copy.ExtractBigData(versiontable);
4466
+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
37124467
37134468 copy.clear();
37144469
4470
+ copy.skyboxname = obj.skyboxname;
4471
+ copy.skyboxext = obj.skyboxext;
4472
+
37154473 for (int i=0; i<obj.Size(); i++)
37164474 {
37174475 copy.add(obj.get(i));
37184476 }
37194477
3720
- copy.RestoreBigData(versiontable);
4478
+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
37214479
37224480 CameraPane.SWITCH = temp;
37234481
4482
+ RefreshSelection();
37244483 //assert(hashtable.isEmpty());
37254484
37264485 copy.Touch();
....@@ -3741,13 +4500,15 @@
37414500 }
37424501 }
37434502
3744
- refreshContents();
4503
+ refreshContents(true);
37454504 }
37464505
3747
- cButton undoButton;
4506
+ cButton previousVersionButton;
37484507 cButton restoreButton;
37494508 cButton replaceButton;
3750
- cButton redoButton;
4509
+ cButton nextVersionButton;
4510
+ cButton saveVersionButton;
4511
+ cButton deleteVersionButton;
37514512
37524513 boolean muteSlider;
37534514
....@@ -3755,39 +4516,64 @@
37554516 {
37564517 int count = 0;
37574518
3758
- for (int i = copy.versions.length; --i >= 0;)
4519
+ for (int i = copy.versionlist.length; --i >= 0;)
37594520 {
3760
- if (copy.versions[i] != null)
4521
+ if (copy.versionlist[i] != null)
37614522 count++;
37624523 }
37634524
37644525 return count;
37654526 }
37664527
3767
- void SetUndoStates()
4528
+ public cGridBag versionSliderPane;
4529
+
4530
+ void SetVersionStates()
37684531 {
3769
- cRadio tab = GetCurrentTab();
4532
+ //if (true)
4533
+ // return;
4534
+
4535
+ //cRadio tab = GetCurrentTab();
37704536
3771
- restoreButton.setEnabled(copy.versionindex != -1);
3772
- replaceButton.setEnabled(copy.versionindex != -1);
3773
-
3774
- undoButton.setEnabled(copy.versionindex > 0);
3775
- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3776
-
3777
- muteSlider = true;
3778
- versionSlider.setMaximum(VersionCount() - 1);
3779
- versionSlider.setInteger(copy.versionindex);
3780
- muteSlider = false;
4537
+ if (copy.versionlist == null)
4538
+ {
4539
+ saveVersionButton.setEnabled(false);
4540
+ restoreButton.setEnabled(false);
4541
+ replaceButton.setEnabled(false);
4542
+ previousVersionButton.setEnabled(false);
4543
+ nextVersionButton.setEnabled(false);
4544
+ deleteVersionButton.setEnabled(false);
4545
+ versionSliderPane.setVisible(false);
4546
+ }
4547
+ else
4548
+ {
4549
+ restoreButton.setEnabled(copy.versionindex != -1);
4550
+ replaceButton.setEnabled(copy.versionindex != -1);
4551
+
4552
+ previousVersionButton.setEnabled(copy.versionindex > 0);
4553
+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4554
+
4555
+ deleteVersionButton.setEnabled(copy.versionindex != -1);
4556
+ //copy.versionlist[copy.versionindex + 1] != null);
4557
+
4558
+ muteSlider = true;
4559
+ versionSlider.setMinimum(0);
4560
+ versionSlider.setMaximum(VersionCount() - 1);
4561
+ versionSlider.setInteger(copy.versionindex);
4562
+ versionSlider.setEnabled(copy.versionindex != -1);
4563
+ muteSlider = false;
4564
+
4565
+ versionSliderPane.setVisible(true);
4566
+ }
37814567 }
37824568
3783
- public boolean Undo()
4569
+ public boolean PreviousVersion()
37844570 {
37854571 // Option?
37864572 Replace();
37874573
37884574 System.err.println("Undo");
37894575
3790
- cRadio tab = GetCurrentTab();
4576
+ //cRadio tab = GetCurrentTab();
37914577
37924578 if (copy.versionindex == 0)
37934579 {
....@@ -3810,7 +4596,7 @@
38104596
38114597 copy.versionindex -= 1;
38124598
3813
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4599
+ CopyChanged();
38144600
38154601 return true;
38164602 }
....@@ -3819,44 +4605,45 @@
38194605 {
38204606 System.err.println("Restore");
38214607
3822
- cRadio tab = GetCurrentTab();
4608
+ //cRadio tab = GetCurrentTab();
38234609
3824
- if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
4610
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
38254611 {
38264612 java.awt.Toolkit.getDefaultToolkit().beep();
38274613 return false;
38284614 }
38294615
3830
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4616
+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4617
+ CopyChanged();
38314618
38324619 return true;
38334620 }
38344621
38354622 public boolean Replace()
38364623 {
3837
- System.err.println("Replace");
4624
+ //System.err.println("Replace");
38384625
3839
- cRadio tab = GetCurrentTab();
4626
+ //cRadio tab = GetCurrentTab();
38404627
3841
- if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
4628
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
38424629 {
38434630 // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
38444631 return false;
38454632 }
38464633
3847
- copy.versions[copy.versionindex] = CompressCopy();
4634
+ copy.versionlist[copy.versionindex] = Duplicate(copy);
38484635
38494636 return true;
38504637 }
38514638
3852
- public void Redo()
4639
+ public void NextVersion()
38534640 {
38544641 // Option?
38554642 Replace();
38564643
3857
- cRadio tab = GetCurrentTab();
4644
+ //cRadio tab = GetCurrentTab();
38584645
3859
- if (copy.versions[copy.versionindex + 1] == null)
4646
+ if (copy.versionlist[copy.versionindex + 1] == null)
38604647 {
38614648 java.awt.Toolkit.getDefaultToolkit().beep();
38624649 return;
....@@ -3864,7 +4651,7 @@
38644651
38654652 copy.versionindex += 1;
38664653
3867
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4654
+ CopyChanged();
38684655
38694656 //if (!tab.user[tab.versionindex])
38704657 // tab.graphs[tab.versionindex] = null;
....@@ -4061,6 +4848,12 @@
40614848 // else
40624849 // applySelf(true);
40634850 // }
4851
+
4852
+ boolean Equal(double a, double b)
4853
+ {
4854
+ return Math.abs(a - b) < 0.001;
4855
+ }
4856
+
40644857 void applySelf0(boolean name)
40654858 {
40664859 if (name)
....@@ -4078,7 +4871,7 @@
40784871 //copy.material = new cMaterial(copy.GetMaterial());
40794872
40804873 current.color = (float) colorField.getFloat();
4081
- current.modulation = (float) modulationField.getFloat();
4874
+ current.modulation = (float) saturationField.getFloat();
40824875 current.metalness = (float) metalnessField.getFloat();
40834876 current.diffuse = (float) diffuseField.getFloat();
40844877 current.specular = (float) specularField.getFloat();
....@@ -4110,29 +4903,52 @@
41104903 {
41114904 cMaterial mat = copy.material;
41124905
4113
- colorField.SetToolTipValue((mat.color));
4114
- modulationField.SetToolTipValue((mat.modulation));
4115
- metalnessField.SetToolTipValue((mat.metalness));
4116
- diffuseField.SetToolTipValue((mat.diffuse));
4117
- specularField.SetToolTipValue((mat.specular));
4118
- shininessField.SetToolTipValue((mat.shininess));
4119
- shiftField.SetToolTipValue((mat.shift));
4120
- ambientField.SetToolTipValue((mat.ambient));
4121
- lightareaField.SetToolTipValue((mat.lightarea));
4122
- diffusenessField.SetToolTipValue((mat.factor));
4123
- velvetField.SetToolTipValue((mat.velvet));
4124
- sheenField.SetToolTipValue((mat.sheen));
4125
- subsurfaceField.SetToolTipValue((mat.subsurface));
4126
- backlitField.SetToolTipValue((mat.bump));
4127
- anisoField.SetToolTipValue((mat.aniso));
4128
- anisoVField.SetToolTipValue((mat.anisoV));
4129
- cameraField.SetToolTipValue((mat.cameralight));
4130
- selfshadowField.SetToolTipValue((mat.diffuseness));
4131
- shadowField.SetToolTipValue((mat.shadow));
4132
- textureField.SetToolTipValue((mat.texture));
4133
- opacityField.SetToolTipValue((mat.opacity));
4134
- fakedepthField.SetToolTipValue((mat.fakedepth));
4135
- shadowbiasField.SetToolTipValue((mat.shadowbias));
4906
+ if (!Equal(colorField.getFloat(), mat.color))
4907
+ colorField.SetToolTipValue((mat.color));
4908
+ if (!Equal(saturationField.getFloat(), mat.modulation))
4909
+ saturationField.SetToolTipValue((mat.modulation));
4910
+ if (!Equal(metalnessField.getFloat(), mat.metalness))
4911
+ metalnessField.SetToolTipValue((mat.metalness));
4912
+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
4913
+ diffuseField.SetToolTipValue((mat.diffuse));
4914
+ if (!Equal(specularField.getFloat(), mat.specular))
4915
+ specularField.SetToolTipValue((mat.specular));
4916
+ if (!Equal(shininessField.getFloat(), mat.shininess))
4917
+ shininessField.SetToolTipValue((mat.shininess));
4918
+ if (!Equal(shiftField.getFloat(), mat.shift))
4919
+ shiftField.SetToolTipValue((mat.shift));
4920
+ if (!Equal(ambientField.getFloat(), mat.ambient))
4921
+ ambientField.SetToolTipValue((mat.ambient));
4922
+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
4923
+ lightareaField.SetToolTipValue((mat.lightarea));
4924
+ if (!Equal(diffusenessField.getFloat(), mat.factor))
4925
+ diffusenessField.SetToolTipValue((mat.factor));
4926
+ if (!Equal(velvetField.getFloat(), mat.velvet))
4927
+ velvetField.SetToolTipValue((mat.velvet));
4928
+ if (!Equal(sheenField.getFloat(), mat.sheen))
4929
+ sheenField.SetToolTipValue((mat.sheen));
4930
+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
4931
+ subsurfaceField.SetToolTipValue((mat.subsurface));
4932
+ if (!Equal(backlitField.getFloat(), mat.bump))
4933
+ backlitField.SetToolTipValue((mat.bump));
4934
+ if (!Equal(anisoField.getFloat(), mat.aniso))
4935
+ anisoField.SetToolTipValue((mat.aniso));
4936
+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
4937
+ anisoVField.SetToolTipValue((mat.anisoV));
4938
+ if (!Equal(cameraField.getFloat(), mat.cameralight))
4939
+ cameraField.SetToolTipValue((mat.cameralight));
4940
+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
4941
+ selfshadowField.SetToolTipValue((mat.diffuseness));
4942
+ if (!Equal(shadowField.getFloat(), mat.shadow))
4943
+ shadowField.SetToolTipValue((mat.shadow));
4944
+ if (!Equal(textureField.getFloat(), mat.texture))
4945
+ textureField.SetToolTipValue((mat.texture));
4946
+ if (!Equal(opacityField.getFloat(), mat.opacity))
4947
+ opacityField.SetToolTipValue((mat.opacity));
4948
+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
4949
+ fakedepthField.SetToolTipValue((mat.fakedepth));
4950
+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
4951
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
41364952 }
41374953
41384954 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
....@@ -4167,17 +4983,20 @@
41674983
41684984 public void stateChanged(ChangeEvent e)
41694985 {
4170
- // assert(false);
4986
+ // assert(false);
41714987 if (e.getSource() == versionSlider)
41724988 {
41734989 if (muteSlider)
41744990 return;
41754991
4992
+ Replace();
4993
+
41764994 int version = versionSlider.getInteger();
41774995
4178
- if (copy.versions[version] != null)
4996
+ if (version != -1 && copy.versionlist[version] != null)
41794997 {
4180
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
4998
+ copy.versionindex = version;
4999
+ CopyChanged();
41815000 }
41825001
41835002 return;
....@@ -4217,6 +5036,12 @@
42175036 {
42185037 //System.out.println("stateChanged = " + this);
42195038 materialtouched = true;
5039
+
5040
+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
5041
+ {
5042
+ saturationField.setFloat(1);
5043
+ }
5044
+
42205045 applySelf();
42215046 //System.out.println("this = " + this);
42225047 //System.out.println("PARENT = " + parent);
....@@ -4516,6 +5341,7 @@
45165341 {
45175342 if (GetTree() != null)
45185343 {
5344
+ GetTree().revalidate();
45195345 GetTree().repaint();
45205346 }
45215347
....@@ -4524,6 +5350,11 @@
45245350 ctrlPanel.validate(); // ? new
45255351 ctrlPanel.repaint();
45265352 }
5353
+
5354
+ if (previousVersionButton != null && copy.versionlist != null)
5355
+ SetVersionStates();
5356
+
5357
+ cameraView.requestFocusInWindow();
45275358 }
45285359
45295360 static TweenManager tweenManager = new TweenManager();
....@@ -4555,7 +5386,7 @@
45555386 // group = (Composite) group.get(0);
45565387 // }
45575388
4558
- System.out.println("makeSomething of " + thing);
5389
+ //System.out.println("makeSomething of " + thing);
45595390
45605391 /*
45615392 if (deselect && jList != null)
....@@ -4772,7 +5603,9 @@
47725603 readobj.ResetDisplayList();
47735604 } catch (Exception e)
47745605 {
4775
- //e.printStackTrace();
5606
+ if (!e.toString().contains("GZIP"))
5607
+ e.printStackTrace();
5608
+
47765609 try
47775610 {
47785611 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4852,6 +5685,8 @@
48525685 {
48535686 //readobj.deepCopySelf(copy);
48545687 copy.clear(); // june 2014
5688
+ copy.skyboxname = readobj.skyboxname;
5689
+ copy.skyboxext = readobj.skyboxext;
48555690 for (int i = 0; i < readobj.size(); i++)
48565691 {
48575692 Object3D child = readobj.get(i); // reserve(i);
....@@ -4892,6 +5727,7 @@
48925727 }
48935728 } catch (ClassCastException e)
48945729 {
5730
+ e.printStackTrace();
48955731 assert (false);
48965732 Composite c = (Composite) copy;
48975733 c.children.clear();
....@@ -4902,13 +5738,17 @@
49025738 c.addChild(csg);
49035739 }
49045740
4905
- copy.versions = readobj.versions;
5741
+ copy.versionlist = readobj.versionlist;
49065742 copy.versionindex = readobj.versionindex;
5743
+ copy.versiontable = readobj.versiontable;
49075744
4908
- if (copy.versions == null)
5745
+ if (copy.versionlist == null)
49095746 {
4910
- copy.versions = new byte[100][];
5747
+ // Backward compatibility
5748
+ copy.versionlist = new Object3D[100];
49115749 copy.versionindex = -1;
5750
+
5751
+ //Save(true);
49125752 }
49135753
49145754 //? SetUndoStates();
....@@ -4923,7 +5763,7 @@
49235763 {
49245764 if (Grafreed.standAlone)
49255765 {
4926
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5766
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
49275767 browser.show();
49285768 String filename = browser.getFile();
49295769 if (filename != null && filename.length() > 0)
....@@ -5000,6 +5840,8 @@
50005840
50015841 void save()
50025842 {
5843
+ Replace();
5844
+
50035845 if (lastname == null)
50045846 {
50055847 return;
....@@ -5022,6 +5864,7 @@
50225864 //ps.print(buffer.toString());
50235865 } catch (IOException e)
50245866 {
5867
+ e.printStackTrace();
50255868 }
50265869 }
50275870
....@@ -5241,6 +6084,7 @@
52416084 ButtonGroup buttonGroup;
52426085
52436086 cGridBag toolboxPanel;
6087
+ cGridBag skyboxPanel;
52446088 cGridBag materialPanel;
52456089 cGridBag ctrlPanel;
52466090
....@@ -5252,6 +6096,7 @@
52526096 boolean materialFlushed;
52536097 Object3D latestObject;
52546098
6099
+ cGridBag transformPanel;
52556100 cGridBag XYZPanel;
52566101
52576102 JSplitPane gridPanel;
....@@ -5314,7 +6159,7 @@
53146159 JLabel colorLabel;
53156160 cNumberSlider colorField;
53166161 JLabel modulationLabel;
5317
- cNumberSlider modulationField;
6162
+ cNumberSlider saturationField;
53186163 JLabel metalnessLabel;
53196164 cNumberSlider metalnessField;
53206165 JLabel diffuseLabel;
....@@ -5345,6 +6190,7 @@
53456190 cNumberSlider anisoField;
53466191 JLabel anisoVLabel;
53476192 cNumberSlider anisoVField;
6193
+
53486194 JLabel cameraLabel;
53496195 cNumberSlider cameraField;
53506196 JLabel selfshadowLabel;
....@@ -5359,6 +6205,7 @@
53596205 cNumberSlider fakedepthField;
53606206 JLabel shadowbiasLabel;
53616207 cNumberSlider shadowbiasField;
6208
+
53626209 JLabel bumpLabel;
53636210 cNumberSlider bumpField;
53646211 JLabel noiseLabel;