Switch to single shader bundle (this doesn't work yet)

Author: JonnyOThan

GameData/SCANsat/Resources/scan_icons.scan

@@ -34,10 +34,7 @@ public class SCAN_UI_Loader : MonoBehaviour
 		private const string prefabAssetName = "scan_prefabs.scan";
 		private const string unitySkinAssetName = "scan_unity_skin.scan";
 		private const string iconAssetName = "scan_icons.scan";
-		private const string shadersAssetName = "scan_shaders";
-		private const string winShaderName = "-windows.scan";
-		private const string linuxShaderName = "-linux.scan";
-		private const string macShaderName = "-macosx.scan";
+		private const string shadersAssetName = "scan_shaders.scan";
 
 		private static bool loaded;
 		private static bool skinLoaded;
@@ -381,18 +378,7 @@ private IEnumerator loadResources()
 
 		private static void loadShaders()
 		{
-			string shaderPath;
-
-			if (Application.platform == RuntimePlatform.WindowsPlayer && SystemInfo.graphicsDeviceVersion.StartsWith("OpenGL"))
-				shaderPath = shadersAssetName + linuxShaderName;
-			else if (Application.platform == RuntimePlatform.WindowsPlayer)
-				shaderPath = shadersAssetName + winShaderName;
-			else if (Application.platform == RuntimePlatform.LinuxPlayer)
-				shaderPath = shadersAssetName + linuxShaderName;
-			else
-				shaderPath = shadersAssetName + macShaderName;
-
-			AssetBundle shaders = AssetBundle.LoadFromFile(path + shaderPath);
+			AssetBundle shaders = AssetBundle.LoadFromFile(path + shadersAssetName);
 
 			if (shaders == null)
 				return;
@@ -410,7 +396,7 @@ private static void loadShaders()
                     _edgeDetectShader = s;
 			}
 
-			SCANUtil.SCANlog("Shader asset bundle loaded; using platform bundle: {0}", shaderPath);
+			SCANUtil.SCANlog("Shader asset bundle loaded; using platform bundle: {0}", shadersAssetName);
 
 			//shaders.Unload(false);
 

GameData/SCANsat/Resources/scan_prefabs.scan

@@ -1,5 +1,5 @@
 ManifestFileVersion: 0
-CRC: 484482127
+CRC: 3813315843
 AssetBundleManifest:
   AssetBundleInfos:
     Info_0:
@@ -16,3 +16,22 @@ AssetBundleManifest:
     Info_3:
       Name: scan_icons
       Dependencies: {}
+    Info_4:
+      Name: scan_images
+      Dependencies: {}
+    Info_5:
+      Name: scansat_prefabs
+      Dependencies: {}
+    Info_6:
+      Name: scan_ghost
+      Dependencies: {}
+    Info_7:
+      Name: unity_ghost
+      Dependencies: {}
+    Info_8:
+      Name: scansat_core
+      Dependencies:
+        Dependency_0: squadcore
+    Info_9:
+      Name: squadcore
+      Dependencies: {}