change: change namespace

BREAKING CHANGE: If your code contained the SoftMask API, it would fail to compile. Please change the namespace from `Coffee.UIExtensions` to `Coffee.UISoftMask`.
mob-sakai · May 11, 2020 · 0347b04 · 0347b04
1 parent 3451521
commit 0347b04
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 21 deletions.
diff --git a/Packages/SoftMaskForUGUI/Samples/Demo/SoftMask_Demo.cs b/Packages/SoftMaskForUGUI/Samples/Demo/SoftMask_Demo.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace Coffee.UIExtensions.Demos
+namespace Coffee.UISoftMask.Demos
 {
 	public class SoftMask_Demo : MonoBehaviour
 	{

diff --git a/...s/SoftMaskForUGUI/Scripts/Editor/Utils.cs → ...MaskForUGUI/Scripts/Editor/EditorUtils.cs b/...s/SoftMaskForUGUI/Scripts/Editor/Utils.cs → ...MaskForUGUI/Scripts/Editor/EditorUtils.cs
@@ -4,19 +4,19 @@
 using UnityEditor.SceneManagement;
 
 
-namespace Coffee.UIExtensions.Editors
+namespace Coffee.UISoftMask
 {
-    public static class Utils
+    public static class EditorUtils
     {
         public static void MarkPrefabDirty ()
         {
             #if UNITY_2018_3_OR_NEWER
                 var prefabStage = PrefabStageUtility.GetCurrentPrefabStage ();
-                if (prefabStage != null) 
+                if (prefabStage != null)
                 {
                     EditorSceneManager.MarkSceneDirty (prefabStage.scene);
                 }
             #endif
         }
     }
-}
+}
diff --git a/...tMaskForUGUI/Scripts/Editor/Utils.cs.meta → ...orUGUI/Scripts/Editor/EditorUtils.cs.meta b/...tMaskForUGUI/Scripts/Editor/Utils.cs.meta → ...orUGUI/Scripts/Editor/EditorUtils.cs.meta
diff --git a/Packages/SoftMaskForUGUI/Scripts/Editor/ImportSampleMenu.cs b/Packages/SoftMaskForUGUI/Scripts/Editor/ImportSampleMenu.cs
@@ -4,9 +4,9 @@
 using System.Text.RegularExpressions;
 using UnityEditor;
 
-namespace Coffee.UIExtensions
+namespace Coffee.UISoftMask
 {
-    public static class ImportSampleMenu_UISoftMask
+    public static class ImportSampleMenu
     {
         [MenuItem("Assets/Samples/Import UISoftMask Sample")]
         private static void ImportSample()

diff --git a/Packages/SoftMaskForUGUI/Scripts/Editor/SoftMaskEditor.cs b/Packages/SoftMaskForUGUI/Scripts/Editor/SoftMaskEditor.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 
 
-namespace Coffee.UIExtensions.Editors
+namespace Coffee.UISoftMask
 {
 	/// <summary>
 	/// SoftMask editor.
@@ -41,8 +41,8 @@ public override void OnInspectorGUI ()
 					{
 						p.gameObject.AddComponent<SoftMaskable> ();
 					}
-					
-					Utils.MarkPrefabDirty ();
+
+					EditorUtils.MarkPrefabDirty ();
 				}
 				if (GUILayout.Button ("Ping"))
 				{
@@ -131,4 +131,4 @@ protected static void ConvertTo<T>(Object context) where T : MonoBehaviour
 			(so.targetObject as MonoBehaviour).enabled = oldEnable;
 		}
 	}
-}
+}
diff --git a/Packages/SoftMaskForUGUI/Scripts/Editor/SoftMaskableEditor.cs b/Packages/SoftMaskForUGUI/Scripts/Editor/SoftMaskableEditor.cs
@@ -9,7 +9,7 @@
 using MaskIntr = UnityEngine.SpriteMaskInteraction;
 using System.IO;
 
-namespace Coffee.UIExtensions.Editors
+namespace Coffee.UISoftMask
 {
 	/// <summary>
 	/// SoftMaskable editor.
@@ -98,7 +98,7 @@ void OnEnable ()
 
 			s_MaskWarning = new GUIContent(EditorGUIUtility.FindTexture("console.warnicon.sml"), "This component is not SoftMask. Use SoftMask instead of Mask.");
 		}
-		
+
 		void OnDisable ()
 		{
 			ClearMaterialEditors ();
@@ -235,16 +235,16 @@ public override void OnInspectorGUI ()
 					ShowMaterialEditors (fontSharedMaterials, 1, fontSharedMaterials.Length - 1);
 				}
 			}
-			
+
 			if (!DetectMask (current.transform.parent))
 			{
 				GUILayout.BeginHorizontal ();
 				EditorGUILayout.HelpBox ("This is unnecessary SoftMaskable.\nCan't find any SoftMask components above.", MessageType.Warning);
 				if (GUILayout.Button ("Remove", GUILayout.Height (40)))
 				{
 					DestroyImmediate (current);
-					
-					Utils.MarkPrefabDirty ();
+
+					EditorUtils.MarkPrefabDirty ();
 				}
 				GUILayout.EndHorizontal ();
 			}
@@ -410,4 +410,4 @@ object ModifyTMProSpriteAsset (Material baseMaterial, Shader shader, System.Acti
 			return spriteAsset;
 		}
 	}
-}
+}
diff --git a/Packages/SoftMaskForUGUI/Scripts/GraphicConnector.cs b/Packages/SoftMaskForUGUI/Scripts/GraphicConnector.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace Coffee.UIExtensions
+namespace Coffee.UISoftMask
 {
     internal static class GraphicConnectorExtension
     {

diff --git a/Packages/SoftMaskForUGUI/Scripts/MaterialCache.cs b/Packages/SoftMaskForUGUI/Scripts/MaterialCache.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace Coffee.UIExtensions
+namespace Coffee.UISoftMask
 {
     internal class MaterialCache
     {

diff --git a/Packages/SoftMaskForUGUI/Scripts/SoftMask.cs b/Packages/SoftMaskForUGUI/Scripts/SoftMask.cs
@@ -3,7 +3,7 @@
 using UnityEngine.Rendering;
 using UnityEngine.UI;
 
-namespace Coffee.UIExtensions
+namespace Coffee.UISoftMask
 {
 	/// <summary>
 	/// Soft mask.

diff --git a/Packages/SoftMaskForUGUI/Scripts/SoftMaskable.cs b/Packages/SoftMaskForUGUI/Scripts/SoftMaskable.cs
@@ -4,7 +4,7 @@
 using UnityEngine.UI;
 using MaskIntr = UnityEngine.SpriteMaskInteraction;
 
-namespace Coffee.UIExtensions
+namespace Coffee.UISoftMask
 {
 	/// <summary>
 	/// Soft maskable.