Normand Briere
2019-08-16 64e20f390e4b8e58bd0006dde8fa10fba1dac1d5
ObjEditor.java
....@@ -34,6 +34,7 @@
3434 iSendInfo
3535 //KeyListener
3636 {
37
+ public cToggleButton pinButton;
3738 boolean timeline;
3839 boolean wasFullScreen;
3940
....@@ -41,11 +42,54 @@
4142 JFrame frame;
4243
4344 static ObjEditor theFrame;
45
+
46
+ public void AllocProjectedVertices(Object3D object)
47
+ {
48
+ assert (object.projectedVertices != null);
49
+
50
+ if (object.projectedVertices.length <= 2)
51
+ {
52
+ // Side effect...
53
+ Object3D.cVector2[] keep = object.projectedVertices;
54
+ object.projectedVertices = new Object3D.cVector2[3];
55
+ for (int i = 0; i < 3; i++)
56
+ {
57
+ if (i < keep.length)
58
+ {
59
+ object.projectedVertices[i] = keep[i];
60
+ } else
61
+ {
62
+ object.projectedVertices[i] = new Object3D.cVector2();
63
+ }
64
+ /*
65
+ if(keep.length == 0)
66
+ object.projectedVertices[0] = new Object3D.cVector2();
67
+ else
68
+ object.projectedVertices[0] = keep[0];
69
+ object.projectedVertices[1] = new Object3D.cVector2();
70
+ */
71
+ }
72
+ }
73
+ }
74
+
75
+ public cGridBag GetSeparator()
76
+ {
77
+ cGridBag separator = new cGridBag();
78
+ separator.add(new JSeparator());
79
+ separator.preferredHeight = 5;
80
+ return separator;
81
+ }
4482
4583 cButton GetButton(String name, boolean border)
4684 {
4785 ImageIcon icon = GetIcon(name);
4886 return new cButton(icon, border);
87
+ }
88
+
89
+ cLabel GetLabel(String name, boolean border)
90
+ {
91
+ //ImageIcon icon = GetIcon(name);
92
+ return new cLabel(GetImage(name), border);
4993 }
5094
5195 cToggleButton GetToggleButton(String name, boolean border)
....@@ -60,26 +104,52 @@
60104 return new cCheckBox(icon, border);
61105 }
62106
63
- private ImageIcon GetIcon(String name)
107
+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108
+
109
+ ImageIcon GetIcon(String name)
110
+ {
111
+ javax.swing.ImageIcon iconCache = icons.get(name);
112
+ if (iconCache != null)
113
+ {
114
+ return iconCache;
115
+ }
116
+
117
+ try
118
+ {
119
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
120
+
121
+// if (image.getWidth() > 48 && image.getHeight() > 48)
122
+// {
123
+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
124
+// Graphics2D g = resized.createGraphics();
125
+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
126
+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
127
+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
128
+// g.dispose();
129
+//
130
+// image = resized;
131
+// }
132
+
133
+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
134
+
135
+ icons.put(name, icon);
136
+
137
+ return icon;
138
+ }
139
+ catch (Exception e)
140
+ {
141
+ //icons.put(name, null);
142
+ return null;
143
+ }
144
+ }
145
+
146
+ BufferedImage GetImage(String name)
64147 {
65148 try
66149 {
67150 BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
68151
69
- if (image.getWidth() != 24 && image.getHeight() != 24)
70
- {
71
- BufferedImage resized = new BufferedImage(24, 24, image.getType());
72
- Graphics2D g = resized.createGraphics();
73
- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
74
- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
75
- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
76
- g.dispose();
77
-
78
- image = resized;
79
- }
80
-
81
- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
82
- return icon;
152
+ return image;
83153 }
84154 catch (Exception e)
85155 {
....@@ -268,11 +338,13 @@
268338 client = inClient;
269339 copy = client;
270340
271
- if (copy.versions == null)
272
- {
273
- copy.versions = new byte[100][];
274
- copy.versionindex = -1;
275
- }
341
+// if (copy.versionlist == null)
342
+// {
343
+// copy.versionlist = new Object3D[100];
344
+// copy.versionindex = -1;
345
+//
346
+// callee.Save(true);
347
+// }
276348
277349 // "this" is not called: SetupUI2(objEditor);
278350 }
....@@ -287,10 +359,12 @@
287359 client = inClient;
288360 copy = client;
289361
290
- if (copy.versions == null)
362
+ if (copy.versionlist == null)
291363 {
292
- copy.versions = new byte[100][];
364
+ copy.versionlist = new Object3D[100];
293365 copy.versionindex = -1;
366
+
367
+// Save(true);
294368 }
295369
296370 SetupUI2(callee.GetEditor());
....@@ -314,7 +388,8 @@
314388 //parent = p;
315389
316390 GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
317
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
391
+ if (Globals.DEBUG)
392
+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
318393 //gd.setFullScreenWindow(this);
319394 //setResizable(false);
320395 //if (!isDisplayable())
....@@ -325,11 +400,13 @@
325400 copy = localCopy;
326401 copy.editWindow = this;
327402
328
- if (copy.versions == null)
329
- {
330
- copy.versions = new byte[100][];
331
- copy.versionindex = -1;
332
- }
403
+// if (copy.versionlist == null)
404
+// {
405
+// copy.versionlist = new Object3D[100];
406
+// copy.versionindex = -1;
407
+//
408
+// Save(true);
409
+// }
333410
334411 SetupMenu();
335412
....@@ -398,6 +475,8 @@
398475
399476 ChangeListener changeListener = new ChangeListener()
400477 {
478
+ //String name;
479
+
401480 public void stateChanged(ChangeEvent changeEvent)
402481 {
403482 // if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -416,7 +495,37 @@
416495 // EditSelection(false);
417496 // }
418497
419
- refreshContents(false); // To refresh Info tab
498
+// if (objectPanel.getSelectedIndex() == 4)
499
+// {
500
+// name = copy.skyboxname;
501
+//
502
+// if (name == null)
503
+// {
504
+// name = "";
505
+// }
506
+//
507
+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
508
+// copy.skyboxext = "jpg";
509
+// }
510
+// else
511
+// {
512
+// if (name != null)
513
+// {
514
+// if (name.equals(""))
515
+// {
516
+// copy.skyboxname = null;
517
+// copy.skyboxext = null;
518
+// }
519
+// else
520
+// {
521
+// copy.skyboxname = name;
522
+// }
523
+// }
524
+// }
525
+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
526
+
527
+// refreshContents(false); // To refresh Info tab
528
+ cameraView.repaint();
420529 }
421530 };
422531 objectPanel.addChangeListener(changeListener);
....@@ -436,10 +545,12 @@
436545 editPanel.add(editCommandsPanel);
437546 editPanel.add(ctrlPanel);
438547
439
- toolboxPanel = new cGridBag().setVertical(false);
548
+ toolboxPanel = new cGridBag().setVertical(true);
440549 //toolboxPanel.setName("Toolbox");
441550
442
- materialPanel = new cGridBag().setVertical(true);
551
+ skyboxPanel = new cGridBag().setVertical(true);
552
+
553
+ materialPanel = new cGridBag().setVertical(false);
443554 //materialPanel.setName("Material");
444555
445556 /*JTextPane*/
....@@ -723,6 +834,7 @@
723834 boolean maximized;
724835
725836 cButton fullscreenLayout;
837
+ cButton expandedLayout;
726838
727839 void Minimize()
728840 {
....@@ -762,10 +874,12 @@
762874 cButton minButton;
763875 cButton maxButton;
764876 cButton fullButton;
877
+ cButton collapseButton;
878
+ cButton maximize3DButton;
765879
766880 void ToggleFullScreen()
767881 {
768
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
882
+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
769883
770884 cameraView.ToggleFullScreen();
771885
....@@ -786,13 +900,13 @@
786900 // X frame.getContentPane().remove(/*"Center",*/bigThree);
787901 // X framePanel.add(bigThree);
788902 // X frame.getContentPane().add(/*"Center",*/framePanel);
789
- framePanel.setDividerLocation(46);
903
+// framePanel.setDividerLocation(46); // icons are 24x24
790904
791905 //frame.setVisible(true);
792
- radio.layout = keepButton;
906
+// radio.layout = keepButton;
793907 //theFrame = null;
794908 keepButton = null;
795
- radio.layout.doClick();
909
+// radio.layout.doClick();
796910
797911 } else
798912 {
....@@ -813,31 +927,42 @@
813927 // X frame.getContentPane().remove(/*"Center",*/framePanel);
814928 // X framePanel.remove(bigThree);
815929 // X frame.getContentPane().add(/*"Center",*/bigThree);
816
- framePanel.setDividerLocation(0);
930
+// framePanel.setDividerLocation(0);
817931
818
- radio.layout = fullscreenLayout;
819
- radio.layout.doClick();
932
+// radio.layout = fullscreenLayout;
933
+// radio.layout.doClick();
820934 //frame.setVisible(true);
821935 }
822936 frame.validate();
937
+
938
+ cameraView.requestFocusInWindow();
823939 }
824940
825
- private byte[] CompressCopy()
941
+ void CollapseToolbar()
942
+ {
943
+ framePanel.setDividerLocation(0);
944
+ //frame.validate();
945
+
946
+ cameraView.requestFocusInWindow();
947
+ }
948
+
949
+ private Object3D Duplicate(Object3D object)
826950 {
827951 boolean temp = CameraPane.SWITCH;
828952 CameraPane.SWITCH = false;
829953
830
- copy.ExtractBigData(versiontable);
954
+ object.ExtractBigData(versiontable);
831955 // if (copy == client)
832956
833
- byte[] versions[] = copy.versions;
834
- copy.versions = null;
957
+ Object3D versions[] = object.versionlist;
958
+ object.versionlist = null;
835959
836
- byte[] compress = Compress(copy);
960
+ //byte[] compress = Compress(copy);
961
+ Object3D compress = (Object3D)Grafreed.clone(object);
837962
838
- copy.versions = versions;
963
+ object.versionlist = versions;
839964
840
- copy.RestoreBigData(versiontable);
965
+ object.RestoreBigData(versiontable);
841966
842967 CameraPane.SWITCH = temp;
843968
....@@ -965,6 +1090,7 @@
9651090 {
9661091 SetupMaterial(materialPanel);
9671092 }
1093
+
9681094 //SetupName();
9691095 //SetupViews();
9701096 }
....@@ -974,7 +1100,7 @@
9741100 // NumberSlider vDivsField;
9751101 // JCheckBox endcaps;
9761102 JCheckBox liveCB;
977
- JCheckBox selectCB;
1103
+ JCheckBox selectableCB;
9781104 JCheckBox hideCB;
9791105 JCheckBox link2masterCB;
9801106 JCheckBox markCB;
....@@ -1173,6 +1299,18 @@
11731299
11741300 namePanel = new cGridBag();
11751301
1302
+ //if (copy.pinned)
1303
+ {
1304
+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1305
+ pinButton.setSelected(copy.pinned);
1306
+ cGridBag t = new cGridBag();
1307
+ t.preferredWidth = 2;
1308
+ t.add(pinButton);
1309
+ namePanel.add(t);
1310
+
1311
+ pinButton.addItemListener(this);
1312
+ }
1313
+
11761314 nameField = AddText(namePanel, copy.GetName());
11771315 namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
11781316 oe.ctrlPanel.add(namePanel);
....@@ -1186,13 +1324,16 @@
11861324
11871325 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
11881326 liveCB.setToolTipText("Animate object");
1189
- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1190
- selectCB.setToolTipText("Make object selectable");
1327
+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1328
+ markCB.setToolTipText("Set target transform");
1329
+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1330
+ selectableCB.setToolTipText("Make object selectable");
11911331 // Return();
1332
+
11921333 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
11931334 hideCB.setToolTipText("Hide object");
1194
- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1195
- markCB.setToolTipText("As animation target transform");
1335
+
1336
+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
11961337
11971338 setupPanel2 = new cGridBag().setVertical(false);
11981339
....@@ -1392,6 +1533,7 @@
13921533
13931534 if (cam == null || !(copy.get(0) instanceof cGroup))
13941535 {
1536
+ if (Globals.DEBUG)
13951537 System.out.println("CREATE CAMERAS");
13961538 cams = new cTemplate();
13971539 cams.name = "Cameras";
....@@ -1519,23 +1661,28 @@
15191661 //tmp.setName("Edit");
15201662 objectPanel.add(materialPanel);
15211663 objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1664
+ objectPanel.setToolTipTextAt(0, "Material");
1665
+
1666
+ objectPanel.add(toolboxPanel);
1667
+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1668
+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1669
+
1670
+ objectPanel.add(skyboxPanel);
1671
+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1672
+ objectPanel.setToolTipTextAt(2, "Backgrounds");
1673
+
15221674 // JPanel north = new JPanel(new BorderLayout());
15231675 // north.setName("Edit");
15241676 // north.add(ctrlPanel, BorderLayout.NORTH);
15251677 // objectPanel.add(north);
15261678 objectPanel.add(editPanel);
1527
- objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1528
-
1529
- //if (Globals.ADVANCED)
1530
- objectPanel.add(infoPanel);
1531
- objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1679
+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1680
+ objectPanel.setToolTipTextAt(3, "Edit controls");
15321681
15331682 objectPanel.add(XYZPanel);
1534
- objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1683
+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1684
+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
15351685
1536
- objectPanel.add(toolboxPanel);
1537
- objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1538
-
15391686 /*
15401687 aConstraints.gridx = 0;
15411688 aConstraints.gridwidth = 1;
....@@ -1572,6 +1719,11 @@
15721719
15731720 scenePanel.add(tabbedPane);
15741721
1722
+ //if (Globals.ADVANCED)
1723
+// tabbedPane.add(infoPanel);
1724
+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1725
+// tabbedPane.setToolTipTextAt(3, "Information");
1726
+
15751727 /*
15761728 cTree jTree = new cTree(null);
15771729 ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1642,6 +1794,23 @@
16421794 // aConstraints.gridheight = 1;
16431795
16441796 framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1797
+
1798
+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1799
+ new java.beans.PropertyChangeListener()
1800
+ {
1801
+ public void propertyChange(java.beans.PropertyChangeEvent pce)
1802
+ {
1803
+ if ((Integer)pce.getOldValue() == 1)
1804
+ {
1805
+ if (radio.layout != expandedLayout)
1806
+ {
1807
+ radio.layout = expandedLayout;
1808
+ radio.layout.doClick();
1809
+ }
1810
+ }
1811
+ }
1812
+ });
1813
+
16451814 framePanel.setContinuousLayout(false);
16461815 framePanel.setOneTouchExpandable(false);
16471816 //.setDividerLocation(0.8);
....@@ -1651,7 +1820,7 @@
16511820
16521821 frame.getContentPane().setLayout(new BorderLayout());
16531822 /**/
1654
- JTabbedPane worldPane = new JTabbedPane();
1823
+ //JTabbedPane worldPane = new JTabbedPane();
16551824 //worldPane.add(bigPanel);
16561825 //worldPane.add(worldPanel);
16571826 /**/
....@@ -1674,7 +1843,6 @@
16741843 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16751844 frame.addWindowListener(new WindowAdapter()
16761845 {
1677
-
16781846 public void windowClosing(WindowEvent e)
16791847 {
16801848 Close();
....@@ -1697,12 +1865,418 @@
16971865 ctrlPanel.removeAll();
16981866 }
16991867
1700
- void SetupMaterial(cGridBag panel)
1868
+ void SetupMaterial(cGridBag materialpanel)
17011869 {
1702
- /*
1870
+ cGridBag presetpanel = new cGridBag().setVertical(true);
1871
+
1872
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1873
+ skin.setToolTipText("Skin");
1874
+ skin.addMouseListener(new MouseAdapter()
1875
+ {
1876
+ public void mouseClicked(MouseEvent e)
1877
+ {
1878
+ Object3D object = Grafreed.materials.versionlist[0].get(0);
1879
+ cMaterial material = object.material;
1880
+
1881
+ // Skin
1882
+ colorField.setFloat(material.color);
1883
+ saturationField.setFloat(material.modulation);
1884
+ subsurfaceField.setFloat(material.subsurface);
1885
+ selfshadowField.setFloat(material.diffuseness);
1886
+ diffusenessField.setFloat(material.factor);
1887
+ shininessField.setFloat(material.shininess);
1888
+ shadowbiasField.setFloat(material.shadowbias);
1889
+ diffuseField.setFloat(material.diffuse);
1890
+ specularField.setFloat(material.specular);
1891
+
1892
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
1893
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
1894
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
1895
+
1896
+ materialtouched = true;
1897
+ applySelf();
1898
+ }
1899
+ });
1900
+ presetpanel.add(skin);
1901
+
1902
+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
1903
+ lambert.setToolTipText("Diffuse");
1904
+ lambert.addMouseListener(new MouseAdapter()
1905
+ {
1906
+ public void mouseClicked(MouseEvent e)
1907
+ {
1908
+ Object3D object = Grafreed.materials.versionlist[2].get(0);
1909
+ cMaterial material = object.material;
1910
+
1911
+ diffusenessField.setFloat(material.factor);
1912
+ selfshadowField.setFloat(material.diffuseness);
1913
+
1914
+ materialtouched = true;
1915
+ applySelf();
1916
+ }
1917
+ });
1918
+ presetpanel.add(lambert);
1919
+
1920
+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
1921
+ diffuse2.setToolTipText("Diffuse2");
1922
+ diffuse2.addMouseListener(new MouseAdapter()
1923
+ {
1924
+ public void mouseClicked(MouseEvent e)
1925
+ {
1926
+ Object3D object = Grafreed.materials.versionlist[3].get(0);
1927
+ cMaterial material = object.material;
1928
+
1929
+ diffusenessField.setFloat(material.factor);
1930
+ selfshadowField.setFloat(material.diffuseness);
1931
+
1932
+ materialtouched = true;
1933
+ applySelf();
1934
+ }
1935
+ });
1936
+ presetpanel.add(diffuse2);
1937
+
1938
+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
1939
+ diffusemoon.setToolTipText("Moon");
1940
+ diffusemoon.addMouseListener(new MouseAdapter()
1941
+ {
1942
+ public void mouseClicked(MouseEvent e)
1943
+ {
1944
+ Object3D object = Grafreed.materials.versionlist[4].get(0);
1945
+ cMaterial material = object.material;
1946
+
1947
+ diffusenessField.setFloat(material.factor);
1948
+ selfshadowField.setFloat(material.diffuseness);
1949
+
1950
+ materialtouched = true;
1951
+ applySelf();
1952
+ }
1953
+ });
1954
+ presetpanel.add(diffusemoon);
1955
+
1956
+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
1957
+ diffusemoon2.setToolTipText("Moon2");
1958
+ diffusemoon2.addMouseListener(new MouseAdapter()
1959
+ {
1960
+ public void mouseClicked(MouseEvent e)
1961
+ {
1962
+ Object3D object = Grafreed.materials.versionlist[5].get(0);
1963
+ cMaterial material = object.material;
1964
+
1965
+ diffusenessField.setFloat(material.factor);
1966
+ selfshadowField.setFloat(material.diffuseness);
1967
+
1968
+ materialtouched = true;
1969
+ applySelf();
1970
+ }
1971
+ });
1972
+ presetpanel.add(diffusemoon2);
1973
+
1974
+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
1975
+ diffusemoon3.setToolTipText("Moon3");
1976
+ diffusemoon3.addMouseListener(new MouseAdapter()
1977
+ {
1978
+ public void mouseClicked(MouseEvent e)
1979
+ {
1980
+ Object3D object = Grafreed.materials.versionlist[6].get(0);
1981
+ cMaterial material = object.material;
1982
+
1983
+ diffusenessField.setFloat(material.factor);
1984
+ selfshadowField.setFloat(material.diffuseness);
1985
+
1986
+ materialtouched = true;
1987
+ applySelf();
1988
+ }
1989
+ });
1990
+ presetpanel.add(diffusemoon3);
1991
+
1992
+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
1993
+ diffusesheen.setToolTipText("Sheen");
1994
+ diffusesheen.addMouseListener(new MouseAdapter()
1995
+ {
1996
+ public void mouseClicked(MouseEvent e)
1997
+ {
1998
+ Object3D object = Grafreed.materials.versionlist[7].get(0);
1999
+ cMaterial material = object.material;
2000
+
2001
+ sheenField.setFloat(material.sheen);
2002
+
2003
+ materialtouched = true;
2004
+ applySelf();
2005
+ }
2006
+ });
2007
+ presetpanel.add(diffusesheen);
2008
+
2009
+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
2010
+ rough.setToolTipText("Rough metal");
2011
+ rough.addMouseListener(new MouseAdapter()
2012
+ {
2013
+ public void mouseClicked(MouseEvent e)
2014
+ {
2015
+ Object3D object = Grafreed.materials.versionlist[1].get(0);
2016
+ cMaterial material = object.material;
2017
+
2018
+ shininessField.setFloat(material.shininess);
2019
+ velvetField.setFloat(material.velvet);
2020
+
2021
+ materialtouched = true;
2022
+ applySelf();
2023
+ }
2024
+ });
2025
+ presetpanel.add(rough);
2026
+
2027
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
2028
+ rough2.setToolTipText("Medium metal");
2029
+ rough2.addMouseListener(new MouseAdapter()
2030
+ {
2031
+ public void mouseClicked(MouseEvent e)
2032
+ {
2033
+ Object3D object = Grafreed.materials.versionlist[13].get(0);
2034
+ cMaterial material = object.material;
2035
+
2036
+ shininessField.setFloat(material.shininess);
2037
+ lightareaField.setFloat(material.lightarea);
2038
+
2039
+ materialtouched = true;
2040
+ applySelf();
2041
+ }
2042
+ });
2043
+ presetpanel.add(rough2);
2044
+
2045
+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
2046
+ shini0.setToolTipText("Shiny");
2047
+ shini0.addMouseListener(new MouseAdapter()
2048
+ {
2049
+ public void mouseClicked(MouseEvent e)
2050
+ {
2051
+ Object3D object = Grafreed.materials.versionlist[14].get(0);
2052
+ cMaterial material = object.material;
2053
+
2054
+ shininessField.setFloat(material.shininess);
2055
+ lightareaField.setFloat(material.lightarea);
2056
+
2057
+ materialtouched = true;
2058
+ applySelf();
2059
+ }
2060
+ });
2061
+ presetpanel.add(shini0);
2062
+
2063
+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
2064
+ shini1.setToolTipText("Shiny2");
2065
+ shini1.addMouseListener(new MouseAdapter()
2066
+ {
2067
+ public void mouseClicked(MouseEvent e)
2068
+ {
2069
+ Object3D object = Grafreed.materials.versionlist[11].get(0);
2070
+ cMaterial material = object.material;
2071
+
2072
+ shininessField.setFloat(material.shininess);
2073
+ lightareaField.setFloat(material.lightarea);
2074
+
2075
+ materialtouched = true;
2076
+ applySelf();
2077
+ }
2078
+ });
2079
+ presetpanel.add(shini1);
2080
+
2081
+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2082
+ shini2.setToolTipText("Shiny3");
2083
+ shini2.addMouseListener(new MouseAdapter()
2084
+ {
2085
+ public void mouseClicked(MouseEvent e)
2086
+ {
2087
+ Object3D object = Grafreed.materials.versionlist[12].get(0);
2088
+ cMaterial material = object.material;
2089
+
2090
+ shininessField.setFloat(material.shininess);
2091
+ lightareaField.setFloat(material.lightarea);
2092
+
2093
+ materialtouched = true;
2094
+ applySelf();
2095
+ }
2096
+ });
2097
+ presetpanel.add(shini2);
2098
+
2099
+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2100
+ aniso.setToolTipText("AnisoU");
2101
+ aniso.addMouseListener(new MouseAdapter()
2102
+ {
2103
+ public void mouseClicked(MouseEvent e)
2104
+ {
2105
+ Object3D object = Grafreed.materials.versionlist[8].get(0);
2106
+ cMaterial material = object.material;
2107
+
2108
+ anisoField.setFloat(material.aniso);
2109
+ anisoVField.setFloat(material.anisoV);
2110
+
2111
+ materialtouched = true;
2112
+ applySelf();
2113
+ }
2114
+ });
2115
+ presetpanel.add(aniso);
2116
+
2117
+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2118
+ aniso2.setToolTipText("AnisoV");
2119
+ aniso2.addMouseListener(new MouseAdapter()
2120
+ {
2121
+ public void mouseClicked(MouseEvent e)
2122
+ {
2123
+ Object3D object = Grafreed.materials.versionlist[9].get(0);
2124
+ cMaterial material = object.material;
2125
+
2126
+ anisoField.setFloat(material.aniso);
2127
+ anisoVField.setFloat(material.anisoV);
2128
+
2129
+ materialtouched = true;
2130
+ applySelf();
2131
+ }
2132
+ });
2133
+ presetpanel.add(aniso2);
2134
+
2135
+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2136
+ aniso3.setToolTipText("AnisoUV");
2137
+ aniso3.addMouseListener(new MouseAdapter()
2138
+ {
2139
+ public void mouseClicked(MouseEvent e)
2140
+ {
2141
+ Object3D object = Grafreed.materials.versionlist[10].get(0);
2142
+ cMaterial material = object.material;
2143
+
2144
+ anisoField.setFloat(material.aniso);
2145
+ anisoVField.setFloat(material.anisoV);
2146
+
2147
+ materialtouched = true;
2148
+ applySelf();
2149
+ }
2150
+ });
2151
+ presetpanel.add(aniso3);
2152
+
2153
+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2154
+ velvet0.setToolTipText("Velvet");
2155
+ velvet0.addMouseListener(new MouseAdapter()
2156
+ {
2157
+ public void mouseClicked(MouseEvent e)
2158
+ {
2159
+ Object3D object = Grafreed.materials.versionlist[15].get(0);
2160
+ cMaterial material = object.material;
2161
+
2162
+ diffusenessField.setFloat(material.factor);
2163
+ selfshadowField.setFloat(material.diffuseness);
2164
+ sheenField.setFloat(material.sheen);
2165
+ shininessField.setFloat(material.shininess);
2166
+ velvetField.setFloat(material.velvet);
2167
+ shiftField.setFloat(material.shift);
2168
+
2169
+ materialtouched = true;
2170
+ applySelf();
2171
+ }
2172
+ });
2173
+ presetpanel.add(velvet0);
2174
+
2175
+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2176
+ bump0.setToolTipText("Bump texture");
2177
+ bump0.addMouseListener(new MouseAdapter()
2178
+ {
2179
+ public void mouseClicked(MouseEvent e)
2180
+ {
2181
+ Object3D object = Grafreed.materials.versionlist[16].get(0);
2182
+ cMaterial material = object.material;
2183
+
2184
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2185
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2186
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2187
+
2188
+ materialtouched = true;
2189
+ applySelf();
2190
+ }
2191
+ });
2192
+ presetpanel.add(bump0);
2193
+
2194
+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2195
+ borderShader.setToolTipText("Border fade");
2196
+ borderShader.addMouseListener(new MouseAdapter()
2197
+ {
2198
+ public void mouseClicked(MouseEvent e)
2199
+ {
2200
+ borderfadeField.setFloat(0.5);
2201
+ opacityField.setFloat(0.75);
2202
+
2203
+ materialtouched = true;
2204
+ applySelf();
2205
+ }
2206
+ });
2207
+ presetpanel.add(borderShader);
2208
+
2209
+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2210
+ halo.setToolTipText("Halo");
2211
+ halo.addMouseListener(new MouseAdapter()
2212
+ {
2213
+ public void mouseClicked(MouseEvent e)
2214
+ {
2215
+ Object3D object = Grafreed.materials.versionlist[17].get(0);
2216
+ cMaterial material = object.material;
2217
+
2218
+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2219
+
2220
+ materialtouched = true;
2221
+ applySelf();
2222
+ }
2223
+ });
2224
+ presetpanel.add(halo);
2225
+
2226
+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2227
+ candle.setToolTipText("Candle");
2228
+ candle.addMouseListener(new MouseAdapter()
2229
+ {
2230
+ public void mouseClicked(MouseEvent e)
2231
+ {
2232
+ Object3D object = Grafreed.materials.versionlist[18].get(0);
2233
+ cMaterial material = object.material;
2234
+
2235
+ subsurfaceField.setFloat(material.subsurface);
2236
+ shadowbiasField.setFloat(material.shadowbias);
2237
+ ambientField.setFloat(material.ambient);
2238
+ specularField.setFloat(material.specular);
2239
+ lightareaField.setFloat(material.lightarea);
2240
+ shininessField.setFloat(material.shininess);
2241
+
2242
+ materialtouched = true;
2243
+ applySelf();
2244
+ }
2245
+ });
2246
+ presetpanel.add(candle);
2247
+
2248
+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2249
+ shadowShader.setToolTipText("Shadow");
2250
+ shadowShader.addMouseListener(new MouseAdapter()
2251
+ {
2252
+ public void mouseClicked(MouseEvent e)
2253
+ {
2254
+ diffuseField.setFloat(0.001);
2255
+ ambientField.setFloat(0.001);
2256
+ cameraField.setFloat(0.001);
2257
+ specularField.setFloat(0.001);
2258
+ fakedepthField.setFloat(0.001);
2259
+ opacityField.setFloat(0.6);
2260
+
2261
+ materialtouched = true;
2262
+ applySelf();
2263
+ }
2264
+ });
2265
+ presetpanel.add(shadowShader);
2266
+
2267
+ cGridBag panel = new cGridBag().setVertical(true);
2268
+
2269
+ presetpanel.preferredWidth = 1;
2270
+
2271
+ materialpanel.add(presetpanel);
2272
+ materialpanel.add(panel);
2273
+
2274
+ panel.preferredWidth = 8;
2275
+
2276
+ /*
17032277 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
17042278 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705
- */
2279
+ */
17062280
17072281 cGridBag editBar = new cGridBag().setVertical(false);
17082282
....@@ -1736,27 +2310,61 @@
17362310 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17372311
17382312 cGridBag colorSection = new cGridBag().setVertical(true);
2313
+
2314
+ cGridBag huepanel = new cGridBag();
2315
+ cGridBag huelabel = new cGridBag();
2316
+ cLabel hue = GetLabel("icons/hue.png", false);
2317
+ hue.fit = true;
2318
+
2319
+ hue.addMouseListener(new MouseAdapter()
2320
+ {
2321
+ public void mousePressed(MouseEvent e)
2322
+ {
2323
+ int x = e.getX();
2324
+
2325
+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2326
+ }
2327
+ });
2328
+
2329
+ huelabel.add(hue);
2330
+ huelabel.preferredWidth = 20;
2331
+ huepanel.add(new cGridBag()); // Label
2332
+ huepanel.add(huelabel); // Field/slider
2333
+
2334
+ huepanel.preferredHeight = 7;
2335
+
2336
+ colorSection.add(huepanel);
17392337
17402338 cGridBag color = new cGridBag();
1741
- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1742
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743
- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2339
+
2340
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
2341
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2342
+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2343
+
17442344 //colorField.preferredWidth = 200;
17452345 colorSection.add(color);
17462346
17472347 cGridBag modulation = new cGridBag();
17482348 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
17492349 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1750
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2350
+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
17512351 colorSection.add(modulation);
17522352
2353
+ cGridBag opacity = new cGridBag();
2354
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
2355
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2356
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2357
+ colorSection.add(opacity);
2358
+
2359
+ colorSection.add(GetSeparator());
2360
+
17532361 cGridBag texture = new cGridBag();
17542362 texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
17552363 textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17562364 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
17572365 colorSection.add(texture);
17582366
1759
- panel.add(new JSeparator());
2367
+ panel.add(GetSeparator());
17602368
17612369 panel.add(colorSection);
17622370
....@@ -1812,7 +2420,7 @@
18122420 shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
18132421 diffuseSection.add(shadowbias);
18142422
1815
- panel.add(new JSeparator());
2423
+ panel.add(GetSeparator());
18162424
18172425 panel.add(diffuseSection);
18182426
....@@ -1875,7 +2483,7 @@
18752483 specularSection.add(anisoV);
18762484
18772485
1878
- panel.add(new JSeparator());
2486
+ panel.add(GetSeparator());
18792487
18802488 panel.add(specularSection);
18812489
....@@ -1900,12 +2508,6 @@
19002508 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
19012509 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
19022510 colorSection.add(backlit);
1903
-
1904
- cGridBag opacity = new cGridBag();
1905
- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1906
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1907
- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1908
- colorSection.add(opacity);
19092511
19102512 //panel.add(new JSeparator());
19112513
....@@ -1951,7 +2553,7 @@
19512553 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
19522554 textureSection.add(opacityPower);
19532555
1954
- panel.add(new JSeparator());
2556
+ panel.add(GetSeparator());
19552557
19562558 panel.add(textureSection);
19572559
....@@ -2938,7 +3540,7 @@
29383540
29393541 freezematerial = true;
29403542 colorField.setFloat(mat.color);
2941
- modulationField.setFloat(mat.modulation);
3543
+ saturationField.setFloat(mat.modulation);
29423544 metalnessField.setFloat(mat.metalness);
29433545 diffuseField.setFloat(mat.diffuse);
29443546 specularField.setFloat(mat.specular);
....@@ -3000,32 +3602,8 @@
30003602
30013603 if (multiplyToggle != null)
30023604 multiplyToggle.setSelected(mat.multiply);
3003
-
3004
- assert (object.projectedVertices != null);
3005
-
3006
- if (object.projectedVertices.length <= 2)
3007
- {
3008
- // Side effect...
3009
- Object3D.cVector2[] keep = object.projectedVertices;
3010
- object.projectedVertices = new Object3D.cVector2[3];
3011
- for (int i = 0; i < 3; i++)
3012
- {
3013
- if (i < keep.length)
3014
- {
3015
- object.projectedVertices[i] = keep[i];
3016
- } else
3017
- {
3018
- object.projectedVertices[i] = new Object3D.cVector2();
3019
- }
3020
- /*
3021
- if(keep.length == 0)
3022
- object.projectedVertices[0] = new Object3D.cVector2();
3023
- else
3024
- object.projectedVertices[0] = keep[0];
3025
- object.projectedVertices[1] = new Object3D.cVector2();
3026
- */
3027
- }
3028
- }
3605
+
3606
+ AllocProjectedVertices(object);
30293607
30303608 SetMaterial(mat, object.projectedVertices);
30313609 }
....@@ -3145,6 +3723,17 @@
31453723 public void itemStateChanged(ItemEvent event)
31463724 {
31473725 // System.out.println("Propagate = " + propagate);
3726
+ if (event.getSource() == pinButton)
3727
+ {
3728
+ copy.pinned ^= true;
3729
+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3730
+ {
3731
+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
3732
+ copy.CloseUI();
3733
+ //copy.editWindow.refreshContents();
3734
+ }
3735
+ }
3736
+ else
31483737 if (event.getSource() == propagateToggle)
31493738 {
31503739 propagate ^= true;
....@@ -3249,8 +3838,9 @@
32493838 } else if (event.getSource() == liveCB)
32503839 {
32513840 copy.live ^= true;
3841
+ objEditor.refreshContents(true); // To show item colors
32523842 return;
3253
- } else if (event.getSource() == selectCB)
3843
+ } else if (event.getSource() == selectableCB)
32543844 {
32553845 copy.dontselect ^= true;
32563846 return;
....@@ -3258,7 +3848,7 @@
32583848 {
32593849 copy.hide ^= true;
32603850 copy.Touch(); // display list issue
3261
- objEditor.refreshContents();
3851
+ objEditor.refreshContents(true); // To show item colors
32623852 return;
32633853 } else if (event.getSource() == link2masterCB)
32643854 {
....@@ -3514,6 +4104,7 @@
35144104
35154105 static public byte[] Compress(Object3D o)
35164106 {
4107
+ // Slower to actually compress.
35174108 try
35184109 {
35194110 ByteArrayOutputStream baos = new ByteArrayOutputStream();
....@@ -3615,6 +4206,7 @@
36154206 {
36164207 //Save(true);
36174208 Replace();
4209
+ SetVersionStates();
36184210 }
36194211
36204212 private boolean Equal(byte[] compress, byte[] name)
....@@ -3635,29 +4227,46 @@
36354227
36364228 java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
36374229
4230
+ void DeleteVersion()
4231
+ {
4232
+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
4233
+ {
4234
+ copy.versionlist[i] = copy.versionlist[i+1];
4235
+ }
4236
+
4237
+ CopyChanged();
4238
+
4239
+ SetVersionStates();
4240
+ }
4241
+
36384242 public boolean Save(boolean user)
36394243 {
36404244 System.err.println("Save");
4245
+ Replace();
36414246
3642
- cRadio tab = GetCurrentTab();
4247
+ //cRadio tab = GetCurrentTab();
36434248
3644
- byte[] compress = CompressCopy();
4249
+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
36454250
36464251 boolean thesame = false;
36474252
3648
- // Quick heuristic using length. Works only when stream is compressed.
3649
- if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3650
- {
3651
- thesame = true;
3652
- }
4253
+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
4254
+// {
4255
+// thesame = true;
4256
+// }
36534257
36544258 //EditorFrame.m_MainFrame.requestFocusInWindow();
36554259 if (!thesame)
36564260 {
4261
+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
4262
+ {
4263
+ copy.versionlist[i] = copy.versionlist[i-1];
4264
+ }
4265
+
36574266 //tab.user[tab.versionindex] = user;
36584267 //boolean increment = true; // tab.graphs[tab.versionindex] == null;
36594268
3660
- copy.versions[++copy.versionindex] = compress;
4269
+ copy.versionlist[++copy.versionindex] = compress;
36614270
36624271 // if (increment)
36634272 // tab.versionindex++;
....@@ -3667,13 +4276,13 @@
36674276
36684277 //assert(hashtable.isEmpty());
36694278
3670
- for (int i = copy.versionindex+1; i < copy.versions.length; i++)
3671
- {
3672
- //tab.user[i] = false;
3673
- copy.versions[i] = null;
3674
- }
4279
+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
4280
+// {
4281
+// //tab.user[i] = false;
4282
+// copy.versionlist[i] = null;
4283
+// }
36754284
3676
- SetUndoStates();
4285
+ SetVersionStates();
36774286
36784287 // test save
36794288 if (false)
....@@ -3696,10 +4305,44 @@
36964305
36974306 return !thesame;
36984307 }
3699
-
3700
- void CopyChanged(Object3D obj)
4308
+
4309
+ boolean flashIt = true;
4310
+
4311
+ void RefreshSelection()
37014312 {
3702
- SetUndoStates();
4313
+ Object3D selection = new Object3D();
4314
+
4315
+ for (int i = 0; i < copy.selection.size(); i++)
4316
+ {
4317
+ Object3D elem = copy.selection.elementAt(i);
4318
+
4319
+ Object3D obj = copy.GetObject(elem.GetUUID());
4320
+
4321
+ if (obj == null)
4322
+ {
4323
+ copy.selection.remove(i--);
4324
+ }
4325
+ else
4326
+ {
4327
+ selection.add(obj);
4328
+ copy.selection.setElementAt(obj, i);
4329
+ }
4330
+ }
4331
+
4332
+ flashIt = false;
4333
+ GetTree().clearSelection();
4334
+ for (int i = 0; i < selection.size(); i++)
4335
+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
4336
+ flashIt = true;
4337
+
4338
+ //refreshContents(false);
4339
+ }
4340
+
4341
+ void CopyChanged()
4342
+ {
4343
+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4344
+
4345
+ SetVersionStates();
37034346
37044347 boolean temp = CameraPane.SWITCH;
37054348 CameraPane.SWITCH = false;
....@@ -3708,6 +4351,9 @@
37084351
37094352 copy.clear();
37104353
4354
+ copy.skyboxname = obj.skyboxname;
4355
+ copy.skyboxext = obj.skyboxext;
4356
+
37114357 for (int i=0; i<obj.Size(); i++)
37124358 {
37134359 copy.add(obj.get(i));
....@@ -3717,6 +4363,7 @@
37174363
37184364 CameraPane.SWITCH = temp;
37194365
4366
+ RefreshSelection();
37204367 //assert(hashtable.isEmpty());
37214368
37224369 copy.Touch();
....@@ -3737,13 +4384,15 @@
37374384 }
37384385 }
37394386
3740
- refreshContents();
4387
+ refreshContents(true);
37414388 }
37424389
3743
- cButton undoButton;
4390
+ cButton previousVersionButton;
37444391 cButton restoreButton;
37454392 cButton replaceButton;
3746
- cButton redoButton;
4393
+ cButton nextVersionButton;
4394
+ cButton saveVersionButton;
4395
+ cButton deleteVersionButton;
37474396
37484397 boolean muteSlider;
37494398
....@@ -3751,39 +4400,47 @@
37514400 {
37524401 int count = 0;
37534402
3754
- for (int i = copy.versions.length; --i >= 0;)
4403
+ for (int i = copy.versionlist.length; --i >= 0;)
37554404 {
3756
- if (copy.versions[i] != null)
4405
+ if (copy.versionlist[i] != null)
37574406 count++;
37584407 }
37594408
37604409 return count;
37614410 }
37624411
3763
- void SetUndoStates()
4412
+ void SetVersionStates()
37644413 {
3765
- cRadio tab = GetCurrentTab();
4414
+ //if (true)
4415
+ // return;
4416
+
4417
+ //cRadio tab = GetCurrentTab();
37664418
37674419 restoreButton.setEnabled(copy.versionindex != -1);
37684420 replaceButton.setEnabled(copy.versionindex != -1);
37694421
3770
- undoButton.setEnabled(copy.versionindex > 0);
3771
- redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
4422
+ previousVersionButton.setEnabled(copy.versionindex > 0);
4423
+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4424
+
4425
+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4426
+ copy.versionlist[copy.versionindex + 1] != null);
37724427
37734428 muteSlider = true;
4429
+ versionSlider.setMinimum(0);
37744430 versionSlider.setMaximum(VersionCount() - 1);
37754431 versionSlider.setInteger(copy.versionindex);
4432
+ versionSlider.setEnabled(copy.versionindex != -1);
37764433 muteSlider = false;
37774434 }
37784435
3779
- public boolean Undo()
4436
+ public boolean PreviousVersion()
37804437 {
37814438 // Option?
37824439 Replace();
37834440
37844441 System.err.println("Undo");
37854442
3786
- cRadio tab = GetCurrentTab();
4443
+ //cRadio tab = GetCurrentTab();
37874444
37884445 if (copy.versionindex == 0)
37894446 {
....@@ -3806,7 +4463,7 @@
38064463
38074464 copy.versionindex -= 1;
38084465
3809
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4466
+ CopyChanged();
38104467
38114468 return true;
38124469 }
....@@ -3815,15 +4472,16 @@
38154472 {
38164473 System.err.println("Restore");
38174474
3818
- cRadio tab = GetCurrentTab();
4475
+ //cRadio tab = GetCurrentTab();
38194476
3820
- if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
4477
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
38214478 {
38224479 java.awt.Toolkit.getDefaultToolkit().beep();
38234480 return false;
38244481 }
38254482
3826
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4483
+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4484
+ CopyChanged();
38274485
38284486 return true;
38294487 }
....@@ -3832,27 +4490,27 @@
38324490 {
38334491 System.err.println("Replace");
38344492
3835
- cRadio tab = GetCurrentTab();
4493
+ //cRadio tab = GetCurrentTab();
38364494
3837
- if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
4495
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
38384496 {
38394497 // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
38404498 return false;
38414499 }
38424500
3843
- copy.versions[copy.versionindex] = CompressCopy();
4501
+ copy.versionlist[copy.versionindex] = Duplicate(copy);
38444502
38454503 return true;
38464504 }
38474505
3848
- public void Redo()
4506
+ public void NextVersion()
38494507 {
38504508 // Option?
38514509 Replace();
38524510
3853
- cRadio tab = GetCurrentTab();
4511
+ //cRadio tab = GetCurrentTab();
38544512
3855
- if (copy.versions[copy.versionindex + 1] == null)
4513
+ if (copy.versionlist[copy.versionindex + 1] == null)
38564514 {
38574515 java.awt.Toolkit.getDefaultToolkit().beep();
38584516 return;
....@@ -3860,7 +4518,7 @@
38604518
38614519 copy.versionindex += 1;
38624520
3863
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4521
+ CopyChanged();
38644522
38654523 //if (!tab.user[tab.versionindex])
38664524 // tab.graphs[tab.versionindex] = null;
....@@ -4074,7 +4732,7 @@
40744732 //copy.material = new cMaterial(copy.GetMaterial());
40754733
40764734 current.color = (float) colorField.getFloat();
4077
- current.modulation = (float) modulationField.getFloat();
4735
+ current.modulation = (float) saturationField.getFloat();
40784736 current.metalness = (float) metalnessField.getFloat();
40794737 current.diffuse = (float) diffuseField.getFloat();
40804738 current.specular = (float) specularField.getFloat();
....@@ -4107,7 +4765,7 @@
41074765 cMaterial mat = copy.material;
41084766
41094767 colorField.SetToolTipValue((mat.color));
4110
- modulationField.SetToolTipValue((mat.modulation));
4768
+ saturationField.SetToolTipValue((mat.modulation));
41114769 metalnessField.SetToolTipValue((mat.metalness));
41124770 diffuseField.SetToolTipValue((mat.diffuse));
41134771 specularField.SetToolTipValue((mat.specular));
....@@ -4169,11 +4827,14 @@
41694827 if (muteSlider)
41704828 return;
41714829
4830
+ Replace();
4831
+
41724832 int version = versionSlider.getInteger();
41734833
4174
- if (copy.versions[version] != null)
4834
+ if (version != -1 && copy.versionlist[version] != null)
41754835 {
4176
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
4836
+ copy.versionindex = version;
4837
+ CopyChanged();
41774838 }
41784839
41794840 return;
....@@ -4213,6 +4874,12 @@
42134874 {
42144875 //System.out.println("stateChanged = " + this);
42154876 materialtouched = true;
4877
+
4878
+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
4879
+ {
4880
+ saturationField.setFloat(1);
4881
+ }
4882
+
42164883 applySelf();
42174884 //System.out.println("this = " + this);
42184885 //System.out.println("PARENT = " + parent);
....@@ -4512,6 +5179,7 @@
45125179 {
45135180 if (GetTree() != null)
45145181 {
5182
+ GetTree().revalidate();
45155183 GetTree().repaint();
45165184 }
45175185
....@@ -4520,6 +5188,11 @@
45205188 ctrlPanel.validate(); // ? new
45215189 ctrlPanel.repaint();
45225190 }
5191
+
5192
+ if (previousVersionButton != null && copy.versionlist != null)
5193
+ SetVersionStates();
5194
+
5195
+ cameraView.requestFocusInWindow();
45235196 }
45245197
45255198 static TweenManager tweenManager = new TweenManager();
....@@ -4551,7 +5224,7 @@
45515224 // group = (Composite) group.get(0);
45525225 // }
45535226
4554
- System.out.println("makeSomething of " + thing);
5227
+ //System.out.println("makeSomething of " + thing);
45555228
45565229 /*
45575230 if (deselect && jList != null)
....@@ -4768,7 +5441,9 @@
47685441 readobj.ResetDisplayList();
47695442 } catch (Exception e)
47705443 {
4771
- //e.printStackTrace();
5444
+ if (!e.toString().contains("GZIP"))
5445
+ e.printStackTrace();
5446
+
47725447 try
47735448 {
47745449 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4848,6 +5523,8 @@
48485523 {
48495524 //readobj.deepCopySelf(copy);
48505525 copy.clear(); // june 2014
5526
+ copy.skyboxname = readobj.skyboxname;
5527
+ copy.skyboxext = readobj.skyboxext;
48515528 for (int i = 0; i < readobj.size(); i++)
48525529 {
48535530 Object3D child = readobj.get(i); // reserve(i);
....@@ -4888,6 +5565,7 @@
48885565 }
48895566 } catch (ClassCastException e)
48905567 {
5568
+ e.printStackTrace();
48915569 assert (false);
48925570 Composite c = (Composite) copy;
48935571 c.children.clear();
....@@ -4898,13 +5576,16 @@
48985576 c.addChild(csg);
48995577 }
49005578
4901
- copy.versions = readobj.versions;
5579
+ copy.versionlist = readobj.versionlist;
49025580 copy.versionindex = readobj.versionindex;
49035581
4904
- if (copy.versions == null)
5582
+ if (copy.versionlist == null)
49055583 {
4906
- copy.versions = new byte[100][];
5584
+ // Backward compatibility
5585
+ copy.versionlist = new Object3D[100];
49075586 copy.versionindex = -1;
5587
+
5588
+ //Save(true);
49085589 }
49095590
49105591 //? SetUndoStates();
....@@ -4919,7 +5600,7 @@
49195600 {
49205601 if (Grafreed.standAlone)
49215602 {
4922
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5603
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
49235604 browser.show();
49245605 String filename = browser.getFile();
49255606 if (filename != null && filename.length() > 0)
....@@ -4996,6 +5677,8 @@
49965677
49975678 void save()
49985679 {
5680
+ Replace();
5681
+
49995682 if (lastname == null)
50005683 {
50015684 return;
....@@ -5018,6 +5701,7 @@
50185701 //ps.print(buffer.toString());
50195702 } catch (IOException e)
50205703 {
5704
+ e.printStackTrace();
50215705 }
50225706 }
50235707
....@@ -5237,6 +5921,7 @@
52375921 ButtonGroup buttonGroup;
52385922
52395923 cGridBag toolboxPanel;
5924
+ cGridBag skyboxPanel;
52405925 cGridBag materialPanel;
52415926 cGridBag ctrlPanel;
52425927
....@@ -5310,7 +5995,7 @@
53105995 JLabel colorLabel;
53115996 cNumberSlider colorField;
53125997 JLabel modulationLabel;
5313
- cNumberSlider modulationField;
5998
+ cNumberSlider saturationField;
53145999 JLabel metalnessLabel;
53156000 cNumberSlider metalnessField;
53166001 JLabel diffuseLabel;
....@@ -5341,6 +6026,7 @@
53416026 cNumberSlider anisoField;
53426027 JLabel anisoVLabel;
53436028 cNumberSlider anisoVField;
6029
+
53446030 JLabel cameraLabel;
53456031 cNumberSlider cameraField;
53466032 JLabel selfshadowLabel;
....@@ -5355,6 +6041,7 @@
53556041 cNumberSlider fakedepthField;
53566042 JLabel shadowbiasLabel;
53576043 cNumberSlider shadowbiasField;
6044
+
53586045 JLabel bumpLabel;
53596046 cNumberSlider bumpField;
53606047 JLabel noiseLabel;