minor fixes for texture-swap handling (rever to render.material; shar…

…edMaterial really is shared in some cases)
shadowmage45 · Mar 26, 2016 · 43c1132 · 43c1132
1 parent 3be7489
commit 43c1132
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 25 deletions.
diff --git a/GameData/SSTU/Plugins/SSTUTools.dll b/GameData/SSTU/Plugins/SSTUTools.dll
diff --git a/Source/Module/SSTUDecalSwitch.cs b/Source/Module/SSTUDecalSwitch.cs
@@ -85,7 +85,7 @@ public void enable(Transform transform)
                 else
                 {
                     Texture tex = SSTUUtils.findTexture(texture, false);
-                    transform.renderer.sharedMaterial.mainTexture = tex;
+                    transform.renderer.material.mainTexture = tex;
                     transform.renderer.enabled = true;
                 }
             }

diff --git a/Source/Module/SSTUFlagDecal.cs b/Source/Module/SSTUFlagDecal.cs
@@ -64,7 +64,7 @@ public void updateFlagTransform()
                 {
                     if (tr.renderer != null)
                     {
-                        tr.renderer.sharedMaterial.mainTexture = texture;
+                        tr.renderer.material.mainTexture = texture;
                         tr.renderer.enabled = true;
                     }
                 }

diff --git a/Source/Module/SSTUHighlightFix.cs b/Source/Module/SSTUHighlightFix.cs
@@ -51,7 +51,7 @@ private void init()
                 newObj.transform.NestToParent(part.transform.FindRecursive("model"));
 
                 Renderer render = newObj.AddComponent<MeshRenderer>();//add a new render
-                render.sharedMaterial = SSTUUtils.loadMaterial(null, null);//with an empty dummy material, also it doesn't actually have any mesh
+                render.material = SSTUUtils.loadMaterial(null, null);//with an empty dummy material, also it doesn't actually have any mesh
                 dummyTransform = newObj.transform;//cache reference to it for use for updating
             }
         }

diff --git a/Source/Module/SSTUResizableFairing.cs b/Source/Module/SSTUResizableFairing.cs
@@ -230,7 +230,7 @@ private void updateTexture()
                     mpf.FairingMaterial.mainTexture = t;
                     foreach (var f in mpf.Panels)
                     {
-                        f.go.renderer.sharedMaterial.mainTexture = t;
+                        f.go.renderer.material.mainTexture = t;
                     }
                 }
             }

diff --git a/Source/Util/ModelData.cs b/Source/Util/ModelData.cs
@@ -185,7 +185,7 @@ public void enable(GameObject root)
                 Transform tr = root.transform.FindRecursive(mesh);
                 if (tr != null && tr.renderer != null)
                 {
-                    Material m = tr.renderer.sharedMaterial;
+                    Material m = tr.renderer.material;
                     if (!String.IsNullOrEmpty(diffuseTextureName)) { m.mainTexture = GameDatabase.Instance.GetTexture(diffuseTextureName, false); }
                     if (!String.IsNullOrEmpty(normalTextureName)) { m.SetTexture("_BumpMap", GameDatabase.Instance.GetTexture(normalTextureName, true)); }
                     if (!String.IsNullOrEmpty(emissiveTextureName)) { m.SetTexture("_Emissive", GameDatabase.Instance.GetTexture(emissiveTextureName, false)); }

diff --git a/Source/Util/SSTUUtils.cs b/Source/Util/SSTUUtils.cs
@@ -292,22 +292,6 @@ public static void destroyChildrenImmediate(Transform tr)
             }
         }
 
-        public static void recursePrintMaterialData(Transform tr)
-        {
-            if (tr.renderer != null)
-            {
-                Material m = tr.renderer.sharedMaterial;
-                Texture t = m.mainTexture;
-                Shader s = m.shader;
-                MonoBehaviour.print("mat: " + m + " : tex: " + t + " : shad: " + s);
-            }
-
-            foreach (Transform child in tr)
-            {
-                recursePrintMaterialData(child);
-            }
-        }
-
         public static void recursePrintChildTransforms(Transform tr, String prefix)
         {
             MonoBehaviour.print("Transform found: " + prefix + tr.name);
@@ -449,7 +433,7 @@ public static void setTextureRecursive(Transform tr, Texture tex, int id)
         {
             if (tr != null && tr.renderer != null && tr.renderer.sharedMaterial != null)
             {
-                tr.renderer.sharedMaterial.SetTexture(id, tex);
+                tr.renderer.material.SetTexture(id, tex);
             }
             foreach (Transform tr1 in tr)
             {
@@ -459,7 +443,7 @@ public static void setTextureRecursive(Transform tr, Texture tex, int id)
 
         public static void setMaterialRecursive(Transform tr, Material mat)
         {
-            if (tr.gameObject.renderer != null) { tr.gameObject.renderer.sharedMaterial = mat; }
+            if (tr.gameObject.renderer != null) { tr.gameObject.renderer.material = mat; }
             int len = tr.childCount;
             for (int i = 0; i < len; i++)
             {

diff --git a/Source/Util/TextureSet.cs b/Source/Util/TextureSet.cs
@@ -137,13 +137,13 @@ public void enableFromMeshes(Part part)
 
         private void enableTexture(Transform tr)
         {
-            if (tr.renderer == null || tr.renderer.sharedMaterial == null)
+            if (tr.renderer == null || tr.renderer.material == null)
             {
                 //MonoBehaviour.print("ERROR: transform does not contain a renderer for mesh name: " + tr.name);
                 return;
             }
             //TODO check / update the shader for the material
-            Material m = tr.renderer.sharedMaterial;
+            Material m = tr.renderer.material;
             if (!String.IsNullOrEmpty(diffuseTextureName)) { m.mainTexture = GameDatabase.Instance.GetTexture(diffuseTextureName, false); }
             if (!String.IsNullOrEmpty(normalTextureName)) { m.SetTexture("_BumpMap", GameDatabase.Instance.GetTexture(normalTextureName, true)); }
             if (!String.IsNullOrEmpty(emissiveTextureName)) { m.SetTexture("_Emissive", GameDatabase.Instance.GetTexture(emissiveTextureName, false)); }