tga fix.

rbray89 · rbray89 · commit 38eb8dc4bdff · 2016-01-05T02:13:33.000-07:00
diff --git a/DynamicTextureLoader/Loader.cs b/DynamicTextureLoader/Loader.cs
@@ -44,7 +44,7 @@ private void Update()
                         MethodInfo mI = typeof(PartModule).GetMethod("Awake", BindingFlags.NonPublic | BindingFlags.Instance);
                         mI.Invoke(module, null);
                         module.Load(moduleNode);
-                        module.Unload(true);
+                        module.Unload(true, false);
                     }
                     else
                     {
@@ -199,7 +199,7 @@ private static bool updateToStockSettings(GameDatabase.TextureInfo texInfo)
         {
             texInfo.isNormalMap = texInfo.file.name.EndsWith("NRM");
             texInfo.isReadable = texInfo.file.fileExtension == "dds" || texInfo.file.fileExtension == "truecolor" || texInfo.isNormalMap ? false : true;
-            texInfo.isCompressed = texInfo.file.fileExtension == "truecolor" ? false : true;
+            texInfo.isCompressed = texInfo.file.fileExtension == "truecolor" || texInfo.file.fileExtension == "tga" ? false : true;
             bool hasMipmaps = texInfo.isNormalMap || texInfo.file.fileExtension == "dds" || texInfo.file.fileExtension == "tga";
             return hasMipmaps;
         }
diff --git a/DynamicTextureLoader/TexRefCnt.cs b/DynamicTextureLoader/TexRefCnt.cs
@@ -27,6 +27,7 @@ public static void LoadFromList(List<TexRefCnt> list)
         {
             foreach (TexRefCnt texRef in list)
             {
+                Loader.Log("List: " + texRef.texInfo.name);
                 texRef.Load();
             }
         }
@@ -85,6 +86,7 @@ public static void UnLoadFromList(List<TexRefCnt> list, bool force)
         {
             foreach(TexRefCnt texRef in list)
             {
+                Loader.Log("List: " + texRef.texInfo.name);
                 texRef.Unload(force);
             }
         }
diff --git a/DynamicTextureLoader/TextureUnloaderPartModule.cs b/DynamicTextureLoader/TextureUnloaderPartModule.cs
@@ -13,7 +13,7 @@ class TextureUnloaderPartModule : PartModule
 
         public override void OnAwake()
         {
-            if (HighLogic.LoadedSceneIsGame)
+            if (HighLogic.LoadedSceneIsEditor||HighLogic.LoadedSceneIsFlight)
             {
                 Load();
             }
@@ -48,66 +48,82 @@ private void Load()
                 string partUrl = this.part.partInfo.partUrl;
 
                 Loader.Log("Loading: " + partUrl);
-                
-                foreach (Renderer mr in part.FindModelComponents<Renderer>())
-                {
-                    Loader.Log("Renderer: " + mr.name);
-                    TexRefCnt.LoadFromRenderer(mr);
-                }
 
                 if (!internalCache.ContainsKey(partUrl))
                 {
+
+                    List<TexRefCnt> list = new List<TexRefCnt>();
+                    foreach (Renderer mr in part.FindModelComponents<Renderer>())
+                    {
+                        Loader.Log("Renderer: " + mr.name);
+                        TexRefCnt.LoadFromRenderer(mr, list);
+                    }
+
+                
                     if (part.partInfo.internalConfig.HasData && HighLogic.LoadedSceneIsGame)
                     {
+                        Loader.Log("Creating internal cache...");
                         Part iPart = fetchInternalPart();
                         InternalModel internalModel = iPart.internalModel;
-                        List<TexRefCnt> list = new List<TexRefCnt>();
                         foreach (Renderer mr in internalModel.FindModelComponents<Renderer>())
                         {
+                            Loader.Log("ImRenderer: " + mr.name);
                             TexRefCnt.LoadFromRenderer(mr, list);
                         }
-                        internalCache[partUrl] = list;
                         GameObject.DestroyImmediate(iPart);
                     }
+                    else
+                    {
+                        Loader.Log(part.partInfo.internalConfig.HasData+" " +HighLogic.LoadedSceneIsGame);
+                    }
+
+                    internalCache[partUrl] = list;
                 }
-                else 
+                else
                 {
+                    Loader.Log("Loading from internal cache...");
                     List<TexRefCnt> list = internalCache[partUrl];
                     TexRefCnt.LoadFromList(list);
                 }
                 loaded = true;
             }
         }
 
