blame | history | patch | commit | commitdiff
Normand Briere
2019-08-17 5892f05411c3d4dce2d8a59e0966dc2e1843a971 
 ObjEditor.java
....@@ -106,7 +106,7 @@
106106 
107107     static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108108     
109
-    ImageIcon GetIcon(String name)
109
+    static ImageIcon GetIcon(String name)
110110     {
111111         javax.swing.ImageIcon iconCache = icons.get(name);
112112         if (iconCache != null)
....@@ -116,7 +116,7 @@
116116         
117117         try
118118         {
119
-            BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
119
+            BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
120120 
121121 //            if (image.getWidth() > 48 && image.getHeight() > 48)
122122 //            {
....@@ -426,6 +426,9 @@
426426 
427427     static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
428428 
429
+    // This is to refresh the UI of the material panel.
430
+    boolean patchMaterial;
431
+    
429432     void SetupMenu()
430433     {
431434         frame.setMenuBar(menuBar = new MenuBar());
....@@ -1689,6 +1692,10 @@
16891692         objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
16901693         objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
16911694         
1695
+        patchMaterial = true;
1696
+        cameraView.patchMaterial = this;
1697
+        objectPanel.setSelectedIndex(1);
1698
+                
16921699         /*
16931700         aConstraints.gridx = 0;
16941701         aConstraints.gridwidth = 1;
....@@ -1708,7 +1715,7 @@
17081715         scrollpane.addMouseWheelListener(this); // Default not fast enough
17091716 
17101717         /*JTabbedPane*/ scenePanel = new cGridBag();
1711
-        scenePanel.preferredWidth = 5;
1718
+        scenePanel.preferredWidth = 6;
17121719         
17131720         JTabbedPane tabbedPane = new JTabbedPane();
17141721         tabbedPane.add(scrollpane);
....@@ -1886,7 +1893,15 @@
18861893                 
18871894                 // Skin
18881895                 colorField.setFloat(material.color);
1889
-                saturationField.setFloat(material.modulation);
1896
+                float saturation = material.modulation;
1897
+                
1898
+                if (!cameraView.Skinshader)
1899
+                {
1900
+                    saturation /= 1.5;
1901
+                }
1902
+                
1903
+                saturationField.setFloat(saturation);
1904
+                
18901905                 subsurfaceField.setFloat(material.subsurface);
18911906                 selfshadowField.setFloat(material.diffuseness);
18921907                 diffusenessField.setFloat(material.factor);
....@@ -4723,6 +4738,12 @@
47234738 //            else
47244739 //		applySelf(true);
47254740 //	}
4741
+    
4742
+    boolean Equal(double a, double b)
4743
+    {
4744
+        return Math.abs(a - b) < 0.001;
4745
+    }
4746
+    
47264747     void applySelf0(boolean name)
47274748     {
47284749         if (name)
....@@ -4772,29 +4793,52 @@
47724793                 {
47734794                     cMaterial mat = copy.material;
47744795                             
4775
-                    colorField.SetToolTipValue((mat.color));
4776
-                    saturationField.SetToolTipValue((mat.modulation));
4777
-                    metalnessField.SetToolTipValue((mat.metalness));
4778
-                    diffuseField.SetToolTipValue((mat.diffuse));
4779
-                    specularField.SetToolTipValue((mat.specular));
4780
-                    shininessField.SetToolTipValue((mat.shininess));
4781
-                    shiftField.SetToolTipValue((mat.shift));
4782
-                    ambientField.SetToolTipValue((mat.ambient));
4783
-                    lightareaField.SetToolTipValue((mat.lightarea));
4784
-                    diffusenessField.SetToolTipValue((mat.factor));
4785
-                    velvetField.SetToolTipValue((mat.velvet));
4786
-                    sheenField.SetToolTipValue((mat.sheen));
4787
-                    subsurfaceField.SetToolTipValue((mat.subsurface));
4788
-                    backlitField.SetToolTipValue((mat.bump));
4789
-                    anisoField.SetToolTipValue((mat.aniso));
4790
-                    anisoVField.SetToolTipValue((mat.anisoV));
4791
-                    cameraField.SetToolTipValue((mat.cameralight));
4792
-                    selfshadowField.SetToolTipValue((mat.diffuseness));
4793
-                    shadowField.SetToolTipValue((mat.shadow));
4794
-                    textureField.SetToolTipValue((mat.texture));
4795
-                    opacityField.SetToolTipValue((mat.opacity));
4796
-                    fakedepthField.SetToolTipValue((mat.fakedepth));
4797
-                    shadowbiasField.SetToolTipValue((mat.shadowbias));
4796
+                    if (!Equal(colorField.getFloat(), mat.color))
4797
+                        colorField.SetToolTipValue((mat.color));
4798
+                    if (!Equal(saturationField.getFloat(), mat.modulation))
4799
+                        saturationField.SetToolTipValue((mat.modulation));
4800
+                    if (!Equal(metalnessField.getFloat(), mat.metalness))
4801
+                        metalnessField.SetToolTipValue((mat.metalness));
4802
+                    if (!Equal(diffuseField.getFloat(), mat.diffuse))
4803
+                        diffuseField.SetToolTipValue((mat.diffuse));
4804
+                    if (!Equal(specularField.getFloat(), mat.specular))
4805
+                        specularField.SetToolTipValue((mat.specular));
4806
+                    if (!Equal(shininessField.getFloat(), mat.shininess))
4807
+                        shininessField.SetToolTipValue((mat.shininess));
4808
+                    if (!Equal(shiftField.getFloat(), mat.shift))
4809
+                        shiftField.SetToolTipValue((mat.shift));
4810
+                    if (!Equal(ambientField.getFloat(), mat.ambient))
4811
+                        ambientField.SetToolTipValue((mat.ambient));
4812
+                    if (!Equal(lightareaField.getFloat(), mat.lightarea))
4813
+                        lightareaField.SetToolTipValue((mat.lightarea));
4814
+                    if (!Equal(diffusenessField.getFloat(), mat.factor))
4815
+                        diffusenessField.SetToolTipValue((mat.factor));
4816
+                    if (!Equal(velvetField.getFloat(), mat.velvet))
4817
+                        velvetField.SetToolTipValue((mat.velvet));
4818
+                    if (!Equal(sheenField.getFloat(), mat.sheen))
4819
+                        sheenField.SetToolTipValue((mat.sheen));
4820
+                    if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
4821
+                        subsurfaceField.SetToolTipValue((mat.subsurface));
4822
+                    if (!Equal(backlitField.getFloat(), mat.bump))
4823
+                        backlitField.SetToolTipValue((mat.bump));
4824
+                    if (!Equal(anisoField.getFloat(), mat.aniso))
4825
+                        anisoField.SetToolTipValue((mat.aniso));
4826
+                    if (!Equal(anisoVField.getFloat(), mat.anisoV))
4827
+                        anisoVField.SetToolTipValue((mat.anisoV));
4828
+                    if (!Equal(cameraField.getFloat(), mat.cameralight))
4829
+                        cameraField.SetToolTipValue((mat.cameralight));
4830
+                    if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
4831
+                        selfshadowField.SetToolTipValue((mat.diffuseness));
4832
+                    if (!Equal(shadowField.getFloat(), mat.shadow))
4833
+                        shadowField.SetToolTipValue((mat.shadow));
4834
+                    if (!Equal(textureField.getFloat(), mat.texture))
4835
+                        textureField.SetToolTipValue((mat.texture));
4836
+                    if (!Equal(opacityField.getFloat(), mat.opacity))
4837
+                        opacityField.SetToolTipValue((mat.opacity));
4838
+                    if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
4839
+                        fakedepthField.SetToolTipValue((mat.fakedepth));
4840
+                    if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
4841
+                        shadowbiasField.SetToolTipValue((mat.shadowbias));
47984842                 }
47994843                 
48004844                 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)