Fix texture deletion. v8.1.1 FINAL

NathanKell · NathanKell · commit d88785d73539 · 2014-10-19T01:24:13.000-04:00
diff --git a/RealSolarSystem/Plugins/RealSolarSystem.dll b/RealSolarSystem/Plugins/RealSolarSystem.dll
diff --git a/RealSolarSystem/Readme_RSS.txt b/RealSolarSystem/Readme_RSS.txt
@@ -46,6 +46,9 @@ Pluto is represented by Vall
 
 ===========================
 Changelog
+v8.1.1
+*Fixed stupidity where I deleted textures after loading them.
+
 v8.1
 *Completely revised loading system to use coroutines, added GUI. RSS will now load at the main menu, over a period of time to allow garbage collection to run. RAM usage should no longer spike as badly. Many thanks to stupid_chris for getting me set up with coroutines, and to Sarbian for help fixing some remaining issues. While loading may take slightly longer, you should be able to use more textures/parts, and you now get a handy GUI to track status.
 *Support calling textures from GameDatabase for the scaled space textures (SSColor, SSBump). This allows use combined with Sarbian's DDSLoader.
diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.8.1.0")]
-[assembly: AssemblyFileVersion("0.8.1.0")]
+[assembly: AssemblyVersion("0.8.1.1")]
+[assembly: AssemblyFileVersion("0.8.1.1")]
diff --git a/Source/RealSolarSystem.cs b/Source/RealSolarSystem.cs
@@ -1554,10 +1554,9 @@ private IEnumerator<YieldInstruction> LoadScaledSpace(ConfigNode node, Celestial
                         {
                             guiExtra = "Color map";
                             //Texture2D map = GameDatabase.Instance.GetTexture(path, false);
-                            Texture2D omap = null;
-                            Texture map = null;
-                            Texture[] textures = Resources.FindObjectsOfTypeAll(typeof(Texture)) as Texture[];
-                            foreach (Texture tex in textures)
+                            Texture2D map = null;
+                            Texture2D[] textures = Resources.FindObjectsOfTypeAll(typeof(Texture2D)) as Texture2D[];
+                            foreach (Texture2D tex in textures)
                             {
                                 if (tex.name.Equals(path))
                                 {
@@ -1570,16 +1569,17 @@ private IEnumerator<YieldInstruction> LoadScaledSpace(ConfigNode node, Celestial
                             yield return null;
                             if ((object)map == null)
                             {
+                                print("RSS Loading local texture " + path);
                                 localLoad = true;
                                 success = false;
                                 if (File.Exists(KSPUtil.ApplicationRootPath + path))
                                 {
-                                    omap = new Texture2D(4, 4, replaceColor == 1 ? TextureFormat.RGB24 : TextureFormat.RGBA32, true);
-                                    omap.LoadImage(System.IO.File.ReadAllBytes(path));
+                                    map = new Texture2D(4, 4, replaceColor == 1 ? TextureFormat.RGB24 : TextureFormat.RGBA32, true);
+                                    map.LoadImage(System.IO.File.ReadAllBytes(path));
                                     yield return null;
-                                    omap.Compress(true);
-                                    omap.Apply(true, true);
-                                    map = (Texture)omap;
+                                    map.Compress(true);
+                                    yield return null;
+                                    map.Apply(true, true);
                                     yield return null;
                                     success = true;
                                 }
@@ -1600,14 +1600,6 @@ private IEnumerator<YieldInstruction> LoadScaledSpace(ConfigNode node, Celestial
                                     oldColor = null;
                                     yield return null;
                                 }
-                                if(t.gameObject.renderer.material.GetTexture("_MainTex") != map)
-                                    t.gameObject.renderer.material.SetTexture("_MainTex", map);
-                            }
-                            if (localLoad)
-                            {
-                                DestroyImmediate(map);
-                                map = null;
-                                yield return null;
                             }
                         }
                         yield return null;
@@ -1642,6 +1634,7 @@ private IEnumerator<YieldInstruction> LoadScaledSpace(ConfigNode node, Celestial
                                     yield return null;
                                     if (loadInfo.compressNormals)
                                         map.Compress(true);
+                                    yield return null;
                                     map.Apply(true, true);
                                     yield return null;
                                 }
@@ -1651,25 +1644,18 @@ private IEnumerator<YieldInstruction> LoadScaledSpace(ConfigNode node, Celestial
                             if (success)
                             {
                                 Texture oldBump = t.gameObject.renderer.material.GetTexture("_BumpMap");
+                                bool replacedOrig = false;
                                 if (oldBump != null)
                                 {
                                     foreach (Material m in Resources.FindObjectsOfTypeAll(typeof(Material)))
                                     {
-                                        if (m.GetTexture("_BumpMap") == oldBump)
+                                        if (m.GetTexture("_BumpMap") == oldBump || m == t.gameObject.renderer.material)
                                             m.SetTexture("_BumpMap", map);
                                     }
                                     DestroyImmediate(oldBump);
                                     oldBump = null;
                                     yield return null;
                                 }
-                                if(t.gameObject.renderer.material.GetTexture("_BumpMap") != map)
-                                    t.gameObject.renderer.material.SetTexture("_BumpMap", map);
-                            }
-                            if (localLoad)
-                            {
-                                DestroyImmediate(map);
-                                map = null;
-                                yield return null;
                             }
                             yield return null;
                             guiExtra = "";

Original file line number	Diff line number	Diff line change
`@@ -1554,10 +1554,9 @@ private IEnumerator<YieldInstruction> LoadScaledSpace(ConfigNode node, Celestial`
`1554`	`1554`	`{`
`1555`	`1555`	`guiExtra = "Color map";`
`1556`	`1556`	`//Texture2D map = GameDatabase.Instance.GetTexture(path, false);`
`1557`		`- Texture2D omap = null;`
`1558`		`- Texture map = null;`
`1559`		`- Texture[] textures = Resources.FindObjectsOfTypeAll(typeof(Texture)) as Texture[];`
`1560`		`- foreach (Texture tex in textures)`
	`1557`	`+ Texture2D map = null;`
	`1558`	`+ Texture2D[] textures = Resources.FindObjectsOfTypeAll(typeof(Texture2D)) as Texture2D[];`
	`1559`	`+ foreach (Texture2D tex in textures)`
`1561`	`1560`	`{`
`1562`	`1561`	`if (tex.name.Equals(path))`
`1563`	`1562`	`{`
`@@ -1570,16 +1569,17 @@ private IEnumerator<YieldInstruction> LoadScaledSpace(ConfigNode node, Celestial`
`1570`	`1569`	`yield return null;`
`1571`	`1570`	`if ((object)map == null)`
`1572`	`1571`	`{`
	`1572`	`+ print("RSS Loading local texture " + path);`
`1573`	`1573`	`localLoad = true;`
`1574`	`1574`	`success = false;`
`1575`	`1575`	`if (File.Exists(KSPUtil.ApplicationRootPath + path))`
`1576`	`1576`	`{`
`1577`		`- omap = new Texture2D(4, 4, replaceColor == 1 ? TextureFormat.RGB24 : TextureFormat.RGBA32, true);`
`1578`		`- omap.LoadImage(System.IO.File.ReadAllBytes(path));`
	`1577`	`+ map = new Texture2D(4, 4, replaceColor == 1 ? TextureFormat.RGB24 : TextureFormat.RGBA32, true);`
	`1578`	`+ map.LoadImage(System.IO.File.ReadAllBytes(path));`
`1579`	`1579`	`yield return null;`
`1580`		`- omap.Compress(true);`
`1581`		`- omap.Apply(true, true);`
`1582`		`- map = (Texture)omap;`
	`1580`	`+ map.Compress(true);`
	`1581`	`+ yield return null;`
	`1582`	`+ map.Apply(true, true);`
`1583`	`1583`	`yield return null;`
`1584`	`1584`	`success = true;`
`1585`	`1585`	`}`
`@@ -1600,14 +1600,6 @@ private IEnumerator<YieldInstruction> LoadScaledSpace(ConfigNode node, Celestial`
`1600`	`1600`	`oldColor = null;`
`1601`	`1601`	`yield return null;`
`1602`	`1602`	`}`
`1603`		`- if(t.gameObject.renderer.material.GetTexture("_MainTex") != map)`
`1604`		`- t.gameObject.renderer.material.SetTexture("_MainTex", map);`
`1605`		`- }`
`1606`		`- if (localLoad)`
`1607`		`- {`
`1608`		`- DestroyImmediate(map);`
`1609`		`- map = null;`
`1610`		`- yield return null;`
`1611`	`1603`	`}`
`1612`	`1604`	`}`
`1613`	`1605`	`yield return null;`
`@@ -1642,6 +1634,7 @@ private IEnumerator<YieldInstruction> LoadScaledSpace(ConfigNode node, Celestial`
`1642`	`1634`	`yield return null;`
`1643`	`1635`	`if (loadInfo.compressNormals)`
`1644`	`1636`	`map.Compress(true);`
	`1637`	`+ yield return null;`
`1645`	`1638`	`map.Apply(true, true);`
`1646`	`1639`	`yield return null;`
`1647`	`1640`	`}`
`@@ -1651,25 +1644,18 @@ private IEnumerator<YieldInstruction> LoadScaledSpace(ConfigNode node, Celestial`
`1651`	`1644`	`if (success)`
`1652`	`1645`	`{`
`1653`	`1646`	`Texture oldBump = t.gameObject.renderer.material.GetTexture("_BumpMap");`
	`1647`	`+ bool replacedOrig = false;`
`1654`	`1648`	`if (oldBump != null)`
`1655`	`1649`	`{`
`1656`	`1650`	`foreach (Material m in Resources.FindObjectsOfTypeAll(typeof(Material)))`
`1657`	`1651`	`{`
`1658`		`- if (m.GetTexture("_BumpMap") == oldBump)`
	`1652`	`+ if (m.GetTexture("_BumpMap") == oldBump \|\| m == t.gameObject.renderer.material)`
`1659`	`1653`	`m.SetTexture("_BumpMap", map);`
`1660`	`1654`	`}`
`1661`	`1655`	`DestroyImmediate(oldBump);`
`1662`	`1656`	`oldBump = null;`
`1663`	`1657`	`yield return null;`
`1664`	`1658`	`}`
`1665`		`- if(t.gameObject.renderer.material.GetTexture("_BumpMap") != map)`
`1666`		`- t.gameObject.renderer.material.SetTexture("_BumpMap", map);`
`1667`		`- }`
`1668`		`- if (localLoad)`
`1669`		`- {`
`1670`		`- DestroyImmediate(map);`
`1671`		`- map = null;`
`1672`		`- yield return null;`
`1673`	`1659`	`}`
`1674`	`1660`	`yield return null;`
`1675`	`1661`	`guiExtra = "";`