Normand Briere
2019-08-01 c49ad213b600f844e9070cb09390c3e6d3d13db4
ObjEditor.java
....@@ -41,64 +41,78 @@
4141 JFrame frame;
4242
4343 static ObjEditor theFrame;
44
+
45
+ public cGridBag GetSeparator()
46
+ {
47
+ cGridBag separator = new cGridBag();
48
+ separator.add(new JSeparator());
49
+ separator.preferredHeight = 5;
50
+ return separator;
51
+ }
4452
4553 cButton GetButton(String name, boolean border)
4654 {
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
- }
55
+ ImageIcon icon = GetIcon(name);
56
+ return new cButton(icon, border);
57
+ }
58
+
59
+ cLabel GetLabel(String name, boolean border)
60
+ {
61
+ //ImageIcon icon = GetIcon(name);
62
+ return new cLabel(GetImage(name), border);
5663 }
5764
5865 cToggleButton GetToggleButton(String name, boolean border)
5966 {
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
- }
67
+ ImageIcon icon = GetIcon(name);
68
+ return new cToggleButton(icon, border);
6969 }
7070
7171 cCheckBox GetCheckBox(String name, boolean border)
7272 {
73
+ ImageIcon icon = GetIcon(name);
74
+ return new cCheckBox(icon, border);
75
+ }
76
+
77
+ ImageIcon GetIcon(String name)
78
+ {
7379 try
7480 {
75
- ImageIcon icon = GetIcon(name);
76
- return new cCheckBox(icon, border);
81
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
82
+
83
+// if (image.getWidth() > 48 && image.getHeight() > 48)
84
+// {
85
+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
86
+// Graphics2D g = resized.createGraphics();
87
+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
88
+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
89
+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
90
+// g.dispose();
91
+//
92
+// image = resized;
93
+// }
94
+
95
+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
96
+ return icon;
7797 }
7898 catch (Exception e)
7999 {
80
- return new cCheckBox(name, border);
100
+ return null;
81101 }
82102 }
83
-
84
- private ImageIcon GetIcon(String name) throws IOException
103
+
104
+ BufferedImage GetImage(String name)
85105 {
86
- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87
-
88
- if (image.getWidth() != 24 && image.getHeight() != 24)
106
+ try
89107 {
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;
108
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
109
+
110
+ return image;
98111 }
99
-
100
- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101
- return icon;
112
+ catch (Exception e)
113
+ {
114
+ return null;
115
+ }
102116 }
103117
104118 // SCRIPT
....@@ -282,6 +296,12 @@
282296 client = inClient;
283297 copy = client;
284298
299
+ if (copy.versions == null)
300
+ {
301
+ copy.versions = new Object3D[100];
302
+ copy.versionindex = -1;
303
+ }
304
+
285305 // "this" is not called: SetupUI2(objEditor);
286306 }
287307
....@@ -295,6 +315,12 @@
295315 client = inClient;
296316 copy = client;
297317
318
+ if (copy.versions == null)
319
+ {
320
+ copy.versions = new Object3D[100];
321
+ copy.versionindex = -1;
322
+ }
323
+
298324 SetupUI2(callee.GetEditor());
299325 }
300326
....@@ -327,6 +353,12 @@
327353 copy = localCopy;
328354 copy.editWindow = this;
329355
356
+ if (copy.versions == null)
357
+ {
358
+// copy.versions = new byte[100][];
359
+// copy.versionindex = -1;
360
+ }
361
+
330362 SetupMenu();
331363
332364 //SetupName(objEditor); // new
....@@ -419,11 +451,12 @@
419451
420452 toolbarPanel = new JPanel();
421453 toolbarPanel.setName("Toolbar");
454
+
422455 treePanel = new cGridBag();
423456 treePanel.setName("Tree");
424457
425458 editPanel = new cGridBag().setVertical(true);
426
- editPanel.setName("Edit");
459
+ //editPanel.setName("Edit");
427460
428461 ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429462
....@@ -431,11 +464,11 @@
431464 editPanel.add(editCommandsPanel);
432465 editPanel.add(ctrlPanel);
433466
434
- toolboxPanel = new cGridBag().setVertical(false);
435
- toolboxPanel.setName("Toolbox");
467
+ toolboxPanel = new cGridBag().setVertical(true);
468
+ //toolboxPanel.setName("Toolbox");
436469
437470 materialPanel = new cGridBag().setVertical(true);
438
- materialPanel.setName("Material");
471
+ //materialPanel.setName("Material");
439472
440473 /*JTextPane*/
441474 infoarea = createTextPane();
....@@ -443,6 +476,7 @@
443476
444477 infoarea.setEditable(true);
445478 SetText();
479
+
446480 // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447481 // infoarea.setOpaque(false);
448482 // //infoarea.setForeground(textcolor);
....@@ -450,7 +484,7 @@
450484 // TEXTAREA infoarea.setWrapStyleWord(true);
451485 infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452486 infoPanel.setPreferredSize(new Dimension(1, 1));
453
- infoPanel.setName("Info");
487
+ //infoPanel.setName("Info");
454488 //infoPanel.setLayout(new BorderLayout());
455489 //infoPanel.add(createTextPane());
456490
....@@ -816,7 +850,7 @@
816850 frame.validate();
817851 }
818852
819
- private byte[] CompressCopy()
853
+ private Object3D CompressCopy()
820854 {
821855 boolean temp = CameraPane.SWITCH;
822856 CameraPane.SWITCH = false;
....@@ -824,10 +858,11 @@
824858 copy.ExtractBigData(versiontable);
825859 // if (copy == client)
826860
827
- byte[] versions[] = copy.versions;
861
+ Object3D versions[] = copy.versions;
828862 copy.versions = null;
829863
830
- byte[] compress = Compress(copy);
864
+ //byte[] compress = Compress(copy);
865
+ Object3D compress = (Object3D)Grafreed.clone(copy);
831866
832867 copy.versions = versions;
833868
....@@ -968,7 +1003,7 @@
9681003 // NumberSlider vDivsField;
9691004 // JCheckBox endcaps;
9701005 JCheckBox liveCB;
971
- JCheckBox selectCB;
1006
+ JCheckBox selectableCB;
9721007 JCheckBox hideCB;
9731008 JCheckBox link2masterCB;
9741009 JCheckBox markCB;
....@@ -1180,13 +1215,16 @@
11801215
11811216 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
11821217 liveCB.setToolTipText("Animate object");
1183
- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1184
- selectCB.setToolTipText("Make object selectable");
1218
+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1219
+ selectableCB.setToolTipText("Make object selectable");
11851220 // Return();
1221
+
11861222 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
11871223 hideCB.setToolTipText("Hide object");
11881224 markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
11891225 markCB.setToolTipText("As animation target transform");
1226
+
1227
+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
11901228
11911229 setupPanel2 = new cGridBag().setVertical(false);
11921230
....@@ -1474,6 +1512,7 @@
14741512 XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
14751513 XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
14761514 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1515
+ //XYZPanel.setName("XYZ");
14771516
14781517 /*
14791518 gridPanel = new JPanel(); //new BorderLayout());
....@@ -1511,16 +1550,29 @@
15111550 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15121551 //tmp.setName("Edit");
15131552 objectPanel.add(materialPanel);
1553
+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1554
+ objectPanel.setToolTipTextAt(0, "Material panel");
1555
+
15141556 // JPanel north = new JPanel(new BorderLayout());
15151557 // north.setName("Edit");
15161558 // north.add(ctrlPanel, BorderLayout.NORTH);
15171559 // objectPanel.add(north);
15181560 objectPanel.add(editPanel);
1561
+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1562
+ objectPanel.setToolTipTextAt(1, "Edit panel");
15191563
15201564 //if (Globals.ADVANCED)
15211565 objectPanel.add(infoPanel);
1566
+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1567
+ objectPanel.setToolTipTextAt(2, "Info panel");
1568
+
1569
+ objectPanel.add(XYZPanel);
1570
+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1571
+ objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
15221572
15231573 objectPanel.add(toolboxPanel);
1574
+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1575
+ objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
15241576
15251577 /*
15261578 aConstraints.gridx = 0;
....@@ -1541,7 +1593,7 @@
15411593 scrollpane.addMouseWheelListener(this); // Default not fast enough
15421594
15431595 /*JTabbedPane*/ scenePanel = new cGridBag();
1544
- scenePanel.preferredWidth = 6;
1596
+ scenePanel.preferredWidth = 5;
15451597
15461598 JTabbedPane tabbedPane = new JTabbedPane();
15471599 tabbedPane.add(scrollpane);
....@@ -1619,7 +1671,7 @@
16191671 bigThree = new cGridBag();
16201672 bigThree.addComponent(scenePanel);
16211673 bigThree.addComponent(centralPanel);
1622
- bigThree.addComponent(XYZPanel);
1674
+ //bigThree.addComponent(XYZPanel);
16231675
16241676 // // SIDE EFFECT!!!
16251677 // aConstraints.gridx = 0;
....@@ -1660,7 +1712,6 @@
16601712 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16611713 frame.addWindowListener(new WindowAdapter()
16621714 {
1663
-
16641715 public void windowClosing(WindowEvent e)
16651716 {
16661717 Close();
....@@ -1722,27 +1773,48 @@
17221773 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17231774
17241775 cGridBag colorSection = new cGridBag().setVertical(true);
1776
+
1777
+ cGridBag huepanel = new cGridBag();
1778
+ cGridBag huelabel = new cGridBag();
1779
+ huelabel.add(GetLabel("icons/hue.png", false));
1780
+ huelabel.preferredWidth = 20;
1781
+ huepanel.add(new cGridBag()); // Label
1782
+ huepanel.add(huelabel); // Field/slider
1783
+
1784
+ huepanel.preferredHeight = 7;
1785
+
1786
+ colorSection.add(huepanel);
17251787
17261788 cGridBag color = new cGridBag();
1727
- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1728
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1729
- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1789
+
1790
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1791
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1792
+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1793
+
17301794 //colorField.preferredWidth = 200;
17311795 colorSection.add(color);
17321796
17331797 cGridBag modulation = new cGridBag();
17341798 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
17351799 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1736
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1800
+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
17371801 colorSection.add(modulation);
17381802
1803
+ cGridBag opacity = new cGridBag();
1804
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1805
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1806
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1807
+ colorSection.add(opacity);
1808
+
1809
+ colorSection.add(GetSeparator());
1810
+
17391811 cGridBag texture = new cGridBag();
17401812 texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
17411813 textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17421814 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
17431815 colorSection.add(texture);
17441816
1745
- panel.add(new JSeparator());
1817
+ panel.add(GetSeparator());
17461818
17471819 panel.add(colorSection);
17481820
....@@ -1798,7 +1870,7 @@
17981870 shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
17991871 diffuseSection.add(shadowbias);
18001872
1801
- panel.add(new JSeparator());
1873
+ panel.add(GetSeparator());
18021874
18031875 panel.add(diffuseSection);
18041876
....@@ -1861,7 +1933,7 @@
18611933 specularSection.add(anisoV);
18621934
18631935
1864
- panel.add(new JSeparator());
1936
+ panel.add(GetSeparator());
18651937
18661938 panel.add(specularSection);
18671939
....@@ -1886,12 +1958,6 @@
18861958 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18871959 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
18881960 colorSection.add(backlit);
1889
-
1890
- cGridBag opacity = new cGridBag();
1891
- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1892
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1893
- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1894
- colorSection.add(opacity);
18951961
18961962 //panel.add(new JSeparator());
18971963
....@@ -1937,7 +2003,7 @@
19372003 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
19382004 textureSection.add(opacityPower);
19392005
1940
- panel.add(new JSeparator());
2006
+ panel.add(GetSeparator());
19412007
19422008 panel.add(textureSection);
19432009
....@@ -3236,7 +3302,7 @@
32363302 {
32373303 copy.live ^= true;
32383304 return;
3239
- } else if (event.getSource() == selectCB)
3305
+ } else if (event.getSource() == selectableCB)
32403306 {
32413307 copy.dontselect ^= true;
32423308 return;
....@@ -3500,6 +3566,7 @@
35003566
35013567 static public byte[] Compress(Object3D o)
35023568 {
3569
+ // Slower to actually compress.
35033570 try
35043571 {
35053572 ByteArrayOutputStream baos = new ByteArrayOutputStream();
....@@ -3627,15 +3694,14 @@
36273694
36283695 cRadio tab = GetCurrentTab();
36293696
3630
- byte[] compress = CompressCopy();
3697
+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
36313698
36323699 boolean thesame = false;
36333700
3634
- // Quick heuristic using length. Works only when stream is compressed.
3635
- if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3636
- {
3637
- thesame = true;
3638
- }
3701
+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3702
+// {
3703
+// thesame = true;
3704
+// }
36393705
36403706 //EditorFrame.m_MainFrame.requestFocusInWindow();
36413707 if (!thesame)
....@@ -3694,6 +3760,9 @@
36943760
36953761 copy.clear();
36963762
3763
+ copy.skyboxname = obj.skyboxname;
3764
+ copy.skyboxext = obj.skyboxext;
3765
+
36973766 for (int i=0; i<obj.Size(); i++)
36983767 {
36993768 copy.add(obj.get(i));
....@@ -3731,18 +3800,42 @@
37313800 cButton replaceButton;
37323801 cButton redoButton;
37333802
3803
+ boolean muteSlider;
3804
+
3805
+ int VersionCount()
3806
+ {
3807
+ int count = 0;
3808
+
3809
+ for (int i = copy.versions.length; --i >= 0;)
3810
+ {
3811
+ if (copy.versions[i] != null)
3812
+ count++;
3813
+ }
3814
+
3815
+ return count;
3816
+ }
3817
+
37343818 void SetUndoStates()
37353819 {
37363820 cRadio tab = GetCurrentTab();
37373821
37383822 restoreButton.setEnabled(copy.versionindex != -1);
37393823 replaceButton.setEnabled(copy.versionindex != -1);
3824
+
37403825 undoButton.setEnabled(copy.versionindex > 0);
37413826 redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3827
+
3828
+ muteSlider = true;
3829
+ versionSlider.setMaximum(VersionCount() - 1);
3830
+ versionSlider.setInteger(copy.versionindex);
3831
+ muteSlider = false;
37423832 }
37433833
37443834 public boolean Undo()
37453835 {
3836
+ // Option?
3837
+ Replace();
3838
+
37463839 System.err.println("Undo");
37473840
37483841 cRadio tab = GetCurrentTab();
....@@ -3768,7 +3861,7 @@
37683861
37693862 copy.versionindex -= 1;
37703863
3771
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3864
+ CopyChanged((Object3D)copy.versions[copy.versionindex]);
37723865
37733866 return true;
37743867 }
....@@ -3785,7 +3878,8 @@
37853878 return false;
37863879 }
37873880
3788
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3881
+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3882
+ CopyChanged(copy.versions[copy.versionindex]);
37893883
37903884 return true;
37913885 }
....@@ -3809,6 +3903,9 @@
38093903
38103904 public void Redo()
38113905 {
3906
+ // Option?
3907
+ Replace();
3908
+
38123909 cRadio tab = GetCurrentTab();
38133910
38143911 if (copy.versions[copy.versionindex + 1] == null)
....@@ -3819,7 +3916,7 @@
38193916
38203917 copy.versionindex += 1;
38213918
3822
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3919
+ CopyChanged(copy.versions[copy.versionindex]);
38233920
38243921 //if (!tab.user[tab.versionindex])
38253922 // tab.graphs[tab.versionindex] = null;
....@@ -4118,18 +4215,21 @@
41184215 //copy.Touch();
41194216 }
41204217
4121
- cNumberSlider versionField;
4218
+ cNumberSlider versionSlider;
41224219
41234220 public void stateChanged(ChangeEvent e)
41244221 {
41254222 // assert(false);
4126
- if (e.getSource() == versionField)
4223
+ if (e.getSource() == versionSlider)
41274224 {
4128
- int version = versionField.getInteger();
4225
+ if (muteSlider)
4226
+ return;
4227
+
4228
+ int version = versionSlider.getInteger();
41294229
41304230 if (copy.versions[version] != null)
41314231 {
4132
- CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
4232
+ CopyChanged(copy.versions[copy.versionindex = version]);
41334233 }
41344234
41354235 return;
....@@ -4724,7 +4824,9 @@
47244824 readobj.ResetDisplayList();
47254825 } catch (Exception e)
47264826 {
4727
- //e.printStackTrace();
4827
+ if (!e.toString().contains("GZIP"))
4828
+ e.printStackTrace();
4829
+
47284830 try
47294831 {
47304832 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4804,6 +4906,8 @@
48044906 {
48054907 //readobj.deepCopySelf(copy);
48064908 copy.clear(); // june 2014
4909
+ copy.skyboxname = readobj.skyboxname;
4910
+ copy.skyboxext = readobj.skyboxext;
48074911 for (int i = 0; i < readobj.size(); i++)
48084912 {
48094913 Object3D child = readobj.get(i); // reserve(i);
....@@ -4844,6 +4948,7 @@
48444948 }
48454949 } catch (ClassCastException e)
48464950 {
4951
+ e.printStackTrace();
48474952 assert (false);
48484953 Composite c = (Composite) copy;
48494954 c.children.clear();
....@@ -4857,7 +4962,13 @@
48574962 copy.versions = readobj.versions;
48584963 copy.versionindex = readobj.versionindex;
48594964
4860
- SetUndoStates();
4965
+ if (copy.versions == null)
4966
+ {
4967
+ copy.versions = new Object3D[100];
4968
+ copy.versionindex = -1;
4969
+ }
4970
+
4971
+ //? SetUndoStates();
48614972
48624973 ResetModel();
48634974 copy.HardTouch(); // recompile?
....@@ -4968,6 +5079,7 @@
49685079 //ps.print(buffer.toString());
49695080 } catch (IOException e)
49705081 {
5082
+ e.printStackTrace();
49715083 }
49725084 }
49735085