Merge pull request #3 from stasikos/master

Fixes shader loading issues on OSX and Linux
linuxgurugamer · Nov 11, 2016 · 2f92d8a · 2f92d8a
2 parents d8bb9ec + 0c6786a
commit 2f92d8a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/GameData/HullCameraVDS/Resources/shaders.linux b/GameData/HullCameraVDS/Resources/shaders.linux
diff --git a/GameData/HullCameraVDS/Resources/shaders.osx b/GameData/HullCameraVDS/Resources/shaders.osx
diff --git a/GameData/HullCameraVDS/Resources/shaders.windows b/GameData/HullCameraVDS/Resources/shaders.windows
diff --git a/Src/CameraFilters/CameraFilter.cs b/Src/CameraFilters/CameraFilter.cs
@@ -178,14 +178,29 @@ protected float GetSliderValue(string label, float value, float leftValue, float
         }
 
         private static bool BundleLoaded = false;
-        private static Dictionary<string, Shader> LoadedShaders = new Dictionary<string, Shader>();
-
+        private static Dictionary<string, Shader> LoadedShaders = new Dictionary<string, Shader>();
+
         public static void LoadBundle()
         {
             if (BundleLoaded)
                 return;
 
-            using (WWW www = new WWW("file://" + KSPUtil.ApplicationRootPath + "GameData/HullCameraVDS/Resources/shaders.bundle"))
+			string bundleName;
+			switch (Application.platform)
+			{
+				case RuntimePlatform.OSXPlayer:
+				bundleName = "shaders.osx";
+				break;
+
+				case RuntimePlatform.LinuxPlayer:
+				bundleName = "shaders.linux";
+				break;
+
+			default:
+				bundleName = "shaders.windows";
+				break;
+			}
+            using (WWW www = new WWW("file://" + KSPUtil.ApplicationRootPath + "GameData/HullCameraVDS/Resources/" + bundleName))
             {
                 if (www.error != null)
                     Debug.Log("Shaders bundle not found!");