Merge pull request #43 from mob-sakai/develop

Release 2.0.0

Author: Takashi Sakai

Assets/Editor/ExportPackage.cs

@@ -2,13 +2,14 @@
 using System.Linq;
 using UnityEditor;
 using UnityEngine;
-using BlurMode = UnityEngine.UI.UIEffect.BlurMode;
-using ColorMode = UnityEngine.UI.UIEffect.ColorMode;
-using ToneMode = UnityEngine.UI.UIEffect.ToneMode;
 using UnityEngine.UI;
 
-namespace UnityEditor.UI
+namespace Coffee.UIExtensions
 {
+	using BlurMode = UIEffect.BlurMode;
+	using ColorMode = UIEffect.ColorMode;
+	using ToneMode = UIEffect.ToneMode;
+
 	public static class ExportPackage
 	{
 		const string kPackageName = "UIEffect.unitypackage";
@@ -24,47 +25,54 @@ static void Export()
 			if (EditorApplication.isPlayingOrWillChangePlaymode)
 				return;
 
-			// Export materials.
-			AssetDatabase.StartAssetEditing();
-			CreateMaterialVariant(
-				Shader.Find(UIEffect.shaderName)
-				, (ToneMode[])Enum.GetValues(typeof(ToneMode))
-				, (ColorMode[])Enum.GetValues(typeof(ColorMode))
-				, (BlurMode[])Enum.GetValues(typeof(BlurMode))
-			);
-
-			CreateMaterialVariant(
-				Shader.Find(UIEffectCapturedImage.shaderName)
-				, new []{ ToneMode.None, ToneMode.Grayscale, ToneMode.Sepia, ToneMode.Nega, ToneMode.Pixel, ToneMode.Hue, }
-				, (ColorMode[])Enum.GetValues(typeof(ColorMode))
-				, (BlurMode[])Enum.GetValues(typeof(BlurMode))
-			);
-			AssetDatabase.StopAssetEditing();
-			AssetDatabase.Refresh();
-
 			// Export package
 			AssetDatabase.ExportPackage(kAssetPathes, kPackageName, ExportPackageOptions.Recurse | ExportPackageOptions.Default);
 			UnityEngine.Debug.Log("Export successfully : " + kPackageName);
 
+			// Update readme.
 			System.IO.File.Copy("Assets/UIEffect/Readme.md", "Readme.md", true);
 		}
 
-		static void CreateMaterialVariant(Shader shader, ToneMode[] tones, ColorMode[] colors, BlurMode[] blurs)
+		[MenuItem("Export Package/Generate Material Variants")]
+		static void GenerateMaterialVariants()
 		{
-			var combinations = (from tone in tones
-			                    from color in colors
-			                    from blur in blurs
-			                    select new { tone, color, blur }).ToArray();
+#if UIEFFECT_SEPARATE
+			// On "UIEFFECT_SEPARATE" mode, generate effect materials on demand.
+			return;
+#endif
+
+			// Export materials.
+			AssetDatabase.StartAssetEditing();
+			{
+				// For UIEffect
+				GenerateMaterialVariants(Shader.Find(UIEffect.shaderName));
+
+				// For UIEffectCapturedImage
+				GenerateMaterialVariants(Shader.Find(UIEffectCapturedImage.shaderName));
+			}
+			AssetDatabase.StopAssetEditing();
+			AssetDatabase.SaveAssets();
+			AssetDatabase.Refresh();
+		}
+
+		/// <summary>
+		/// Generates the material variants.
+		/// </summary>
+		static void GenerateMaterialVariants(Shader shader)
+		{
+			var combinations = (from tone in (ToneMode[])Enum.GetValues(typeof(ToneMode))
+								from color in (ColorMode[])Enum.GetValues(typeof(ColorMode))
+								from blur in (BlurMode[])Enum.GetValues(typeof(BlurMode))
+								select new { tone, color, blur }).ToArray();
 
 			for (int i = 0; i < combinations.Length; i++)
 			{
 				var comb = combinations[i];
 
-				if (comb.tone == 0 && comb.color == 0 && comb.blur == 0)
-					continue;
-
-				UIEffectEditor.GetOrCreateMaterial(shader, comb.tone, comb.color, comb.blur);
+				EditorUtility.DisplayProgressBar("Genarate Effect Material", UIEffect.GetVariantName(shader, comb.tone, comb.color, comb.blur), (float)i / combinations.Length);
+				UIEffect.GetOrGenerateMaterialVariant(shader, comb.tone, comb.color, comb.blur);
 			}
+			EditorUtility.ClearProgressBar();
 		}
 	}
 }