Normand Briere
2019-08-16 83d0c2fa0bd2e96448f776144e1a89cdb1bb6998
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,119 @@
4142 JFrame frame;
4243
4344 static ObjEditor theFrame;
45
+
46
+ public void AllocProjectedVertices(Object3D object)
47
+ {
48
+ assert (object.projectedVertices != null);
49
+
50
+ if (object.projectedVertices.length <= 2)
51
+ {
52
+ // Side effect...
53
+ Object3D.cVector2[] keep = object.projectedVertices;
54
+ object.projectedVertices = new Object3D.cVector2[3];
55
+ for (int i = 0; i < 3; i++)
56
+ {
57
+ if (i < keep.length)
58
+ {
59
+ object.projectedVertices[i] = keep[i];
60
+ } else
61
+ {
62
+ object.projectedVertices[i] = new Object3D.cVector2();
63
+ }
64
+ /*
65
+ if(keep.length == 0)
66
+ object.projectedVertices[0] = new Object3D.cVector2();
67
+ else
68
+ object.projectedVertices[0] = keep[0];
69
+ object.projectedVertices[1] = new Object3D.cVector2();
70
+ */
71
+ }
72
+ }
73
+ }
74
+
75
+ public cGridBag GetSeparator()
76
+ {
77
+ cGridBag separator = new cGridBag();
78
+ separator.add(new JSeparator());
79
+ separator.preferredHeight = 5;
80
+ return separator;
81
+ }
4482
4583 cButton GetButton(String name, boolean border)
4684 {
47
- try
48
- {
49
- ImageIcon icon = GetIcon(name);
50
- return new cButton(icon, border);
51
- }
52
- catch (Exception e)
53
- {
54
- return new cButton(name, border);
55
- }
85
+ ImageIcon icon = GetIcon(name);
86
+ 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);
5693 }
5794
5895 cToggleButton GetToggleButton(String name, boolean border)
5996 {
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
- }
97
+ ImageIcon icon = GetIcon(name);
98
+ return new cToggleButton(icon, border);
6999 }
70100
71101 cCheckBox GetCheckBox(String name, boolean border)
72102 {
103
+ ImageIcon icon = GetIcon(name);
104
+ return new cCheckBox(icon, border);
105
+ }
106
+
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
+
73117 try
74118 {
75
- ImageIcon icon = GetIcon(name);
76
- return new cCheckBox(icon, border);
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;
77138 }
78139 catch (Exception e)
79140 {
80
- return new cCheckBox(name, border);
141
+ //icons.put(name, null);
142
+ return null;
81143 }
82144 }
83
-
84
- private ImageIcon GetIcon(String name) throws IOException
145
+
146
+ BufferedImage GetImage(String name)
85147 {
86
- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87
-
88
- if (image.getWidth() != 24 && image.getHeight() != 24)
148
+ try
89149 {
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;
150
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
151
+
152
+ return image;
98153 }
99
-
100
- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101
- return icon;
154
+ catch (Exception e)
155
+ {
156
+ return null;
157
+ }
102158 }
103159
104160 // SCRIPT
....@@ -282,6 +338,14 @@
282338 client = inClient;
283339 copy = client;
284340
341
+// if (copy.versionlist == null)
342
+// {
343
+// copy.versionlist = new Object3D[100];
344
+// copy.versionindex = -1;
345
+//
346
+// callee.Save(true);
347
+// }
348
+
285349 // "this" is not called: SetupUI2(objEditor);
286350 }
287351
....@@ -295,6 +359,14 @@
295359 client = inClient;
296360 copy = client;
297361
362
+ if (copy.versionlist == null)
363
+ {
364
+ copy.versionlist = new Object3D[100];
365
+ copy.versionindex = -1;
366
+
367
+// Save(true);
368
+ }
369
+
298370 SetupUI2(callee.GetEditor());
299371 }
300372
....@@ -316,7 +388,8 @@
316388 //parent = p;
317389
318390 GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
319
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
391
+ if (Globals.DEBUG)
392
+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
320393 //gd.setFullScreenWindow(this);
321394 //setResizable(false);
322395 //if (!isDisplayable())
....@@ -327,6 +400,14 @@
327400 copy = localCopy;
328401 copy.editWindow = this;
329402
403
+// if (copy.versionlist == null)
404
+// {
405
+// copy.versionlist = new Object3D[100];
406
+// copy.versionindex = -1;
407
+//
408
+// Save(true);
409
+// }
410
+
330411 SetupMenu();
331412
332413 //SetupName(objEditor); // new
....@@ -394,6 +475,8 @@
394475
395476 ChangeListener changeListener = new ChangeListener()
396477 {
478
+ //String name;
479
+
397480 public void stateChanged(ChangeEvent changeEvent)
398481 {
399482 // if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -412,18 +495,49 @@
412495 // EditSelection(false);
413496 // }
414497
415
- 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();
416529 }
417530 };
418531 objectPanel.addChangeListener(changeListener);
419532
420533 toolbarPanel = new JPanel();
421534 toolbarPanel.setName("Toolbar");
535
+
422536 treePanel = new cGridBag();
423537 treePanel.setName("Tree");
424538
425539 editPanel = new cGridBag().setVertical(true);
426
- editPanel.setName("Edit");
540
+ //editPanel.setName("Edit");
427541
428542 ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429543
....@@ -431,11 +545,13 @@
431545 editPanel.add(editCommandsPanel);
432546 editPanel.add(ctrlPanel);
433547
434
- toolboxPanel = new cGridBag().setVertical(false);
435
- toolboxPanel.setName("Toolbox");
548
+ toolboxPanel = new cGridBag().setVertical(true);
549
+ //toolboxPanel.setName("Toolbox");
436550
437
- materialPanel = new cGridBag().setVertical(true);
438
- materialPanel.setName("Material");
551
+ skyboxPanel = new cGridBag().setVertical(true);
552
+
553
+ materialPanel = new cGridBag().setVertical(false);
554
+ //materialPanel.setName("Material");
439555
440556 /*JTextPane*/
441557 infoarea = createTextPane();
....@@ -443,6 +559,7 @@
443559
444560 infoarea.setEditable(true);
445561 SetText();
562
+
446563 // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447564 // infoarea.setOpaque(false);
448565 // //infoarea.setForeground(textcolor);
....@@ -450,7 +567,7 @@
450567 // TEXTAREA infoarea.setWrapStyleWord(true);
451568 infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452569 infoPanel.setPreferredSize(new Dimension(1, 1));
453
- infoPanel.setName("Info");
570
+ //infoPanel.setName("Info");
454571 //infoPanel.setLayout(new BorderLayout());
455572 //infoPanel.add(createTextPane());
456573
....@@ -717,6 +834,7 @@
717834 boolean maximized;
718835
719836 cButton fullscreenLayout;
837
+ cButton expandedLayout;
720838
721839 void Minimize()
722840 {
....@@ -756,10 +874,12 @@
756874 cButton minButton;
757875 cButton maxButton;
758876 cButton fullButton;
877
+ cButton collapseButton;
878
+ cButton maximize3DButton;
759879
760880 void ToggleFullScreen()
761881 {
762
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
882
+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
763883
764884 cameraView.ToggleFullScreen();
765885
....@@ -780,13 +900,13 @@
780900 // X frame.getContentPane().remove(/*"Center",*/bigThree);
781901 // X framePanel.add(bigThree);
782902 // X frame.getContentPane().add(/*"Center",*/framePanel);
783
- framePanel.setDividerLocation(46);
903
+// framePanel.setDividerLocation(46); // icons are 24x24
784904
785905 //frame.setVisible(true);
786
- radio.layout = keepButton;
906
+// radio.layout = keepButton;
787907 //theFrame = null;
788908 keepButton = null;
789
- radio.layout.doClick();
909
+// radio.layout.doClick();
790910
791911 } else
792912 {
....@@ -807,14 +927,53 @@
807927 // X frame.getContentPane().remove(/*"Center",*/framePanel);
808928 // X framePanel.remove(bigThree);
809929 // X frame.getContentPane().add(/*"Center",*/bigThree);
810
- framePanel.setDividerLocation(0);
930
+// framePanel.setDividerLocation(0);
811931
812
- radio.layout = fullscreenLayout;
813
- radio.layout.doClick();
932
+// radio.layout = fullscreenLayout;
933
+// radio.layout.doClick();
814934 //frame.setVisible(true);
815935 }
816936 frame.validate();
937
+
938
+ cameraView.requestFocusInWindow();
817939 }
940
+
941
+ void CollapseToolbar()
942
+ {
943
+ framePanel.setDividerLocation(0);
944
+ //frame.validate();
945
+
946
+ cameraView.requestFocusInWindow();
947
+ }
948
+
949
+ private Object3D Duplicate(Object3D object)
950
+ {
951
+ boolean temp = CameraPane.SWITCH;
952
+ CameraPane.SWITCH = false;
953
+
954
+ if (Grafreed.grafreed.universe.versiontable == null)
955
+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
956
+
957
+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
958
+ // if (copy == client)
959
+
960
+ Object3D versions[] = object.versionlist;
961
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
962
+ object.versionlist = null;
963
+ object.versiontable = null;
964
+
965
+ //byte[] compress = Compress(copy);
966
+ Object3D compress = (Object3D)Grafreed.clone(object);
967
+
968
+ object.versionlist = versions;
969
+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
970
+
971
+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
972
+
973
+ CameraPane.SWITCH = temp;
974
+
975
+ return compress;
976
+ }
818977
819978 private JTextPane createTextPane()
820979 {
....@@ -937,6 +1096,7 @@
9371096 {
9381097 SetupMaterial(materialPanel);
9391098 }
1099
+
9401100 //SetupName();
9411101 //SetupViews();
9421102 }
....@@ -946,7 +1106,7 @@
9461106 // NumberSlider vDivsField;
9471107 // JCheckBox endcaps;
9481108 JCheckBox liveCB;
949
- JCheckBox selectCB;
1109
+ JCheckBox selectableCB;
9501110 JCheckBox hideCB;
9511111 JCheckBox link2masterCB;
9521112 JCheckBox markCB;
....@@ -1145,6 +1305,18 @@
11451305
11461306 namePanel = new cGridBag();
11471307
1308
+ //if (copy.pinned)
1309
+ {
1310
+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1311
+ pinButton.setSelected(copy.pinned);
1312
+ cGridBag t = new cGridBag();
1313
+ t.preferredWidth = 2;
1314
+ t.add(pinButton);
1315
+ namePanel.add(t);
1316
+
1317
+ pinButton.addItemListener(this);
1318
+ }
1319
+
11481320 nameField = AddText(namePanel, copy.GetName());
11491321 namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
11501322 oe.ctrlPanel.add(namePanel);
....@@ -1158,13 +1330,16 @@
11581330
11591331 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
11601332 liveCB.setToolTipText("Animate object");
1161
- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1162
- selectCB.setToolTipText("Make object selectable");
1333
+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1334
+ markCB.setToolTipText("Set target transform");
1335
+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1336
+ selectableCB.setToolTipText("Make object selectable");
11631337 // Return();
1338
+
11641339 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
11651340 hideCB.setToolTipText("Hide object");
1166
- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1167
- markCB.setToolTipText("As animation target transform");
1341
+
1342
+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
11681343
11691344 setupPanel2 = new cGridBag().setVertical(false);
11701345
....@@ -1364,6 +1539,7 @@
13641539
13651540 if (cam == null || !(copy.get(0) instanceof cGroup))
13661541 {
1542
+ if (Globals.DEBUG)
13671543 System.out.println("CREATE CAMERAS");
13681544 cams = new cTemplate();
13691545 cams.name = "Cameras";
....@@ -1452,6 +1628,7 @@
14521628 XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
14531629 XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
14541630 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1631
+ //XYZPanel.setName("XYZ");
14551632
14561633 /*
14571634 gridPanel = new JPanel(); //new BorderLayout());
....@@ -1488,18 +1665,30 @@
14881665
14891666 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
14901667 //tmp.setName("Edit");
1668
+ objectPanel.add(toolboxPanel);
1669
+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1670
+ objectPanel.setToolTipTextAt(0, "Objects & textures");
1671
+
14911672 objectPanel.add(materialPanel);
1673
+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1674
+ objectPanel.setToolTipTextAt(1, "Material");
1675
+
1676
+ objectPanel.add(skyboxPanel);
1677
+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1678
+ objectPanel.setToolTipTextAt(2, "Backgrounds");
1679
+
14921680 // JPanel north = new JPanel(new BorderLayout());
14931681 // north.setName("Edit");
14941682 // north.add(ctrlPanel, BorderLayout.NORTH);
14951683 // objectPanel.add(north);
14961684 objectPanel.add(editPanel);
1685
+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1686
+ objectPanel.setToolTipTextAt(3, "Edit controls");
14971687
1498
- //if (Globals.ADVANCED)
1499
- objectPanel.add(infoPanel);
1688
+ objectPanel.add(XYZPanel);
1689
+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1690
+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
15001691
1501
- objectPanel.add(toolboxPanel);
1502
-
15031692 /*
15041693 aConstraints.gridx = 0;
15051694 aConstraints.gridwidth = 1;
....@@ -1519,7 +1708,7 @@
15191708 scrollpane.addMouseWheelListener(this); // Default not fast enough
15201709
15211710 /*JTabbedPane*/ scenePanel = new cGridBag();
1522
- scenePanel.preferredWidth = 6;
1711
+ scenePanel.preferredWidth = 5;
15231712
15241713 JTabbedPane tabbedPane = new JTabbedPane();
15251714 tabbedPane.add(scrollpane);
....@@ -1536,6 +1725,11 @@
15361725
15371726 scenePanel.add(tabbedPane);
15381727
1728
+ //if (Globals.ADVANCED)
1729
+// tabbedPane.add(infoPanel);
1730
+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1731
+// tabbedPane.setToolTipTextAt(3, "Information");
1732
+
15391733 /*
15401734 cTree jTree = new cTree(null);
15411735 ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1597,7 +1791,7 @@
15971791 bigThree = new cGridBag();
15981792 bigThree.addComponent(scenePanel);
15991793 bigThree.addComponent(centralPanel);
1600
- bigThree.addComponent(XYZPanel);
1794
+ //bigThree.addComponent(XYZPanel);
16011795
16021796 // // SIDE EFFECT!!!
16031797 // aConstraints.gridx = 0;
....@@ -1606,6 +1800,23 @@
16061800 // aConstraints.gridheight = 1;
16071801
16081802 framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1803
+
1804
+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1805
+ new java.beans.PropertyChangeListener()
1806
+ {
1807
+ public void propertyChange(java.beans.PropertyChangeEvent pce)
1808
+ {
1809
+ if ((Integer)pce.getOldValue() == 1)
1810
+ {
1811
+ if (radio.layout != expandedLayout)
1812
+ {
1813
+ radio.layout = expandedLayout;
1814
+ radio.layout.doClick();
1815
+ }
1816
+ }
1817
+ }
1818
+ });
1819
+
16091820 framePanel.setContinuousLayout(false);
16101821 framePanel.setOneTouchExpandable(false);
16111822 //.setDividerLocation(0.8);
....@@ -1615,7 +1826,7 @@
16151826
16161827 frame.getContentPane().setLayout(new BorderLayout());
16171828 /**/
1618
- JTabbedPane worldPane = new JTabbedPane();
1829
+ //JTabbedPane worldPane = new JTabbedPane();
16191830 //worldPane.add(bigPanel);
16201831 //worldPane.add(worldPanel);
16211832 /**/
....@@ -1638,7 +1849,6 @@
16381849 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16391850 frame.addWindowListener(new WindowAdapter()
16401851 {
1641
-
16421852 public void windowClosing(WindowEvent e)
16431853 {
16441854 Close();
....@@ -1661,12 +1871,418 @@
16611871 ctrlPanel.removeAll();
16621872 }
16631873
1664
- void SetupMaterial(cGridBag panel)
1874
+ void SetupMaterial(cGridBag materialpanel)
16651875 {
1666
- /*
1876
+ cGridBag presetpanel = new cGridBag().setVertical(true);
1877
+
1878
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1879
+ skin.setToolTipText("Skin");
1880
+ skin.addMouseListener(new MouseAdapter()
1881
+ {
1882
+ public void mouseClicked(MouseEvent e)
1883
+ {
1884
+ Object3D object = Grafreed.materials.versionlist[0].get(0);
1885
+ cMaterial material = object.material;
1886
+
1887
+ // Skin
1888
+ colorField.setFloat(material.color);
1889
+ saturationField.setFloat(material.modulation);
1890
+ subsurfaceField.setFloat(material.subsurface);
1891
+ selfshadowField.setFloat(material.diffuseness);
1892
+ diffusenessField.setFloat(material.factor);
1893
+ shininessField.setFloat(material.shininess);
1894
+ shadowbiasField.setFloat(material.shadowbias);
1895
+ diffuseField.setFloat(material.diffuse);
1896
+ specularField.setFloat(material.specular);
1897
+
1898
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
1899
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
1900
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
1901
+
1902
+ materialtouched = true;
1903
+ applySelf();
1904
+ }
1905
+ });
1906
+ presetpanel.add(skin);
1907
+
1908
+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
1909
+ lambert.setToolTipText("Diffuse");
1910
+ lambert.addMouseListener(new MouseAdapter()
1911
+ {
1912
+ public void mouseClicked(MouseEvent e)
1913
+ {
1914
+ Object3D object = Grafreed.materials.versionlist[2].get(0);
1915
+ cMaterial material = object.material;
1916
+
1917
+ diffusenessField.setFloat(material.factor);
1918
+ selfshadowField.setFloat(material.diffuseness);
1919
+
1920
+ materialtouched = true;
1921
+ applySelf();
1922
+ }
1923
+ });
1924
+ presetpanel.add(lambert);
1925
+
1926
+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
1927
+ diffuse2.setToolTipText("Diffuse2");
1928
+ diffuse2.addMouseListener(new MouseAdapter()
1929
+ {
1930
+ public void mouseClicked(MouseEvent e)
1931
+ {
1932
+ Object3D object = Grafreed.materials.versionlist[3].get(0);
1933
+ cMaterial material = object.material;
1934
+
1935
+ diffusenessField.setFloat(material.factor);
1936
+ selfshadowField.setFloat(material.diffuseness);
1937
+
1938
+ materialtouched = true;
1939
+ applySelf();
1940
+ }
1941
+ });
1942
+ presetpanel.add(diffuse2);
1943
+
1944
+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
1945
+ diffusemoon.setToolTipText("Moon");
1946
+ diffusemoon.addMouseListener(new MouseAdapter()
1947
+ {
1948
+ public void mouseClicked(MouseEvent e)
1949
+ {
1950
+ Object3D object = Grafreed.materials.versionlist[4].get(0);
1951
+ cMaterial material = object.material;
1952
+
1953
+ diffusenessField.setFloat(material.factor);
1954
+ selfshadowField.setFloat(material.diffuseness);
1955
+
1956
+ materialtouched = true;
1957
+ applySelf();
1958
+ }
1959
+ });
1960
+ presetpanel.add(diffusemoon);
1961
+
1962
+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
1963
+ diffusemoon2.setToolTipText("Moon2");
1964
+ diffusemoon2.addMouseListener(new MouseAdapter()
1965
+ {
1966
+ public void mouseClicked(MouseEvent e)
1967
+ {
1968
+ Object3D object = Grafreed.materials.versionlist[5].get(0);
1969
+ cMaterial material = object.material;
1970
+
1971
+ diffusenessField.setFloat(material.factor);
1972
+ selfshadowField.setFloat(material.diffuseness);
1973
+
1974
+ materialtouched = true;
1975
+ applySelf();
1976
+ }
1977
+ });
1978
+ presetpanel.add(diffusemoon2);
1979
+
1980
+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
1981
+ diffusemoon3.setToolTipText("Moon3");
1982
+ diffusemoon3.addMouseListener(new MouseAdapter()
1983
+ {
1984
+ public void mouseClicked(MouseEvent e)
1985
+ {
1986
+ Object3D object = Grafreed.materials.versionlist[6].get(0);
1987
+ cMaterial material = object.material;
1988
+
1989
+ diffusenessField.setFloat(material.factor);
1990
+ selfshadowField.setFloat(material.diffuseness);
1991
+
1992
+ materialtouched = true;
1993
+ applySelf();
1994
+ }
1995
+ });
1996
+ presetpanel.add(diffusemoon3);
1997
+
1998
+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
1999
+ diffusesheen.setToolTipText("Sheen");
2000
+ diffusesheen.addMouseListener(new MouseAdapter()
2001
+ {
2002
+ public void mouseClicked(MouseEvent e)
2003
+ {
2004
+ Object3D object = Grafreed.materials.versionlist[7].get(0);
2005
+ cMaterial material = object.material;
2006
+
2007
+ sheenField.setFloat(material.sheen);
2008
+
2009
+ materialtouched = true;
2010
+ applySelf();
2011
+ }
2012
+ });
2013
+ presetpanel.add(diffusesheen);
2014
+
2015
+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
2016
+ rough.setToolTipText("Rough metal");
2017
+ rough.addMouseListener(new MouseAdapter()
2018
+ {
2019
+ public void mouseClicked(MouseEvent e)
2020
+ {
2021
+ Object3D object = Grafreed.materials.versionlist[1].get(0);
2022
+ cMaterial material = object.material;
2023
+
2024
+ shininessField.setFloat(material.shininess);
2025
+ velvetField.setFloat(material.velvet);
2026
+
2027
+ materialtouched = true;
2028
+ applySelf();
2029
+ }
2030
+ });
2031
+ presetpanel.add(rough);
2032
+
2033
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
2034
+ rough2.setToolTipText("Medium metal");
2035
+ rough2.addMouseListener(new MouseAdapter()
2036
+ {
2037
+ public void mouseClicked(MouseEvent e)
2038
+ {
2039
+ Object3D object = Grafreed.materials.versionlist[13].get(0);
2040
+ cMaterial material = object.material;
2041
+
2042
+ shininessField.setFloat(material.shininess);
2043
+ lightareaField.setFloat(material.lightarea);
2044
+
2045
+ materialtouched = true;
2046
+ applySelf();
2047
+ }
2048
+ });
2049
+ presetpanel.add(rough2);
2050
+
2051
+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
2052
+ shini0.setToolTipText("Shiny");
2053
+ shini0.addMouseListener(new MouseAdapter()
2054
+ {
2055
+ public void mouseClicked(MouseEvent e)
2056
+ {
2057
+ Object3D object = Grafreed.materials.versionlist[14].get(0);
2058
+ cMaterial material = object.material;
2059
+
2060
+ shininessField.setFloat(material.shininess);
2061
+ lightareaField.setFloat(material.lightarea);
2062
+
2063
+ materialtouched = true;
2064
+ applySelf();
2065
+ }
2066
+ });
2067
+ presetpanel.add(shini0);
2068
+
2069
+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
2070
+ shini1.setToolTipText("Shiny2");
2071
+ shini1.addMouseListener(new MouseAdapter()
2072
+ {
2073
+ public void mouseClicked(MouseEvent e)
2074
+ {
2075
+ Object3D object = Grafreed.materials.versionlist[11].get(0);
2076
+ cMaterial material = object.material;
2077
+
2078
+ shininessField.setFloat(material.shininess);
2079
+ lightareaField.setFloat(material.lightarea);
2080
+
2081
+ materialtouched = true;
2082
+ applySelf();
2083
+ }
2084
+ });
2085
+ presetpanel.add(shini1);
2086
+
2087
+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2088
+ shini2.setToolTipText("Shiny3");
2089
+ shini2.addMouseListener(new MouseAdapter()
2090
+ {
2091
+ public void mouseClicked(MouseEvent e)
2092
+ {
2093
+ Object3D object = Grafreed.materials.versionlist[12].get(0);
2094
+ cMaterial material = object.material;
2095
+
2096
+ shininessField.setFloat(material.shininess);
2097
+ lightareaField.setFloat(material.lightarea);
2098
+
2099
+ materialtouched = true;
2100
+ applySelf();
2101
+ }
2102
+ });
2103
+ presetpanel.add(shini2);
2104
+
2105
+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2106
+ aniso.setToolTipText("AnisoU");
2107
+ aniso.addMouseListener(new MouseAdapter()
2108
+ {
2109
+ public void mouseClicked(MouseEvent e)
2110
+ {
2111
+ Object3D object = Grafreed.materials.versionlist[8].get(0);
2112
+ cMaterial material = object.material;
2113
+
2114
+ anisoField.setFloat(material.aniso);
2115
+ anisoVField.setFloat(material.anisoV);
2116
+
2117
+ materialtouched = true;
2118
+ applySelf();
2119
+ }
2120
+ });
2121
+ presetpanel.add(aniso);
2122
+
2123
+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2124
+ aniso2.setToolTipText("AnisoV");
2125
+ aniso2.addMouseListener(new MouseAdapter()
2126
+ {
2127
+ public void mouseClicked(MouseEvent e)
2128
+ {
2129
+ Object3D object = Grafreed.materials.versionlist[9].get(0);
2130
+ cMaterial material = object.material;
2131
+
2132
+ anisoField.setFloat(material.aniso);
2133
+ anisoVField.setFloat(material.anisoV);
2134
+
2135
+ materialtouched = true;
2136
+ applySelf();
2137
+ }
2138
+ });
2139
+ presetpanel.add(aniso2);
2140
+
2141
+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2142
+ aniso3.setToolTipText("AnisoUV");
2143
+ aniso3.addMouseListener(new MouseAdapter()
2144
+ {
2145
+ public void mouseClicked(MouseEvent e)
2146
+ {
2147
+ Object3D object = Grafreed.materials.versionlist[10].get(0);
2148
+ cMaterial material = object.material;
2149
+
2150
+ anisoField.setFloat(material.aniso);
2151
+ anisoVField.setFloat(material.anisoV);
2152
+
2153
+ materialtouched = true;
2154
+ applySelf();
2155
+ }
2156
+ });
2157
+ presetpanel.add(aniso3);
2158
+
2159
+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2160
+ velvet0.setToolTipText("Velvet");
2161
+ velvet0.addMouseListener(new MouseAdapter()
2162
+ {
2163
+ public void mouseClicked(MouseEvent e)
2164
+ {
2165
+ Object3D object = Grafreed.materials.versionlist[15].get(0);
2166
+ cMaterial material = object.material;
2167
+
2168
+ diffusenessField.setFloat(material.factor);
2169
+ selfshadowField.setFloat(material.diffuseness);
2170
+ sheenField.setFloat(material.sheen);
2171
+ shininessField.setFloat(material.shininess);
2172
+ velvetField.setFloat(material.velvet);
2173
+ shiftField.setFloat(material.shift);
2174
+
2175
+ materialtouched = true;
2176
+ applySelf();
2177
+ }
2178
+ });
2179
+ presetpanel.add(velvet0);
2180
+
2181
+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2182
+ bump0.setToolTipText("Bump texture");
2183
+ bump0.addMouseListener(new MouseAdapter()
2184
+ {
2185
+ public void mouseClicked(MouseEvent e)
2186
+ {
2187
+ Object3D object = Grafreed.materials.versionlist[16].get(0);
2188
+ cMaterial material = object.material;
2189
+
2190
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2191
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2192
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2193
+
2194
+ materialtouched = true;
2195
+ applySelf();
2196
+ }
2197
+ });
2198
+ presetpanel.add(bump0);
2199
+
2200
+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2201
+ borderShader.setToolTipText("Border fade");
2202
+ borderShader.addMouseListener(new MouseAdapter()
2203
+ {
2204
+ public void mouseClicked(MouseEvent e)
2205
+ {
2206
+ borderfadeField.setFloat(0.5);
2207
+ opacityField.setFloat(0.75);
2208
+
2209
+ materialtouched = true;
2210
+ applySelf();
2211
+ }
2212
+ });
2213
+ presetpanel.add(borderShader);
2214
+
2215
+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2216
+ halo.setToolTipText("Halo");
2217
+ halo.addMouseListener(new MouseAdapter()
2218
+ {
2219
+ public void mouseClicked(MouseEvent e)
2220
+ {
2221
+ Object3D object = Grafreed.materials.versionlist[17].get(0);
2222
+ cMaterial material = object.material;
2223
+
2224
+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2225
+
2226
+ materialtouched = true;
2227
+ applySelf();
2228
+ }
2229
+ });
2230
+ presetpanel.add(halo);
2231
+
2232
+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2233
+ candle.setToolTipText("Candle");
2234
+ candle.addMouseListener(new MouseAdapter()
2235
+ {
2236
+ public void mouseClicked(MouseEvent e)
2237
+ {
2238
+ Object3D object = Grafreed.materials.versionlist[18].get(0);
2239
+ cMaterial material = object.material;
2240
+
2241
+ subsurfaceField.setFloat(material.subsurface);
2242
+ shadowbiasField.setFloat(material.shadowbias);
2243
+ ambientField.setFloat(material.ambient);
2244
+ specularField.setFloat(material.specular);
2245
+ lightareaField.setFloat(material.lightarea);
2246
+ shininessField.setFloat(material.shininess);
2247
+
2248
+ materialtouched = true;
2249
+ applySelf();
2250
+ }
2251
+ });
2252
+ presetpanel.add(candle);
2253
+
2254
+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2255
+ shadowShader.setToolTipText("Shadow");
2256
+ shadowShader.addMouseListener(new MouseAdapter()
2257
+ {
2258
+ public void mouseClicked(MouseEvent e)
2259
+ {
2260
+ diffuseField.setFloat(0.001);
2261
+ ambientField.setFloat(0.001);
2262
+ cameraField.setFloat(0.001);
2263
+ specularField.setFloat(0.001);
2264
+ fakedepthField.setFloat(0.001);
2265
+ opacityField.setFloat(0.6);
2266
+
2267
+ materialtouched = true;
2268
+ applySelf();
2269
+ }
2270
+ });
2271
+ presetpanel.add(shadowShader);
2272
+
2273
+ cGridBag panel = new cGridBag().setVertical(true);
2274
+
2275
+ presetpanel.preferredWidth = 1;
2276
+
2277
+ materialpanel.add(presetpanel);
2278
+ materialpanel.add(panel);
2279
+
2280
+ panel.preferredWidth = 8;
2281
+
2282
+ /*
16672283 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
16682284 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1669
- */
2285
+ */
16702286
16712287 cGridBag editBar = new cGridBag().setVertical(false);
16722288
....@@ -1700,27 +2316,61 @@
17002316 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17012317
17022318 cGridBag colorSection = new cGridBag().setVertical(true);
2319
+
2320
+ cGridBag huepanel = new cGridBag();
2321
+ cGridBag huelabel = new cGridBag();
2322
+ cLabel hue = GetLabel("icons/hue.png", false);
2323
+ hue.fit = true;
2324
+
2325
+ hue.addMouseListener(new MouseAdapter()
2326
+ {
2327
+ public void mousePressed(MouseEvent e)
2328
+ {
2329
+ int x = e.getX();
2330
+
2331
+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2332
+ }
2333
+ });
2334
+
2335
+ huelabel.add(hue);
2336
+ huelabel.preferredWidth = 20;
2337
+ huepanel.add(new cGridBag()); // Label
2338
+ huepanel.add(huelabel); // Field/slider
2339
+
2340
+ huepanel.preferredHeight = 7;
2341
+
2342
+ colorSection.add(huepanel);
17032343
17042344 cGridBag color = new cGridBag();
1705
- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1706
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1707
- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2345
+
2346
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
2347
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2348
+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2349
+
17082350 //colorField.preferredWidth = 200;
17092351 colorSection.add(color);
17102352
17112353 cGridBag modulation = new cGridBag();
17122354 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
17132355 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1714
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2356
+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
17152357 colorSection.add(modulation);
17162358
2359
+ cGridBag opacity = new cGridBag();
2360
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
2361
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2362
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2363
+ colorSection.add(opacity);
2364
+
2365
+ colorSection.add(GetSeparator());
2366
+
17172367 cGridBag texture = new cGridBag();
17182368 texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
17192369 textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17202370 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
17212371 colorSection.add(texture);
17222372
1723
- panel.add(new JSeparator());
2373
+ panel.add(GetSeparator());
17242374
17252375 panel.add(colorSection);
17262376
....@@ -1776,7 +2426,7 @@
17762426 shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
17772427 diffuseSection.add(shadowbias);
17782428
1779
- panel.add(new JSeparator());
2429
+ panel.add(GetSeparator());
17802430
17812431 panel.add(diffuseSection);
17822432
....@@ -1839,7 +2489,7 @@
18392489 specularSection.add(anisoV);
18402490
18412491
1842
- panel.add(new JSeparator());
2492
+ panel.add(GetSeparator());
18432493
18442494 panel.add(specularSection);
18452495
....@@ -1864,12 +2514,6 @@
18642514 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18652515 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
18662516 colorSection.add(backlit);
1867
-
1868
- cGridBag opacity = new cGridBag();
1869
- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1870
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1871
- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1872
- colorSection.add(opacity);
18732517
18742518 //panel.add(new JSeparator());
18752519
....@@ -1915,7 +2559,7 @@
19152559 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
19162560 textureSection.add(opacityPower);
19172561
1918
- panel.add(new JSeparator());
2562
+ panel.add(GetSeparator());
19192563
19202564 panel.add(textureSection);
19212565
....@@ -2902,7 +3546,7 @@
29023546
29033547 freezematerial = true;
29043548 colorField.setFloat(mat.color);
2905
- modulationField.setFloat(mat.modulation);
3549
+ saturationField.setFloat(mat.modulation);
29063550 metalnessField.setFloat(mat.metalness);
29073551 diffuseField.setFloat(mat.diffuse);
29083552 specularField.setFloat(mat.specular);
....@@ -2964,32 +3608,8 @@
29643608
29653609 if (multiplyToggle != null)
29663610 multiplyToggle.setSelected(mat.multiply);
2967
-
2968
- assert (object.projectedVertices != null);
2969
-
2970
- if (object.projectedVertices.length <= 2)
2971
- {
2972
- // Side effect...
2973
- Object3D.cVector2[] keep = object.projectedVertices;
2974
- object.projectedVertices = new Object3D.cVector2[3];
2975
- for (int i = 0; i < 3; i++)
2976
- {
2977
- if (i < keep.length)
2978
- {
2979
- object.projectedVertices[i] = keep[i];
2980
- } else
2981
- {
2982
- object.projectedVertices[i] = new Object3D.cVector2();
2983
- }
2984
- /*
2985
- if(keep.length == 0)
2986
- object.projectedVertices[0] = new Object3D.cVector2();
2987
- else
2988
- object.projectedVertices[0] = keep[0];
2989
- object.projectedVertices[1] = new Object3D.cVector2();
2990
- */
2991
- }
2992
- }
3611
+
3612
+ AllocProjectedVertices(object);
29933613
29943614 SetMaterial(mat, object.projectedVertices);
29953615 }
....@@ -3109,6 +3729,17 @@
31093729 public void itemStateChanged(ItemEvent event)
31103730 {
31113731 // System.out.println("Propagate = " + propagate);
3732
+ if (event.getSource() == pinButton)
3733
+ {
3734
+ copy.pinned ^= true;
3735
+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3736
+ {
3737
+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
3738
+ copy.CloseUI();
3739
+ //copy.editWindow.refreshContents();
3740
+ }
3741
+ }
3742
+ else
31123743 if (event.getSource() == propagateToggle)
31133744 {
31143745 propagate ^= true;
....@@ -3213,8 +3844,9 @@
32133844 } else if (event.getSource() == liveCB)
32143845 {
32153846 copy.live ^= true;
3847
+ objEditor.refreshContents(true); // To show item colors
32163848 return;
3217
- } else if (event.getSource() == selectCB)
3849
+ } else if (event.getSource() == selectableCB)
32183850 {
32193851 copy.dontselect ^= true;
32203852 return;
....@@ -3222,7 +3854,7 @@
32223854 {
32233855 copy.hide ^= true;
32243856 copy.Touch(); // display list issue
3225
- objEditor.refreshContents();
3857
+ objEditor.refreshContents(true); // To show item colors
32263858 return;
32273859 } else if (event.getSource() == link2masterCB)
32283860 {
....@@ -3287,7 +3919,7 @@
32873919 //System.out.println("ObjEditor " + event);
32883920 applySelf0(true);
32893921 //parent.applySelf();
3290
- objEditor.refreshContents();
3922
+ // conflicts with requestFocus objEditor.refreshContents();
32913923 } else if (source == resetButton)
32923924 {
32933925 CameraPane.fullreset = true;
....@@ -3478,6 +4110,7 @@
34784110
34794111 static public byte[] Compress(Object3D o)
34804112 {
4113
+ // Slower to actually compress.
34814114 try
34824115 {
34834116 ByteArrayOutputStream baos = new ByteArrayOutputStream();
....@@ -3574,11 +4207,12 @@
35744207 return null;
35754208 }
35764209
3577
- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35784210
35794211 public void Save()
35804212 {
3581
- Save(true);
4213
+ //Save(true);
4214
+ Replace();
4215
+ SetVersionStates();
35824216 }
35834217
35844218 private boolean Equal(byte[] compress, byte[] name)
....@@ -3597,59 +4231,73 @@
35974231 return true;
35984232 }
35994233
4234
+ void DeleteVersion()
4235
+ {
4236
+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
4237
+ {
4238
+ copy.versionlist[i] = copy.versionlist[i+1];
4239
+ }
4240
+
4241
+ if (copy.versionlist[copy.versionindex] == null)
4242
+ copy.versionindex -= 1;
4243
+
4244
+ if (copy.versionindex != -1)
4245
+ CopyChanged();
4246
+
4247
+ SetVersionStates();
4248
+ }
4249
+
36004250 public boolean Save(boolean user)
36014251 {
36024252 System.err.println("Save");
4253
+ Replace();
36034254
3604
- cRadio tab = GetCurrentTab();
4255
+ //cRadio tab = GetCurrentTab();
36054256
3606
- boolean temp = CameraPane.SWITCH;
3607
- CameraPane.SWITCH = false;
3608
-
3609
- copy.ExtractBigData(hashtable);
3610
-
3611
- byte[] compress = Compress(copy);
3612
-
3613
- CameraPane.SWITCH = temp;
4257
+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
36144258
36154259 boolean thesame = false;
36164260
3617
- // Quick heuristic using length. Works only when stream is compressed.
3618
- if (tab.undoindex > 0 && tab.graphs[tab.undoindex-1] != null && Equal(compress, tab.graphs[tab.undoindex-1]))
3619
- {
3620
- thesame = true;
3621
- }
4261
+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
4262
+// {
4263
+// thesame = true;
4264
+// }
36224265
36234266 //EditorFrame.m_MainFrame.requestFocusInWindow();
36244267 if (!thesame)
36254268 {
3626
- //tab.user[tab.undoindex] = user;
3627
- boolean increment = tab.graphs[tab.undoindex] == null;
4269
+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
4270
+ {
4271
+ copy.versionlist[i] = copy.versionlist[i-1];
4272
+ }
36284273
3629
- tab.graphs[tab.undoindex] = compress;
4274
+ //tab.user[tab.versionindex] = user;
4275
+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
36304276
3631
- if (increment)
3632
- tab.undoindex++;
4277
+ copy.versionlist[++copy.versionindex] = compress;
4278
+
4279
+ // if (increment)
4280
+ // tab.versionindex++;
36334281 }
36344282
3635
- copy.RestoreBigData(hashtable);
4283
+ //copy.RestoreBigData(versiontable);
36364284
36374285 //assert(hashtable.isEmpty());
36384286
3639
- for (int i = tab.undoindex; i < tab.graphs.length; i++)
3640
- {
3641
- //tab.user[i] = false;
3642
- // tab.graphs[i] = null;
3643
- }
4287
+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
4288
+// {
4289
+// //tab.user[i] = false;
4290
+// copy.versionlist[i] = null;
4291
+// }
36444292
3645
- SetUndoStates();
4293
+ SetVersionStates();
36464294
36474295 // test save
36484296 if (false)
36494297 {
36504298 try
36514299 {
3652
- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
4300
+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
36534301 ObjectOutputStream p = new ObjectOutputStream(ostream);
36544302
36554303 p.writeObject(copy);
....@@ -3665,27 +4313,65 @@
36654313
36664314 return !thesame;
36674315 }
3668
-
3669
- void CopyChanged(Object3D obj)
4316
+
4317
+ boolean flashIt = true;
4318
+
4319
+ void RefreshSelection()
36704320 {
3671
- SetUndoStates();
4321
+ Object3D selection = new Object3D();
4322
+
4323
+ for (int i = 0; i < copy.selection.size(); i++)
4324
+ {
4325
+ Object3D elem = copy.selection.elementAt(i);
4326
+
4327
+ Object3D obj = copy.GetObject(elem.GetUUID());
4328
+
4329
+ if (obj == null)
4330
+ {
4331
+ copy.selection.remove(i--);
4332
+ }
4333
+ else
4334
+ {
4335
+ selection.add(obj);
4336
+ copy.selection.setElementAt(obj, i);
4337
+ }
4338
+ }
4339
+
4340
+ flashIt = false;
4341
+ GetTree().clearSelection();
4342
+ for (int i = 0; i < selection.size(); i++)
4343
+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
4344
+ flashIt = true;
4345
+
4346
+ //refreshContents(false);
4347
+ }
4348
+
4349
+ void CopyChanged()
4350
+ {
4351
+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4352
+
4353
+ SetVersionStates();
36724354
36734355 boolean temp = CameraPane.SWITCH;
36744356 CameraPane.SWITCH = false;
36754357
3676
- copy.ExtractBigData(hashtable);
4358
+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
36774359
36784360 copy.clear();
36794361
4362
+ copy.skyboxname = obj.skyboxname;
4363
+ copy.skyboxext = obj.skyboxext;
4364
+
36804365 for (int i=0; i<obj.Size(); i++)
36814366 {
36824367 copy.add(obj.get(i));
36834368 }
36844369
3685
- copy.RestoreBigData(hashtable);
4370
+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
36864371
36874372 CameraPane.SWITCH = temp;
36884373
4374
+ RefreshSelection();
36894375 //assert(hashtable.isEmpty());
36904376
36914377 copy.Touch();
....@@ -3706,68 +4392,144 @@
37064392 }
37074393 }
37084394
3709
- refreshContents();
4395
+ refreshContents(true);
37104396 }
37114397
3712
- cButton undoButton;
3713
- cButton redoButton;
4398
+ cButton previousVersionButton;
4399
+ cButton restoreButton;
4400
+ cButton replaceButton;
4401
+ cButton nextVersionButton;
4402
+ cButton saveVersionButton;
4403
+ cButton deleteVersionButton;
37144404
3715
- void SetUndoStates()
4405
+ boolean muteSlider;
4406
+
4407
+ int VersionCount()
37164408 {
3717
- cRadio tab = GetCurrentTab();
4409
+ int count = 0;
37184410
3719
- undoButton.setEnabled(tab.undoindex > 0);
3720
- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
4411
+ for (int i = copy.versionlist.length; --i >= 0;)
4412
+ {
4413
+ if (copy.versionlist[i] != null)
4414
+ count++;
4415
+ }
4416
+
4417
+ return count;
37214418 }
37224419
3723
- public boolean Undo()
4420
+ void SetVersionStates()
37244421 {
4422
+ //if (true)
4423
+ // return;
4424
+
4425
+ //cRadio tab = GetCurrentTab();
4426
+
4427
+ restoreButton.setEnabled(copy.versionindex != -1);
4428
+ replaceButton.setEnabled(copy.versionindex != -1);
4429
+
4430
+ previousVersionButton.setEnabled(copy.versionindex > 0);
4431
+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4432
+
4433
+ deleteVersionButton.setEnabled(copy.versionindex != -1);
4434
+ //copy.versionlist[copy.versionindex + 1] != null);
4435
+
4436
+ muteSlider = true;
4437
+ versionSlider.setMinimum(0);
4438
+ versionSlider.setMaximum(VersionCount() - 1);
4439
+ versionSlider.setInteger(copy.versionindex);
4440
+ versionSlider.setEnabled(copy.versionindex != -1);
4441
+ muteSlider = false;
4442
+ }
4443
+
4444
+ public boolean PreviousVersion()
4445
+ {
4446
+ // Option?
4447
+ Replace();
4448
+
37254449 System.err.println("Undo");
37264450
3727
- cRadio tab = GetCurrentTab();
4451
+ //cRadio tab = GetCurrentTab();
37284452
3729
- if (tab.undoindex == 0)
4453
+ if (copy.versionindex == 0)
37304454 {
37314455 java.awt.Toolkit.getDefaultToolkit().beep();
37324456 return false;
37334457 }
37344458
3735
- if (tab.graphs[tab.undoindex] == null) // || !tab.user[tab.undoindex])
3736
- {
3737
- if (Save(false))
3738
- tab.undoindex -= 1;
3739
- else
3740
- {
3741
- if (tab.undoindex <= 0)
3742
- return false;
3743
- else
3744
- tab.undoindex -= 1;
3745
- }
3746
- }
4459
+// if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
4460
+// {
4461
+// if (Save(false))
4462
+// tab.versionindex -= 1;
4463
+// else
4464
+// {
4465
+// if (tab.versionindex <= 0)
4466
+// return false;
4467
+// else
4468
+// tab.versionindex -= 1;
4469
+// }
4470
+// }
37474471
3748
- tab.undoindex -= 1;
4472
+ copy.versionindex -= 1;
37494473
3750
- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
4474
+ CopyChanged();
37514475
37524476 return true;
37534477 }
37544478
3755
- public void Redo()
4479
+ public boolean Restore()
37564480 {
3757
- cRadio tab = GetCurrentTab();
4481
+ System.err.println("Restore");
37584482
3759
- if (tab.graphs[tab.undoindex + 1] == null)
4483
+ //cRadio tab = GetCurrentTab();
4484
+
4485
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4486
+ {
4487
+ java.awt.Toolkit.getDefaultToolkit().beep();
4488
+ return false;
4489
+ }
4490
+
4491
+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4492
+ CopyChanged();
4493
+
4494
+ return true;
4495
+ }
4496
+
4497
+ public boolean Replace()
4498
+ {
4499
+ //System.err.println("Replace");
4500
+
4501
+ //cRadio tab = GetCurrentTab();
4502
+
4503
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4504
+ {
4505
+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
4506
+ return false;
4507
+ }
4508
+
4509
+ copy.versionlist[copy.versionindex] = Duplicate(copy);
4510
+
4511
+ return true;
4512
+ }
4513
+
4514
+ public void NextVersion()
4515
+ {
4516
+ // Option?
4517
+ Replace();
4518
+
4519
+ //cRadio tab = GetCurrentTab();
4520
+
4521
+ if (copy.versionlist[copy.versionindex + 1] == null)
37604522 {
37614523 java.awt.Toolkit.getDefaultToolkit().beep();
37624524 return;
37634525 }
37644526
3765
- tab.undoindex += 1;
4527
+ copy.versionindex += 1;
37664528
3767
- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
4529
+ CopyChanged();
37684530
3769
- //if (!tab.user[tab.undoindex])
3770
- // tab.graphs[tab.undoindex] = null;
4531
+ //if (!tab.user[tab.versionindex])
4532
+ // tab.graphs[tab.versionindex] = null;
37714533 }
37724534
37734535 void ImportGFD()
....@@ -3978,7 +4740,7 @@
39784740 //copy.material = new cMaterial(copy.GetMaterial());
39794741
39804742 current.color = (float) colorField.getFloat();
3981
- current.modulation = (float) modulationField.getFloat();
4743
+ current.modulation = (float) saturationField.getFloat();
39824744 current.metalness = (float) metalnessField.getFloat();
39834745 current.diffuse = (float) diffuseField.getFloat();
39844746 current.specular = (float) specularField.getFloat();
....@@ -4011,7 +4773,7 @@
40114773 cMaterial mat = copy.material;
40124774
40134775 colorField.SetToolTipValue((mat.color));
4014
- modulationField.SetToolTipValue((mat.modulation));
4776
+ saturationField.SetToolTipValue((mat.modulation));
40154777 metalnessField.SetToolTipValue((mat.metalness));
40164778 diffuseField.SetToolTipValue((mat.diffuse));
40174779 specularField.SetToolTipValue((mat.specular));
....@@ -4063,9 +4825,28 @@
40634825 //copy.Touch();
40644826 }
40654827
4828
+ cNumberSlider versionSlider;
4829
+
40664830 public void stateChanged(ChangeEvent e)
40674831 {
40684832 // assert(false);
4833
+ if (e.getSource() == versionSlider)
4834
+ {
4835
+ if (muteSlider)
4836
+ return;
4837
+
4838
+ Replace();
4839
+
4840
+ int version = versionSlider.getInteger();
4841
+
4842
+ if (version != -1 && copy.versionlist[version] != null)
4843
+ {
4844
+ copy.versionindex = version;
4845
+ CopyChanged();
4846
+ }
4847
+
4848
+ return;
4849
+ }
40694850
40704851 if (freezematerial)
40714852 {
....@@ -4101,6 +4882,12 @@
41014882 {
41024883 //System.out.println("stateChanged = " + this);
41034884 materialtouched = true;
4885
+
4886
+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
4887
+ {
4888
+ saturationField.setFloat(1);
4889
+ }
4890
+
41044891 applySelf();
41054892 //System.out.println("this = " + this);
41064893 //System.out.println("PARENT = " + parent);
....@@ -4400,6 +5187,7 @@
44005187 {
44015188 if (GetTree() != null)
44025189 {
5190
+ GetTree().revalidate();
44035191 GetTree().repaint();
44045192 }
44055193
....@@ -4408,13 +5196,18 @@
44085196 ctrlPanel.validate(); // ? new
44095197 ctrlPanel.repaint();
44105198 }
5199
+
5200
+ if (previousVersionButton != null && copy.versionlist != null)
5201
+ SetVersionStates();
5202
+
5203
+ cameraView.requestFocusInWindow();
44115204 }
44125205
44135206 static TweenManager tweenManager = new TweenManager();
44145207
44155208 void makeSomething(Object3D thing, boolean resetmodel) // deselect)
44165209 {
4417
- if (Globals.SAVEONMAKE) // && resetmodel)
5210
+ if (Globals.REPLACEONMAKE) // && resetmodel)
44185211 Save();
44195212 //Tween.set(thing, 0).target(1).start(tweenManager);
44205213 //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4439,7 +5232,7 @@
44395232 // group = (Composite) group.get(0);
44405233 // }
44415234
4442
- System.out.println("makeSomething of " + thing);
5235
+ //System.out.println("makeSomething of " + thing);
44435236
44445237 /*
44455238 if (deselect && jList != null)
....@@ -4656,7 +5449,9 @@
46565449 readobj.ResetDisplayList();
46575450 } catch (Exception e)
46585451 {
4659
- //e.printStackTrace();
5452
+ if (!e.toString().contains("GZIP"))
5453
+ e.printStackTrace();
5454
+
46605455 try
46615456 {
46625457 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4736,6 +5531,8 @@
47365531 {
47375532 //readobj.deepCopySelf(copy);
47385533 copy.clear(); // june 2014
5534
+ copy.skyboxname = readobj.skyboxname;
5535
+ copy.skyboxext = readobj.skyboxext;
47395536 for (int i = 0; i < readobj.size(); i++)
47405537 {
47415538 Object3D child = readobj.get(i); // reserve(i);
....@@ -4776,6 +5573,7 @@
47765573 }
47775574 } catch (ClassCastException e)
47785575 {
5576
+ e.printStackTrace();
47795577 assert (false);
47805578 Composite c = (Composite) copy;
47815579 c.children.clear();
....@@ -4786,6 +5584,21 @@
47865584 c.addChild(csg);
47875585 }
47885586
5587
+ copy.versionlist = readobj.versionlist;
5588
+ copy.versionindex = readobj.versionindex;
5589
+ copy.versiontable = readobj.versiontable;
5590
+
5591
+ if (copy.versionlist == null)
5592
+ {
5593
+ // Backward compatibility
5594
+ copy.versionlist = new Object3D[100];
5595
+ copy.versionindex = -1;
5596
+
5597
+ //Save(true);
5598
+ }
5599
+
5600
+ //? SetUndoStates();
5601
+
47895602 ResetModel();
47905603 copy.HardTouch(); // recompile?
47915604 refreshContents();
....@@ -4796,7 +5609,7 @@
47965609 {
47975610 if (Grafreed.standAlone)
47985611 {
4799
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5612
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
48005613 browser.show();
48015614 String filename = browser.getFile();
48025615 if (filename != null && filename.length() > 0)
....@@ -4873,6 +5686,8 @@
48735686
48745687 void save()
48755688 {
5689
+ Replace();
5690
+
48765691 if (lastname == null)
48775692 {
48785693 return;
....@@ -4895,6 +5710,7 @@
48955710 //ps.print(buffer.toString());
48965711 } catch (IOException e)
48975712 {
5713
+ e.printStackTrace();
48985714 }
48995715 }
49005716
....@@ -5114,6 +5930,7 @@
51145930 ButtonGroup buttonGroup;
51155931
51165932 cGridBag toolboxPanel;
5933
+ cGridBag skyboxPanel;
51175934 cGridBag materialPanel;
51185935 cGridBag ctrlPanel;
51195936
....@@ -5187,7 +6004,7 @@
51876004 JLabel colorLabel;
51886005 cNumberSlider colorField;
51896006 JLabel modulationLabel;
5190
- cNumberSlider modulationField;
6007
+ cNumberSlider saturationField;
51916008 JLabel metalnessLabel;
51926009 cNumberSlider metalnessField;
51936010 JLabel diffuseLabel;
....@@ -5218,6 +6035,7 @@
52186035 cNumberSlider anisoField;
52196036 JLabel anisoVLabel;
52206037 cNumberSlider anisoVField;
6038
+
52216039 JLabel cameraLabel;
52226040 cNumberSlider cameraField;
52236041 JLabel selfshadowLabel;
....@@ -5232,6 +6050,7 @@
52326050 cNumberSlider fakedepthField;
52336051 JLabel shadowbiasLabel;
52346052 cNumberSlider shadowbiasField;
6053
+
52356054 JLabel bumpLabel;
52366055 cNumberSlider bumpField;
52376056 JLabel noiseLabel;