Normand Briere
2019-08-17 d5d6485126da83b06645e90e3e4ce66659a56009
ObjEditor.java
....@@ -83,7 +83,10 @@
8383 cButton GetButton(String name, boolean border)
8484 {
8585 ImageIcon icon = GetIcon(name);
86
- return new cButton(icon, border);
86
+ if (icon != null)
87
+ return new cButton(icon, border);
88
+ else
89
+ return new cButton(name, border);
8790 }
8891
8992 cLabel GetLabel(String name, boolean border)
....@@ -106,7 +109,7 @@
106109
107110 static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108111
109
- ImageIcon GetIcon(String name)
112
+ static ImageIcon GetIcon(String name)
110113 {
111114 javax.swing.ImageIcon iconCache = icons.get(name);
112115 if (iconCache != null)
....@@ -116,7 +119,7 @@
116119
117120 try
118121 {
119
- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
122
+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
120123
121124 // if (image.getWidth() > 48 && image.getHeight() > 48)
122125 // {
....@@ -426,6 +429,9 @@
426429
427430 static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
428431
432
+ // This is to refresh the UI of the material panel.
433
+ boolean patchMaterial;
434
+
429435 void SetupMenu()
430436 {
431437 frame.setMenuBar(menuBar = new MenuBar());
....@@ -951,18 +957,29 @@
951957 boolean temp = CameraPane.SWITCH;
952958 CameraPane.SWITCH = false;
953959
954
- object.ExtractBigData(versiontable);
960
+ if (Grafreed.grafreed.universe.versiontable == null)
961
+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
962
+
963
+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
955964 // if (copy == client)
956965
957966 Object3D versions[] = object.versionlist;
967
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
958968 object.versionlist = null;
969
+ object.versiontable = null;
970
+
971
+ Object3D parent = object.parent;
972
+ object.parent = null;
959973
960974 //byte[] compress = Compress(copy);
961975 Object3D compress = (Object3D)Grafreed.clone(object);
962976
963
- object.versionlist = versions;
977
+ object.parent = parent;
964978
965
- object.RestoreBigData(versiontable);
979
+ object.versionlist = versions;
980
+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
981
+
982
+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
966983
967984 CameraPane.SWITCH = temp;
968985
....@@ -1615,6 +1632,42 @@
16151632 //frontView.object = copy;
16161633 //sideView.object = copy;
16171634
1635
+ transformPanel = new cGridBag().setVertical(true);
1636
+
1637
+ cGridBag resetTransformPanel = new cGridBag();
1638
+
1639
+ resetTransformPanel.preferredHeight = 2;
1640
+
1641
+ cButton resetTransform = GetButton("Reset all", !Grafreed.NIMBUSLAF);
1642
+ resetTransform.addMouseListener(new MouseAdapter()
1643
+ {
1644
+ public void mouseClicked(MouseEvent e)
1645
+ {
1646
+ ResetTransform();
1647
+ }
1648
+ });
1649
+ resetTransformPanel.add(resetTransform);
1650
+
1651
+ resetTransform = GetButton("T only", !Grafreed.NIMBUSLAF);
1652
+ resetTransform.addMouseListener(new MouseAdapter()
1653
+ {
1654
+ public void mouseClicked(MouseEvent e)
1655
+ {
1656
+ ResetTransform(1);
1657
+ }
1658
+ });
1659
+ resetTransformPanel.add(resetTransform);
1660
+
1661
+ resetTransform = GetButton("RS only", !Grafreed.NIMBUSLAF);
1662
+ resetTransform.addMouseListener(new MouseAdapter()
1663
+ {
1664
+ public void mouseClicked(MouseEvent e)
1665
+ {
1666
+ ResetTransform(2);
1667
+ }
1668
+ });
1669
+ resetTransformPanel.add(resetTransform);
1670
+
16181671 XYZPanel = new cGridBag().setVertical(true);
16191672 //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
16201673
....@@ -1624,6 +1677,9 @@
16241677 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
16251678 //XYZPanel.setName("XYZ");
16261679
1680
+ transformPanel.add(resetTransformPanel);
1681
+ transformPanel.add(XYZPanel);
1682
+
16271683 /*
16281684 gridPanel = new JPanel(); //new BorderLayout());
16291685 gridPanel.setLayout(new GridLayout(1, 2));
....@@ -1631,12 +1687,12 @@
16311687 gridPanel.add(cameraView);
16321688 gridPanel.add(XYZPanel);
16331689 */
1634
- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1635
- gridPanel.setContinuousLayout(true);
1636
- gridPanel.setOneTouchExpandable(true);
1637
- gridPanel.setDividerLocation(1.0);
1638
- gridPanel.setDividerSize(9);
1639
- gridPanel.setResizeWeight(0.85);
1690
+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1691
+// gridPanel.setContinuousLayout(true);
1692
+// gridPanel.setOneTouchExpandable(true);
1693
+// gridPanel.setDividerLocation(1.0);
1694
+// gridPanel.setDividerSize(9);
1695
+// gridPanel.setResizeWeight(0.85);
16401696
16411697 // aConstraints.weighty = 0;
16421698 //System.out.println("THIS = " + this);
....@@ -1659,14 +1715,14 @@
16591715
16601716 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
16611717 //tmp.setName("Edit");
1662
- objectPanel.add(materialPanel);
1663
- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1664
- objectPanel.setToolTipTextAt(0, "Material");
1665
-
16661718 objectPanel.add(toolboxPanel);
1667
- objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1668
- objectPanel.setToolTipTextAt(1, "Objects & textures");
1719
+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1720
+ objectPanel.setToolTipTextAt(0, "Objects & textures");
16691721
1722
+ objectPanel.add(materialPanel);
1723
+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1724
+ objectPanel.setToolTipTextAt(1, "Material");
1725
+
16701726 objectPanel.add(skyboxPanel);
16711727 objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
16721728 objectPanel.setToolTipTextAt(2, "Backgrounds");
....@@ -1679,10 +1735,14 @@
16791735 objectPanel.setIconAt(3, GetIcon("icons/write.png"));
16801736 objectPanel.setToolTipTextAt(3, "Edit controls");
16811737
1682
- objectPanel.add(XYZPanel);
1738
+ objectPanel.add(transformPanel);
16831739 objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1684
- objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1740
+ objectPanel.setToolTipTextAt(4, "TRS transform");
16851741
1742
+ patchMaterial = true;
1743
+ cameraView.patchMaterial = this;
1744
+ objectPanel.setSelectedIndex(1);
1745
+
16861746 /*
16871747 aConstraints.gridx = 0;
16881748 aConstraints.gridwidth = 1;
....@@ -1702,7 +1762,7 @@
17021762 scrollpane.addMouseWheelListener(this); // Default not fast enough
17031763
17041764 /*JTabbedPane*/ scenePanel = new cGridBag();
1705
- scenePanel.preferredWidth = 5;
1765
+ scenePanel.preferredWidth = 6;
17061766
17071767 JTabbedPane tabbedPane = new JTabbedPane();
17081768 tabbedPane.add(scrollpane);
....@@ -1744,13 +1804,13 @@
17441804 jtp.add(tree);
17451805 */
17461806
1747
- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1748
- bigPanel.setContinuousLayout(true);
1749
- bigPanel.setOneTouchExpandable(true);
1750
- bigPanel.setDividerLocation(0.8);
1751
- bigPanel.setDividerSize(15);
1752
- bigPanel.setResizeWeight(0.15);
1753
- bigPanel.setName("Scene");
1807
+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1808
+// bigPanel.setContinuousLayout(true);
1809
+// bigPanel.setOneTouchExpandable(true);
1810
+// bigPanel.setDividerLocation(0.8);
1811
+// bigPanel.setDividerSize(15);
1812
+// bigPanel.setResizeWeight(0.15);
1813
+// bigPanel.setName("Scene");
17541814
17551815 //bigPanel.setLayout(new BorderLayout());
17561816 //bigPanel.setSize(new Dimension(10,10));
....@@ -1834,7 +1894,7 @@
18341894
18351895 cameraView.requestFocusInWindow();
18361896
1837
- gridPanel.setDividerLocation(1.0);
1897
+// gridPanel.setDividerLocation(1.0);
18381898
18391899 frame.validate();
18401900
....@@ -1880,7 +1940,15 @@
18801940
18811941 // Skin
18821942 colorField.setFloat(material.color);
1883
- saturationField.setFloat(material.modulation);
1943
+ float saturation = material.modulation;
1944
+
1945
+ if (!cameraView.Skinshader)
1946
+ {
1947
+ saturation /= 1.5;
1948
+ }
1949
+
1950
+ saturationField.setFloat(saturation);
1951
+
18841952 subsurfaceField.setFloat(material.subsurface);
18851953 selfshadowField.setFloat(material.diffuseness);
18861954 diffusenessField.setFloat(material.factor);
....@@ -3913,7 +3981,7 @@
39133981 //System.out.println("ObjEditor " + event);
39143982 applySelf0(true);
39153983 //parent.applySelf();
3916
- objEditor.refreshContents();
3984
+ // conflicts with requestFocus objEditor.refreshContents();
39173985 } else if (source == resetButton)
39183986 {
39193987 CameraPane.fullreset = true;
....@@ -4225,8 +4293,6 @@
42254293 return true;
42264294 }
42274295
4228
- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4229
-
42304296 void DeleteVersion()
42314297 {
42324298 for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4234,7 +4300,11 @@
42344300 copy.versionlist[i] = copy.versionlist[i+1];
42354301 }
42364302
4237
- CopyChanged();
4303
+ if (copy.versionlist[copy.versionindex] == null)
4304
+ copy.versionindex -= 1;
4305
+
4306
+ if (copy.versionindex != -1)
4307
+ CopyChanged();
42384308
42394309 SetVersionStates();
42404310 }
....@@ -4347,7 +4417,7 @@
43474417 boolean temp = CameraPane.SWITCH;
43484418 CameraPane.SWITCH = false;
43494419
4350
- copy.ExtractBigData(versiontable);
4420
+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
43514421
43524422 copy.clear();
43534423
....@@ -4359,7 +4429,7 @@
43594429 copy.add(obj.get(i));
43604430 }
43614431
4362
- copy.RestoreBigData(versiontable);
4432
+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
43634433
43644434 CameraPane.SWITCH = temp;
43654435
....@@ -4409,6 +4479,8 @@
44094479 return count;
44104480 }
44114481
4482
+ public cGridBag versionSliderPane;
4483
+
44124484 void SetVersionStates()
44134485 {
44144486 //if (true)
....@@ -4416,21 +4488,36 @@
44164488
44174489 //cRadio tab = GetCurrentTab();
44184490
4419
- restoreButton.setEnabled(copy.versionindex != -1);
4420
- replaceButton.setEnabled(copy.versionindex != -1);
4421
-
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);
4427
-
4428
- muteSlider = true;
4429
- versionSlider.setMinimum(0);
4430
- versionSlider.setMaximum(VersionCount() - 1);
4431
- versionSlider.setInteger(copy.versionindex);
4432
- versionSlider.setEnabled(copy.versionindex != -1);
4433
- muteSlider = false;
4491
+ if (copy.versionlist == null)
4492
+ {
4493
+ saveVersionButton.setEnabled(false);
4494
+ restoreButton.setEnabled(false);
4495
+ replaceButton.setEnabled(false);
4496
+ previousVersionButton.setEnabled(false);
4497
+ nextVersionButton.setEnabled(false);
4498
+ deleteVersionButton.setEnabled(false);
4499
+ versionSliderPane.setVisible(false);
4500
+ }
4501
+ else
4502
+ {
4503
+ restoreButton.setEnabled(copy.versionindex != -1);
4504
+ replaceButton.setEnabled(copy.versionindex != -1);
4505
+
4506
+ previousVersionButton.setEnabled(copy.versionindex > 0);
4507
+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4508
+
4509
+ deleteVersionButton.setEnabled(copy.versionindex != -1);
4510
+ //copy.versionlist[copy.versionindex + 1] != null);
4511
+
4512
+ muteSlider = true;
4513
+ versionSlider.setMinimum(0);
4514
+ versionSlider.setMaximum(VersionCount() - 1);
4515
+ versionSlider.setInteger(copy.versionindex);
4516
+ versionSlider.setEnabled(copy.versionindex != -1);
4517
+ muteSlider = false;
4518
+
4519
+ versionSliderPane.setVisible(true);
4520
+ }
44344521 }
44354522
44364523 public boolean PreviousVersion()
....@@ -4488,7 +4575,7 @@
44884575
44894576 public boolean Replace()
44904577 {
4491
- System.err.println("Replace");
4578
+ //System.err.println("Replace");
44924579
44934580 //cRadio tab = GetCurrentTab();
44944581
....@@ -4715,6 +4802,12 @@
47154802 // else
47164803 // applySelf(true);
47174804 // }
4805
+
4806
+ boolean Equal(double a, double b)
4807
+ {
4808
+ return Math.abs(a - b) < 0.001;
4809
+ }
4810
+
47184811 void applySelf0(boolean name)
47194812 {
47204813 if (name)
....@@ -4764,29 +4857,52 @@
47644857 {
47654858 cMaterial mat = copy.material;
47664859
4767
- colorField.SetToolTipValue((mat.color));
4768
- saturationField.SetToolTipValue((mat.modulation));
4769
- metalnessField.SetToolTipValue((mat.metalness));
4770
- diffuseField.SetToolTipValue((mat.diffuse));
4771
- specularField.SetToolTipValue((mat.specular));
4772
- shininessField.SetToolTipValue((mat.shininess));
4773
- shiftField.SetToolTipValue((mat.shift));
4774
- ambientField.SetToolTipValue((mat.ambient));
4775
- lightareaField.SetToolTipValue((mat.lightarea));
4776
- diffusenessField.SetToolTipValue((mat.factor));
4777
- velvetField.SetToolTipValue((mat.velvet));
4778
- sheenField.SetToolTipValue((mat.sheen));
4779
- subsurfaceField.SetToolTipValue((mat.subsurface));
4780
- backlitField.SetToolTipValue((mat.bump));
4781
- anisoField.SetToolTipValue((mat.aniso));
4782
- anisoVField.SetToolTipValue((mat.anisoV));
4783
- cameraField.SetToolTipValue((mat.cameralight));
4784
- selfshadowField.SetToolTipValue((mat.diffuseness));
4785
- shadowField.SetToolTipValue((mat.shadow));
4786
- textureField.SetToolTipValue((mat.texture));
4787
- opacityField.SetToolTipValue((mat.opacity));
4788
- fakedepthField.SetToolTipValue((mat.fakedepth));
4789
- shadowbiasField.SetToolTipValue((mat.shadowbias));
4860
+ if (!Equal(colorField.getFloat(), mat.color))
4861
+ colorField.SetToolTipValue((mat.color));
4862
+ if (!Equal(saturationField.getFloat(), mat.modulation))
4863
+ saturationField.SetToolTipValue((mat.modulation));
4864
+ if (!Equal(metalnessField.getFloat(), mat.metalness))
4865
+ metalnessField.SetToolTipValue((mat.metalness));
4866
+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
4867
+ diffuseField.SetToolTipValue((mat.diffuse));
4868
+ if (!Equal(specularField.getFloat(), mat.specular))
4869
+ specularField.SetToolTipValue((mat.specular));
4870
+ if (!Equal(shininessField.getFloat(), mat.shininess))
4871
+ shininessField.SetToolTipValue((mat.shininess));
4872
+ if (!Equal(shiftField.getFloat(), mat.shift))
4873
+ shiftField.SetToolTipValue((mat.shift));
4874
+ if (!Equal(ambientField.getFloat(), mat.ambient))
4875
+ ambientField.SetToolTipValue((mat.ambient));
4876
+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
4877
+ lightareaField.SetToolTipValue((mat.lightarea));
4878
+ if (!Equal(diffusenessField.getFloat(), mat.factor))
4879
+ diffusenessField.SetToolTipValue((mat.factor));
4880
+ if (!Equal(velvetField.getFloat(), mat.velvet))
4881
+ velvetField.SetToolTipValue((mat.velvet));
4882
+ if (!Equal(sheenField.getFloat(), mat.sheen))
4883
+ sheenField.SetToolTipValue((mat.sheen));
4884
+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
4885
+ subsurfaceField.SetToolTipValue((mat.subsurface));
4886
+ if (!Equal(backlitField.getFloat(), mat.bump))
4887
+ backlitField.SetToolTipValue((mat.bump));
4888
+ if (!Equal(anisoField.getFloat(), mat.aniso))
4889
+ anisoField.SetToolTipValue((mat.aniso));
4890
+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
4891
+ anisoVField.SetToolTipValue((mat.anisoV));
4892
+ if (!Equal(cameraField.getFloat(), mat.cameralight))
4893
+ cameraField.SetToolTipValue((mat.cameralight));
4894
+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
4895
+ selfshadowField.SetToolTipValue((mat.diffuseness));
4896
+ if (!Equal(shadowField.getFloat(), mat.shadow))
4897
+ shadowField.SetToolTipValue((mat.shadow));
4898
+ if (!Equal(textureField.getFloat(), mat.texture))
4899
+ textureField.SetToolTipValue((mat.texture));
4900
+ if (!Equal(opacityField.getFloat(), mat.opacity))
4901
+ opacityField.SetToolTipValue((mat.opacity));
4902
+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
4903
+ fakedepthField.SetToolTipValue((mat.fakedepth));
4904
+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
4905
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
47904906 }
47914907
47924908 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
....@@ -4821,7 +4937,7 @@
48214937
48224938 public void stateChanged(ChangeEvent e)
48234939 {
4824
- // assert(false);
4940
+ // assert(false);
48254941 if (e.getSource() == versionSlider)
48264942 {
48274943 if (muteSlider)
....@@ -5578,6 +5694,7 @@
55785694
55795695 copy.versionlist = readobj.versionlist;
55805696 copy.versionindex = readobj.versionindex;
5697
+ copy.versiontable = readobj.versiontable;
55815698
55825699 if (copy.versionlist == null)
55835700 {
....@@ -5933,6 +6050,7 @@
59336050 boolean materialFlushed;
59346051 Object3D latestObject;
59356052
6053
+ cGridBag transformPanel;
59366054 cGridBag XYZPanel;
59376055
59386056 JSplitPane gridPanel;