-        public void Unload(bool force = false)
+        public void Unload(bool force = false, bool cache = true)
         {
             if (loaded || force)
             {
                 string partUrl = this.part.partInfo.partUrl;
                 Loader.Log("Unloading: " + partUrl);
-                foreach (Renderer mr in part.FindModelComponents<Renderer>())
-                {
-                    Loader.Log("Renderer: " + mr.name);
-                    TexRefCnt.UnLoadFromRenderer(mr, force);
-                }
 
                 if (!internalCache.ContainsKey(partUrl))
                 {
+                    List<TexRefCnt> list = new List<TexRefCnt>();
+                    foreach (Renderer mr in part.FindModelComponents<Renderer>())
+                    {
+                        Loader.Log("Renderer: " + mr.name);
+                        TexRefCnt.UnLoadFromRenderer(mr, force, list);
+                    }
+
                     if (part.partInfo.internalConfig.HasData && HighLogic.LoadedSceneIsGame)
                     {
                         Part iPart = fetchInternalPart();
                         InternalModel internalModel = iPart.internalModel;
-                        List<TexRefCnt> list = new List<TexRefCnt>();
                         foreach (Renderer mr in internalModel.FindModelComponents<Renderer>())
                         {
+                            Loader.Log("ImRenderer: " + mr.name);
                             TexRefCnt.UnLoadFromRenderer(mr, force, list);
                         }
-                        internalCache[partUrl] = list;
                         GameObject.DestroyImmediate(iPart);
                     }
+                    if (cache)
+                    {
+                        internalCache[partUrl] = list;
+                    }
                 }
                 else
                 {
+                    Loader.Log("Unloading from internal cache...");
                     List<TexRefCnt> list = internalCache[partUrl];
                     TexRefCnt.UnLoadFromList(list, force);
                 }
diff --git a/x86-DynamicTextureLoader-Release.zip b/x86-DynamicTextureLoader-Release.zip

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ private void Update()`
`44`	`44`	`MethodInfo mI = typeof(PartModule).GetMethod("Awake", BindingFlags.NonPublic \| BindingFlags.Instance);`
`45`	`45`	`mI.Invoke(module, null);`
`46`	`46`	`module.Load(moduleNode);`
`47`		`- module.Unload(true);`
	`47`	`+ module.Unload(true, false);`
`48`	`48`	`}`
`49`	`49`	`else`
`50`	`50`	`{`
`@@ -199,7 +199,7 @@ private static bool updateToStockSettings(GameDatabase.TextureInfo texInfo)`
`199`	`199`	`{`
`200`	`200`	`texInfo.isNormalMap = texInfo.file.name.EndsWith("NRM");`
`201`	`201`	`texInfo.isReadable = texInfo.file.fileExtension == "dds" \|\| texInfo.file.fileExtension == "truecolor" \|\| texInfo.isNormalMap ? false : true;`
`202`		`- texInfo.isCompressed = texInfo.file.fileExtension == "truecolor" ? false : true;`
	`202`	`+ texInfo.isCompressed = texInfo.file.fileExtension == "truecolor" \|\| texInfo.file.fileExtension == "tga" ? false : true;`
`203`	`203`	`bool hasMipmaps = texInfo.isNormalMap \|\| texInfo.file.fileExtension == "dds" \|\| texInfo.file.fileExtension == "tga";`
`204`	`204`	`return hasMipmaps;`
`205`	`205`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ public static void LoadFromList(List<TexRefCnt> list)`
`27`	`27`	`{`
`28`	`28`	`foreach (TexRefCnt texRef in list)`
`29`	`29`	`{`
	`30`	`+ Loader.Log("List: " + texRef.texInfo.name);`
`30`	`31`	`texRef.Load();`
`31`	`32`	`}`
`32`	`33`	`}`
`@@ -85,6 +86,7 @@ public static void UnLoadFromList(List<TexRefCnt> list, bool force)`
`85`	`86`	`{`
`86`	`87`	`foreach(TexRefCnt texRef in list)`
`87`	`88`	`{`
	`89`	`+ Loader.Log("List: " + texRef.texInfo.name);`
`88`	`90`	`texRef.Unload(force);`
`89`	`91`	`}`
`90`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class TextureUnloaderPartModule : PartModule`
`13`	`13`
`14`	`14`	`public override void OnAwake()`
`15`	`15`	`{`
`16`		`- if (HighLogic.LoadedSceneIsGame)`
	`16`	`+ if (HighLogic.LoadedSceneIsEditor\|\|HighLogic.LoadedSceneIsFlight)`
`17`	`17`	`{`
`18`	`18`	`Load();`
`19`	`19`	`}`
`@@ -48,66 +48,82 @@ private void Load()`
`48`	`48`	`string partUrl = this.part.partInfo.partUrl;`
`49`	`49`
`50`	`50`	`Loader.Log("Loading: " + partUrl);`
`51`		`-`
`52`		`- foreach (Renderer mr in part.FindModelComponents<Renderer>())`
`53`		`- {`
`54`		`- Loader.Log("Renderer: " + mr.name);`
`55`		`- TexRefCnt.LoadFromRenderer(mr);`
`56`		`- }`
`57`	`51`
`58`	`52`	`if (!internalCache.ContainsKey(partUrl))`
`59`	`53`	`{`
	`54`	`+`
	`55`	`+ List<TexRefCnt> list = new List<TexRefCnt>();`
	`56`	`+ foreach (Renderer mr in part.FindModelComponents<Renderer>())`
	`57`	`+ {`
	`58`	`+ Loader.Log("Renderer: " + mr.name);`
	`59`	`+ TexRefCnt.LoadFromRenderer(mr, list);`
	`60`	`+ }`
	`61`	`+`
	`62`	`+`
`60`	`63`	`if (part.partInfo.internalConfig.HasData && HighLogic.LoadedSceneIsGame)`
`61`	`64`	`{`
	`65`	`+ Loader.Log("Creating internal cache...");`
`62`	`66`	`Part iPart = fetchInternalPart();`
`63`	`67`	`InternalModel internalModel = iPart.internalModel;`
`64`		`- List<TexRefCnt> list = new List<TexRefCnt>();`
`65`	`68`	`foreach (Renderer mr in internalModel.FindModelComponents<Renderer>())`
`66`	`69`	`{`
	`70`	`+ Loader.Log("ImRenderer: " + mr.name);`
`67`	`71`	`TexRefCnt.LoadFromRenderer(mr, list);`
`68`	`72`	`}`
`69`		`- internalCache[partUrl] = list;`
`70`	`73`	`GameObject.DestroyImmediate(iPart);`
`71`	`74`	`}`
	`75`	`+ else`
	`76`	`+ {`
	`77`	`+ Loader.Log(part.partInfo.internalConfig.HasData+" " +HighLogic.LoadedSceneIsGame);`
	`78`	`+ }`
	`79`	`+`
	`80`	`+ internalCache[partUrl] = list;`
`72`	`81`	`}`
`73`		`- else`
	`82`	`+ else`
`74`	`83`	`{`
	`84`	`+ Loader.Log("Loading from internal cache...");`
`75`	`85`	`List<TexRefCnt> list = internalCache[partUrl];`
`76`	`86`	`TexRefCnt.LoadFromList(list);`
`77`	`87`	`}`
`78`	`88`	`loaded = true;`
`79`	`89`	`}`
`80`	`90`	`}`
`81`	`91`
`82`		`- public void Unload(bool force = false)`
	`92`	`+ public void Unload(bool force = false, bool cache = true)`
`83`	`93`	`{`
`84`	`94`	`if (loaded \|\| force)`
`85`	`95`	`{`
`86`	`96`	`string partUrl = this.part.partInfo.partUrl;`
`87`	`97`	`Loader.Log("Unloading: " + partUrl);`
`88`		`- foreach (Renderer mr in part.FindModelComponents<Renderer>())`
`89`		`- {`
`90`		`- Loader.Log("Renderer: " + mr.name);`
`91`		`- TexRefCnt.UnLoadFromRenderer(mr, force);`
`92`		`- }`
`93`	`98`
`94`	`99`	`if (!internalCache.ContainsKey(partUrl))`
`95`	`100`	`{`
	`101`	`+ List<TexRefCnt> list = new List<TexRefCnt>();`
	`102`	`+ foreach (Renderer mr in part.FindModelComponents<Renderer>())`
	`103`	`+ {`
	`104`	`+ Loader.Log("Renderer: " + mr.name);`
	`105`	`+ TexRefCnt.UnLoadFromRenderer(mr, force, list);`
	`106`	`+ }`
	`107`	`+`
`96`	`108`	`if (part.partInfo.internalConfig.HasData && HighLogic.LoadedSceneIsGame)`
`97`	`109`	`{`
`98`	`110`	`Part iPart = fetchInternalPart();`
`99`	`111`	`InternalModel internalModel = iPart.internalModel;`
`100`		`- List<TexRefCnt> list = new List<TexRefCnt>();`
`101`	`112`	`foreach (Renderer mr in internalModel.FindModelComponents<Renderer>())`
`102`	`113`	`{`
	`114`	`+ Loader.Log("ImRenderer: " + mr.name);`
`103`	`115`	`TexRefCnt.UnLoadFromRenderer(mr, force, list);`
`104`	`116`	`}`
`105`		`- internalCache[partUrl] = list;`
`106`	`117`	`GameObject.DestroyImmediate(iPart);`
`107`	`118`	`}`
	`119`	`+ if (cache)`
	`120`	`+ {`
	`121`	`+ internalCache[partUrl] = list;`
	`122`	`+ }`
`108`	`123`	`}`
`109`	`124`	`else`
`110`	`125`	`{`
	`126`	`+ Loader.Log("Unloading from internal cache...");`
`111`	`127`	`List<TexRefCnt> list = internalCache[partUrl];`
`112`	`128`	`TexRefCnt.UnLoadFromList(list, force);`
`113`	`129`	`}`