Revert " Added dependency unBlur"

linuxgurugamer · linuxgurugamer · commit d27a95fa1080 · 2019-07-24T03:21:16.000-04:00
This reverts commit 654e879.
diff --git a/.vs/ToolbarControl/v15/Server/sqlite3/storage.ide b/.vs/ToolbarControl/v15/Server/sqlite3/storage.ide
diff --git a/.vs/ToolbarControl/v15/sqlite3/storage.ide b/.vs/ToolbarControl/v15/sqlite3/storage.ide
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,6 @@
+0.1.8.2
+	Removed all UnBlur references
+
 0.1.8.1
 	Updated to add large icon to the toolbar.BigTexturePath (new in toolbar 1.7.20)
 	Added InstallChecker
diff --git a/GameData/001_ToolbarControl/PluginData/Textures/toolbar_24.png b/GameData/001_ToolbarControl/PluginData/Textures/toolbar_24.png
diff --git a/GameData/001_ToolbarControl/PluginData/Textures/toolbar_38.png b/GameData/001_ToolbarControl/PluginData/Textures/toolbar_38.png
diff --git a/GameData/001_ToolbarControl/PluginData/Textures/window.png b/GameData/001_ToolbarControl/PluginData/Textures/window.png
diff --git a/GameData/001_ToolbarControl/README.md b/GameData/001_ToolbarControl/README.md
@@ -195,8 +195,8 @@ And in the file where the button is added to the ToolbarController:
 					ApplicationLauncher.AppScenes.FLIGHT | ApplicationLauncher.AppScenes.MAPVIEW | ApplicationLauncher.AppScenes.TRACKSTATION,
 					MODID,
 					"slingShotterButton",
-					"SlingShotter/Textures/icon_38",
-					"SlingShotter/Textures/icon_24",
+					"SlingShotter/PluginData/Textures/icon_38",
+					"SlingShotter/PluginData/Textures/icon_24",
 					MODNAME
 				);
 			}
diff --git a/GameData/001_ToolbarControl/ToolbarControl.version b/GameData/001_ToolbarControl/ToolbarControl.version
@@ -10,7 +10,7 @@
     "MAJOR": 0,
     "MINOR": 1,
     "PATCH": 8,
-    "BUILD": 0
+    "BUILD": 1
   },
   "KSP_VERSION": {
     "MAJOR": 1,
diff --git a/README.md b/README.md
@@ -195,8 +195,8 @@ And in the file where the button is added to the ToolbarController:
 					ApplicationLauncher.AppScenes.FLIGHT | ApplicationLauncher.AppScenes.MAPVIEW | ApplicationLauncher.AppScenes.TRACKSTATION,
 					MODID,
 					"slingShotterButton",
-					"SlingShotter/Textures/icon_38",
-					"SlingShotter/Textures/icon_24",
+					"SlingShotter/PluginData/Textures/icon_38",
+					"SlingShotter/PluginData/Textures/icon_24",
 					MODNAME
 				);
 			}
diff --git a/ToolbarControl.version b/ToolbarControl.version
@@ -10,7 +10,7 @@
     "MAJOR": 0,
     "MINOR": 1,
     "PATCH": 8,
-    "BUILD": 1
+    "BUILD": 2
   },
   "KSP_VERSION": {
     "MAJOR": 1,
diff --git a/ToolbarControl/AssemblyVersion.cs b/ToolbarControl/AssemblyVersion.cs
@@ -10,4 +10,4 @@
   
  using System.Reflection;
 
- [assembly: AssemblyVersion("0.1.8.0")]
+ [assembly: AssemblyVersion("0.1.8.1")]
diff --git a/ToolbarControl/BlizzyOptions.cs b/ToolbarControl/BlizzyOptions.cs
@@ -48,8 +48,8 @@ void AddToolbarButton()
                 ApplicationLauncher.AppScenes.TRACKSTATION,
                 MODID,
                 "toolbarControllerButton",
-                "001_ToolbarControl/Textures/toolbar_38",
-                "001_ToolbarControl/Textures/toolbar_24",
+                "001_ToolbarControl/PluginData/Textures/toolbar_38",
+                "001_ToolbarControl/PluginData/Textures/toolbar_24",
                 MODNAME
             );
         }
