Skin shader + material panel fix.

Normand Briere

2019-08-17 ecc1309a04b527c62ffe97e814daf050dbd025cd

Skin shader + material panel fix.

 CameraPane.java
..
..
@@ -168,7 +168,7 @@
168
168
 
169
169
     
170
170
     // OPTIONS
171
-    boolean Skinshader = true;
171
+    boolean Skinshader = false; // true;
172
172
     boolean cameraLight = false;
173
173
     boolean UVdebug = false;
174
174
     boolean Udebug = false;
..
..
@@ -10690,9 +10690,18 @@
10690
10690
     static boolean init = false;
10691
10691
     
10692
10692
     double[][] matrix = LA.newMatrix();
10693
+    
10694
+    // This is to refresh the UI of the material panel.
10695
+    ObjEditor patchMaterial;
10693
10696
 
10694
10697
     public void display(GLAutoDrawable drawable)
10695
10698
     {
10699
+        if (patchMaterial.patchMaterial)
10700
+        {
10701
+            patchMaterial.patchMaterial = false;
10702
+            patchMaterial.objectPanel.setSelectedIndex(0);
10703
+        }
10704
+        
10696
10705
         if (Grafreed.savesound && Grafreed.hassound)
10697
10706
         {
10698
10707
             Grafreed.wav.save();
..
..
@@ -15282,8 +15291,8 @@
15282
15291
             case 'K':
15283
15292
                 KOMPACTTEXTURE ^= true;
15284
15293
                 //textures.clear();
15285
-                break;
15286
-            case 'P': // Texture Projection macros
15294
+            //    break;
15295
+            //case 'P': // Texture Projection macros
15287
15296
 //                SAVETEXTURE ^= true;
15288
15297
                 macromode = true;
15289
15298
                 Udebug = Vdebug = NORMALdebug = false; programInitialized = false;
..
..
@@ -15404,7 +15413,7 @@
15404
15413
                 targetLookAt.set(manipCamera.lookAt);
15405
15414
                 repaint();
15406
15415
                 break;
15407
-            case 'p':
15416
+            case 'P': // p':
15408
15417
        // c'est quoi ca au juste?         spherical ^= true;
15409
15418
                 Skinshader ^= true; programInitialized = false; 
15410
15419
                 repaint();
 GroupEditor.java
..
..
@@ -1259,6 +1259,8 @@
1259
1259
                 
1260
1260
                 CreateTexturePanel(textures);
1261
1261
                 
1262
+                resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
1263
+                
1262
1264
                 oe.toolboxPanel.add(textures);
1263
1265
                 
1264
1266
                 textures.preferredHeight = 100;
 ObjEditor.java
..
..
@@ -426,6 +426,9 @@
426
426
 
427
427
     static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
428
428
 
429
+    // This is to refresh the UI of the material panel.
430
+    boolean patchMaterial;
431
+    
429
432
     void SetupMenu()
430
433
     {
431
434
         frame.setMenuBar(menuBar = new MenuBar());
..
..
@@ -1689,6 +1692,10 @@
1689
1692
         objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1690
1693
         objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1691
1694
         
1695
+        patchMaterial = true;
1696
+        cameraView.patchMaterial = this;
1697
+        objectPanel.setSelectedIndex(1);
1698
+                
1692
1699
         /*
1693
1700
         aConstraints.gridx = 0;
1694
1701
         aConstraints.gridwidth = 1;
..
..
@@ -1886,7 +1893,15 @@
1886
1893
                 
1887
1894
                 // Skin
1888
1895
                 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
+                
1890
1905
                 subsurfaceField.setFloat(material.subsurface);
1891
1906
                 selfshadowField.setFloat(material.diffuseness);
1892
1907
                 diffusenessField.setFloat(material.factor);