Fix DDS textures

GER-Space · Apr 29, 2018 · 5268b54 · 5268b54
1 parent 271b384
commit 5268b54
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/GameData/KerbalKonstructs/KerbalKonstructs.dll b/GameData/KerbalKonstructs/KerbalKonstructs.dll
diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("1.4.3.0")]
-[assembly: AssemblyInformationalVersion("1.4.3.0")]
+[assembly: AssemblyFileVersion("1.4.3.1")]
+[assembly: AssemblyInformationalVersion("1.4.3.1")]
 [assembly: KSPAssembly("KerbalKonstructs", 0, 9)]
diff --git a/src/Utilities/KKGraphics.cs b/src/Utilities/KKGraphics.cs
@@ -15,7 +15,7 @@ class KKGraphics
 
         private static Dictionary<string, Texture2D> cachedTextures = new Dictionary<string, Texture2D>();
 
-        private static List<string> imageExtentions = new List<string> { ".png", ".tga" , ".jpg" , ".dds"};
+        private static List<string> imageExtentions = new List<string> { ".png", ".tga" , ".jpg"};
 
         /// <summary>
         /// Load all shaders into the system and fill our shader database.
@@ -117,7 +117,7 @@ internal static Texture2D GetTexture(string textureName, bool asNormal = false,
                 Texture2D tmpTexture = null;
 
                 //// Otherwise search the game database for one loaded from GameData/
-                if (GameDatabase.Instance.ExistsTexture(textureName))
+                if (GameDatabase.Instance.ExistsTexture(textureName) && (GetImageExtention(textureName) != null))
                 {
                     // Get the texture URL
                     tmpTexture = GameDatabase.Instance.GetTexture(textureName, asNormal);
@@ -126,6 +126,11 @@ internal static Texture2D GetTexture(string textureName, bool asNormal = false,
                     foundTexture = new Texture2D(tmpTexture.width, tmpTexture.height, TextureFormat.ARGB32, false);
                     foundTexture.LoadImage(System.IO.File.ReadAllBytes("GameData/" + textureName + GetImageExtention(textureName)), false);
                 }
+                else
+                {
+                    Log.UserWarning("TextureLoader faild. Fallback to GameDatabase");
+                    foundTexture = GameDatabase.Instance.GetTexture(textureName, asNormal);
+                }
 
                 //// Otherwise search the game database for one loaded from GameData/
                 //if (GameDatabase.Instance.ExistsTexture(textureName))
@@ -145,23 +150,23 @@ private static string GetImageExtention(string imageName)
             string path = (KSPUtil.ApplicationRootPath + "GameData/" + imageName).Substring(0, pathIndex +1);
             string imageShortName = (KSPUtil.ApplicationRootPath + "GameData/" + imageName).Substring(pathIndex + 1);
 
-            Log.Normal("path: " + path);
-            Log.Normal("imageShortName: " + imageShortName);
+            //Log.Normal("path: " + path);
+            //Log.Normal("imageShortName: " + imageShortName);
 
             foreach (var filename in System.IO.Directory.GetFiles(path, (imageShortName + ".*")))
             {
-                Log.Normal("Found Filename: " + filename);
+                //Log.Normal("Found Filename: " + filename);
                 foreach (string pattern in imageExtentions)
                 {
-                    Log.Normal("pattern:" + pattern);
+                    //Log.Normal("pattern:" + pattern);
                     if (filename.Contains(pattern))
                     {
                         return pattern;
                     }
                 }
             }
 
-            Log.UserError("Could not find an image with the name");
+            Log.UserError("Could not find an image with the name: " + imageName);
             return null;
         }