diff --git a/ToolbarControl/IntroWindow.cs b/ToolbarControl/IntroWindow.cs
@@ -131,7 +131,10 @@ void ProcessLine(string line)
             if (line.Length >= 7 && line.Substring(0, 7) == "<IMAGE=")
             {
                 string s = line.Substring(7, line.Length - 8);
-                Texture2D image= null;
+
+                Log.Debug(ConfigInfo.debugMode, "Process line, image: " + s);
+                Texture2D image = new Texture2D(2, 2, TextureFormat.ARGB32, false);
+
                 if (ToolbarControl.LoadImageFromFile(ref image, KSPUtil.ApplicationRootPath + "GameData/" + s))
                 {
                     images.Add(image);
diff --git a/ToolbarControl/Properties/AssemblyInfo.cs b/ToolbarControl/Properties/AssemblyInfo.cs
@@ -36,6 +36,4 @@
 [assembly: AssemblyFileVersion("1.0.0.0")]
 
 [assembly: KSPAssembly("ToolbarController", 1, 0)]
-
 [assembly: KSPAssemblyDependency("ClickThroughBlocker", 1, 0)]
-//[assembly: KSPAssemblyDependency("unBlur", 0, 4)]
diff --git a/ToolbarControl/RegisterToolbar.cs b/ToolbarControl/RegisterToolbar.cs
@@ -9,12 +9,9 @@ namespace ToolbarControl_NS
     [KSPAddon(KSPAddon.Startup.Instantly, true)]
     public class RegisterToolbarBlizzyOptions : MonoBehaviour
     {
-        public static bool unBlurPresent = false;
 
         void Start()
         {
-            unBlurPresent = AssemblyLoader.loadedAssemblies.Any(a => a.assembly.GetName().Name == "unBlur");
-
             ToolbarControl.RegisterMod(BlizzyOptions.MODID, BlizzyOptions.MODNAME, false, true, false);
         }
     }
diff --git a/ToolbarControl/ToolbarControl.cs b/ToolbarControl/ToolbarControl.cs
@@ -607,7 +607,6 @@ private void UpdateToolbarIcon(bool firstTime = false)
         // easier to specify different cases than to change case to lower.  This will fail on MacOS and Linux
         // if a suffix has mixed case
         static string[] imgSuffixes = new string[] { ".png", ".jpg", ".gif", ".PNG", ".JPG", ".GIF", ".dds", ".DDS" };
-#if true
         public static Boolean LoadImageFromFile(ref Texture2D tex, String fileNamePath)
         {
 
@@ -685,91 +684,7 @@ public static Boolean LoadImageFromFile(ref Texture2D tex, String fileNamePath)
             }
             return blnReturn;
         }
-#else
-        public static Boolean LoadImageFromFile(ref Texture2D tex, String fileNamePath)
-        {
-            Texture2D tx;
-            bool rc = LoadImageFromFile(out tx, fileNamePath);
-            tex = tx;
-            return rc;
-        }
-
-        static internal Texture2D LoadDDSViaUnBlur(string path)
-        {
-            return UnBlur.UnBlur.LoadDDS(path, false);
-        }
-        static internal Boolean LoadImageFromFile(out Texture2D tex, String fileNamePath, bool b = true)
-        {
-
-            Boolean blnReturn = false;
-            tex = null;
-            bool dds = false;
-            try
-            {
-                string path = fileNamePath;
-                if (!System.IO.File.Exists(fileNamePath))
-                {
-                    // Look for the file with an appended suffix.
-                    for (int i = 0; i < imgSuffixes.Length; i++)
-
-                        if (System.IO.File.Exists(fileNamePath + imgSuffixes[i]))
-                        {
-                            path = fileNamePath + imgSuffixes[i];
-                            dds = imgSuffixes[i] == ".dds" || imgSuffixes[i] == ".DDS";
-                            break;
-                        }
-                }
-
-                //File Exists check
-                if (System.IO.File.Exists(path))
-                {
-
-                    try
-                    {
-
-                        if (RegisterToolbarBlizzyOptions.unBlurPresent)
-                        {
-                            if (dds)
-                            {
-                                tex = LoadDDSViaUnBlur(path);
-                                if (tex == null)
-                                    throw new Exception("LoadDDS failed.");
-                            }
-                            else
-                            {
-                                tex = new Texture2D(16, 16, TextureFormat.ARGB32, false);
-                                tex.LoadImage(System.IO.File.ReadAllBytes(path));
-                            }
-                        }
-                        else
-                        {
-                            tex = new Texture2D(16, 16, TextureFormat.ARGB32, false);
-                            tex.LoadImage(System.IO.File.ReadAllBytes(path));
-                        }
-                        blnReturn = true;
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Error("Failed to load the texture:" + path);
-                        Log.Error(ex.Message);
-                    }
 
-                }
-                else
-                {
-                    Log.Error("Cannot find texture to load:" + fileNamePath);
-                }
-
-
-            }
-            catch (Exception ex)
-            {
-                Log.Error("Failed to load (are you missing a file):" + fileNamePath);
-                Log.Error(ex.Message);
-            }
-            return blnReturn;
-        }
-#endif
         public static Texture2D LoadTextureDXT(byte[] ddsBytes, TextureFormat textureFormat)
         {
             if (textureFormat != TextureFormat.DXT1 && textureFormat != TextureFormat.DXT5)
@@ -792,7 +707,7 @@ public static Texture2D LoadTextureDXT(byte[] ddsBytes, TextureFormat textureFor
 
             return (texture);
         }
-#if false
+
         Texture2D GetTexture(string path, bool b)
         {
             Log.Debug(ConfigInfo.debugMode, "GetTexture, path: " + KSPUtil.ApplicationRootPath + "GameData/" + path);
@@ -814,49 +729,6 @@ Texture2D GetTexture(string path, bool b)
   
             return null;
         }
-#else
-        internal static string TexPathname(string path)
-        {
-            string s = KSPUtil.ApplicationRootPath + "GameData/" + path;
-            Log.Info("TexPathname: " + s);
-            return s;
-        }
-
-        Texture2D GetTextureViaUnBlur(string path, bool asNormalMap)
-        {
-            // ask unBlur to look for the texture in GameDatabase, remove mipmaps if necessary, and return it
-            Texture2D tex = UnBlur.UnBlur.Instance?.GetTexture(path, asNormalMap);
-            return tex;
-        }
-
-        Texture2D GetTexture(string path, bool asNormalMap)
-        {
-            Texture2D tex = new Texture2D(16, 16, TextureFormat.ARGB32, false); ;
-            if (RegisterToolbarBlizzyOptions.unBlurPresent)
-            {
-                // ask unBlur to look for the texture in GameDatabase, remove mipmaps if necessary, and return it
-                tex = GetTextureViaUnBlur(path, asNormalMap);
-                if (tex != null) return tex;
-            }
-   
-            // texture not found in GameDatabase
-            //LoadImageFromFile(out tex, TexPathname(path));
-            //return tex;
-
-            if (LoadImageFromFile(ref tex, TexPathname(path)))
-                return tex;
-            if (GameDatabase.Instance.ExistsTexture(path))
-            {
-                tex = GameDatabase.Instance.GetTexture(path, false);
-                return tex;
-            }
-
-
-            Log.Error("Cannot find texture to load:" + path);
-
-            return null;
-        }
-#endif
 
         private void OnGUIAppLauncherReady()
         {
diff --git a/ToolbarControl/ToolbarControl.csproj b/ToolbarControl/ToolbarControl.csproj
@@ -84,9 +84,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
-    <Reference Include="unBlur.0.4.0">
-      <HintPath>R:\KSP_1.6.1_dev\GameData\unBlur.0.4.0.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>R:\KSP_1.7.2_dev\KSP_x64_Data\Managed\UnityEngine.dll</HintPath>
