Reorganized Assets/Create menu to group the tiles and brushes. (Unity-Technologies#49)

ClassyCircuit · ChuanXin-Unity · commit 7f3a116705b7 · 2018-08-13T14:40:45.000+08:00
* Reorganized Assets/Create menu to group the tiles and brushes.

* Removed redundant local variable from RuleTileEditor and fixed AnimatedTile menu component.

* Grouped animated tile along with the rest of tiles in Assets/Create.

* Replaced [MenuItem] attributes with [CreateAssetMenu]
diff --git a/Assets/Tilemap/Brushes/Coordinate Brush/Scripts/Editor/CoordinateBrush.cs b/Assets/Tilemap/Brushes/Coordinate Brush/Scripts/Editor/CoordinateBrush.cs
@@ -5,6 +5,7 @@
 namespace UnityEditor
 {
     [CustomGridBrush(true, false, false, "Coordinate Brush")]
+    [CreateAssetMenu(fileName = "New Coordinate Brush", menuName = "Brushes/Coordinate Brush")]
     public class CoordinateBrush : GridBrush {
         public int z = 0;
 
@@ -32,17 +33,6 @@ public override void BoxFill(GridLayout gridLayout, GameObject brushTarget, Boun
             position.position = zPosition;
             base.BoxFill(gridLayout, brushTarget, position);
         }
-
-        [MenuItem("Assets/Create/Coordinate Brush")]
-        public static void CreateBrush()
-        {
-            string path = EditorUtility.SaveFilePanelInProject("Save Coordinate Brush", "New Coordinate Brush", "asset", "Save Coordinate Brush", "Assets");
-
-            if (path == "")
-                return;
-
-            AssetDatabase.CreateAsset(ScriptableObject.CreateInstance<CoordinateBrush>(), path);
-        }
     }
 
     [CustomEditor(typeof(CoordinateBrush))]
diff --git a/Assets/Tilemap/Brushes/Line Brush/Scripts/Editor/LineBrush.cs b/Assets/Tilemap/Brushes/Line Brush/Scripts/Editor/LineBrush.cs
@@ -8,6 +8,7 @@
 namespace UnityEditor
 {
     [CustomGridBrush(true, false, false, "Line Brush")]
+    [CreateAssetMenu(fileName = "New Line Brush", menuName = "Brushes/Line Brush")]
     public class LineBrush : GridBrush
     {
         public bool lineStartActive = false;
@@ -39,17 +40,6 @@ public override void Paint(GridLayout grid, GameObject brushTarget, Vector3Int p
             }
         }
 
-        [MenuItem("Assets/Create/Line Brush")]
-        public static void CreateBrush()
-        {
-            string path = EditorUtility.SaveFilePanelInProject("Save Line Brush", "New Line Brush", "asset", "Save Line Brush", "Assets");
-
-            if (path == "")
-                return;
-
-            AssetDatabase.CreateAsset(ScriptableObject.CreateInstance<LineBrush>(), path);
-        }
-
         /// <summary>
         /// Added option to fill gaps for continuous lines.
         /// </summary>
diff --git a/Assets/Tilemap/Brushes/Prefab Brush/Scripts/Editor/PrefabBrush.cs b/Assets/Tilemap/Brushes/Prefab Brush/Scripts/Editor/PrefabBrush.cs
@@ -5,7 +5,7 @@
 
 namespace UnityEditor
 {
-	[CreateAssetMenu]
+    [CreateAssetMenu(fileName = "Prefab brush", menuName = "Brushes/Prefab brush")]
 	[CustomGridBrush(false, true, false, "Prefab Brush")]
 	public class PrefabBrush : GridBrushBase
 	{
diff --git a/Assets/Tilemap/Brushes/Random Brush/Scripts/Editor/RandomBrush.cs b/Assets/Tilemap/Brushes/Random Brush/Scripts/Editor/RandomBrush.cs
@@ -7,6 +7,7 @@
 namespace UnityEditor
 {
     [CustomGridBrush(false, true, false, "Random Brush")]
+    [CreateAssetMenu(fileName = "New Random Brush", menuName = "Brushes/Random Brush")]
     public class RandomBrush : GridBrush 
 	{
 		public TileBase[] randomTiles;
@@ -35,17 +36,6 @@ public override void Paint(GridLayout grid, GameObject brushTarget, Vector3Int p
 				base.Paint(grid, brushTarget, position);
 			}
         }
-
-        [MenuItem("Assets/Create/Random Brush")]
-        public static void CreateBrush()
-        {
-            string path = EditorUtility.SaveFilePanelInProject("Save Random Brush", "New Random Brush", "asset", "Save Random Brush", "Assets");
-
-            if (path == "")
-                return;
-
-            AssetDatabase.CreateAsset(ScriptableObject.CreateInstance<RandomBrush>(), path);
-        }
     }
 
     [CustomEditor(typeof(RandomBrush))]
diff --git a/Assets/Tilemap/Tiles/Animated Tile/Scripts/AnimatedTile.cs b/Assets/Tilemap/Tiles/Animated Tile/Scripts/AnimatedTile.cs
@@ -11,6 +11,7 @@
 namespace UnityEngine.Tilemaps
 {
     [Serializable]
+    [CreateAssetMenu(fileName = "New Animated Tile", menuName = "Tiles/Animated Tile")]
     public class AnimatedTile : TileBase
     {
         public Sprite[] m_AnimatedSprites;
@@ -41,18 +42,6 @@ public override bool GetTileAnimationData(Vector3Int location, ITilemap tileMap,
             }
             return false;
         }
-
-#if UNITY_EDITOR
-        [MenuItem("Assets/Create/Animated Tile")]
-        public static void CreateAnimatedTile()
-        {
-            string path = EditorUtility.SaveFilePanelInProject("Save Animated Tile", "New Animated Tile", "asset", "Save Animated Tile", "Assets");
-            if (path == "")
-                return;
-
-            AssetDatabase.CreateAsset(ScriptableObject.CreateInstance<AnimatedTile>(), path);
-        }
-#endif
     }
 
 #if UNITY_EDITOR
diff --git a/Assets/Tilemap/Tiles/Pipeline Tile/Scripts/PipelineTile.cs b/Assets/Tilemap/Tiles/Pipeline Tile/Scripts/PipelineTile.cs
@@ -11,6 +11,7 @@
 namespace UnityEngine.Tilemaps
 {
 	[Serializable]
+	[CreateAssetMenu(fileName = "New Pipeline Tile", menuName = "Tiles/Pipeline Tile")]
 	public class PipelineTile : TileBase
 	{
 		[SerializeField]
@@ -101,19 +102,6 @@ private Matrix4x4 GetTransform(byte mask)
 			}
 			return Matrix4x4.identity;
 		}
-
-#if UNITY_EDITOR
-		[MenuItem("Assets/Create/Pipeline Tile")]
-		public static void CreatePipelineTile()
-		{
-			string path = EditorUtility.SaveFilePanelInProject("Save Pipeline Tile", "New Pipeline Tile", "asset", "Save Pipeline Tile", "Assets");
-
-			if (path == "")
-				return;
-
-			AssetDatabase.CreateAsset(ScriptableObject.CreateInstance<PipelineTile>(), path);
-		}
-#endif
 	}
 	
 #if UNITY_EDITOR
diff --git a/Assets/Tilemap/Tiles/Random Tile/Scripts/RandomTile.cs b/Assets/Tilemap/Tiles/Random Tile/Scripts/RandomTile.cs
@@ -11,6 +11,7 @@
 namespace UnityEngine.Tilemaps
 {
 	[Serializable]
+	[CreateAssetMenu(fileName = "New Random Tile", menuName = "Tiles/Random Tile")]
 	public class RandomTile : Tile
 	{
 		[SerializeField]
@@ -31,19 +32,6 @@ public override void GetTileData(Vector3Int location, ITilemap tileMap, ref Tile
 				tileData.sprite = m_Sprites[(int) (m_Sprites.Length * Random.value)];
 			}
 		}
-
-#if UNITY_EDITOR
-		[MenuItem("Assets/Create/Random Tile")]
-		public static void CreateRandomTile()
-		{
-			string path = EditorUtility.SaveFilePanelInProject("Save Random Tile", "New Random Tile", "asset", "Save Random Tile", "Assets");
-
-			if (path == "")
-				return;
-
-			AssetDatabase.CreateAsset(ScriptableObject.CreateInstance<RandomTile>(), path);
-		}
-#endif
 	}
 
 #if UNITY_EDITOR
diff --git a/Assets/Tilemap/Tiles/Rule Override Tile/Scripts/RuleOverrideTile.cs b/Assets/Tilemap/Tiles/Rule Override Tile/Scripts/RuleOverrideTile.cs
@@ -6,7 +6,7 @@
 namespace UnityEngine
 {
 	[Serializable]
-	[CreateAssetMenu]
+	[CreateAssetMenu(fileName = "New Rule Override Tile", menuName = "Tiles/Rule Override Tile")]
 	public class RuleOverrideTile : TileBase
 	{
 		[Serializable]
diff --git a/Assets/Tilemap/Tiles/Rule Tile/Scripts/Editor/RuleTileEditor.cs b/Assets/Tilemap/Tiles/Rule Tile/Scripts/Editor/RuleTileEditor.cs
@@ -360,7 +360,7 @@ private static void PasteRules(MenuCommand item)
 				EditorJsonUtility.FromJsonOverwrite(EditorGUIUtility.systemCopyBuffer, rulesWrapper);
 				tile.m_TilingRules.AddRange(rulesWrapper.rules);
 			}
-			catch (Exception e)
+			catch (Exception)
 			{
 				Debug.LogError("Unable to paste rules from system copy buffer");
 			}
diff --git a/Assets/Tilemap/Tiles/Rule Tile/Scripts/RuleTile.cs b/Assets/Tilemap/Tiles/Rule Tile/Scripts/RuleTile.cs
@@ -9,7 +9,7 @@ public class RuleTile<T> : RuleTile
 		public sealed override Type m_NeighborType { get { return typeof(T); } }
 	}
 	[Serializable]
-	[CreateAssetMenu]
+	[CreateAssetMenu(fileName = "New Rule Tile", menuName = "Tiles/Rule Tile")]
 	public class RuleTile : TileBase
 	{
 #if UNITY_EDITOR
diff --git a/Assets/Tilemap/Tiles/Terrain Tile/Scripts/TerrainTile.cs b/Assets/Tilemap/Tiles/Terrain Tile/Scripts/TerrainTile.cs
@@ -12,6 +12,7 @@
 namespace UnityEngine.Tilemaps
 {
 	[Serializable]
+	[CreateAssetMenu(fileName = "New Terrain Tile", menuName = "Tiles/Terrain Tile")]
 	public class TerrainTile : TileBase
 	{
 		[SerializeField]
@@ -167,19 +168,6 @@ private Matrix4x4 GetTransform(byte mask)
 			}
 			return Matrix4x4.identity;
 		}
-
-#if UNITY_EDITOR
-		[MenuItem("Assets/Create/Terrain Tile")]
-		public static void CreateTerrainTile()
-		{
-			string path = EditorUtility.SaveFilePanelInProject("Save Terrain Tile", "New Terrain Tile", "asset", "Save Terrain Tile", "Assets");
-
-			if (path == "")
-				return;
-
-			AssetDatabase.CreateAsset(ScriptableObject.CreateInstance<TerrainTile>(), path);
-		}
-#endif
 	}
 
 #if UNITY_EDITOR
diff --git a/Assets/Tilemap/Tiles/Weighted Random Tile/WeightedRandomTile.cs b/Assets/Tilemap/Tiles/Weighted Random Tile/WeightedRandomTile.cs
@@ -12,6 +12,7 @@ public struct WeightedSprite {
     }
 
     [Serializable]
+    [CreateAssetMenu(fileName = "New Weighted Random Tile", menuName = "Tiles/Weighted Random Tile")]
     public class WeightedRandomTile : Tile {
         [SerializeField] public WeightedSprite[] Sprites;
 
@@ -42,18 +43,6 @@ public override void GetTileData(Vector3Int location, ITilemap tileMap, ref Tile
                 }
             }
         }
-
-#if UNITY_EDITOR
-        [MenuItem("Assets/Create/Weighted Random Tile")]
-        public static void CreateRandomTile() {
-            string path = EditorUtility.SaveFilePanelInProject("Save Weighted Random Tile", "New Weighted Random Tile", "asset",
-                "Save Weighted Random Tile", "Assets");
-
-            if (path == "") return;
-
-            AssetDatabase.CreateAsset(CreateInstance<WeightedRandomTile>(), path);
-        }
-#endif
     }
 
 #if UNITY_EDITOR

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`namespace UnityEditor`
`9`	`9`	`{`
`10`	`10`	`[CustomGridBrush(true, false, false, "Line Brush")]`
	`11`	`+ [CreateAssetMenu(fileName = "New Line Brush", menuName = "Brushes/Line Brush")]`
`11`	`12`	`public class LineBrush : GridBrush`
`12`	`13`	`{`
`13`	`14`	`public bool lineStartActive = false;`
`@@ -39,17 +40,6 @@ public override void Paint(GridLayout grid, GameObject brushTarget, Vector3Int p`
`39`	`40`	`}`
`40`	`41`	`}`
`41`	`42`
`42`		`- [MenuItem("Assets/Create/Line Brush")]`
`43`		`- public static void CreateBrush()`
`44`		`- {`
`45`		`- string path = EditorUtility.SaveFilePanelInProject("Save Line Brush", "New Line Brush", "asset", "Save Line Brush", "Assets");`
`46`		`-`
`47`		`- if (path == "")`
`48`		`- return;`
`49`		`-`
`50`		`- AssetDatabase.CreateAsset(ScriptableObject.CreateInstance<LineBrush>(), path);`
`51`		`- }`
`52`		`-`
`53`	`43`	`/// <summary>`
`54`	`44`	`/// Added option to fill gaps for continuous lines.`
`55`	`45`	`/// </summary>`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace UnityEditor`
`7`	`7`	`{`
`8`		`- [CreateAssetMenu]`
	`8`	`+ [CreateAssetMenu(fileName = "Prefab brush", menuName = "Brushes/Prefab brush")]`
`9`	`9`	`[CustomGridBrush(false, true, false, "Prefab Brush")]`
`10`	`10`	`public class PrefabBrush : GridBrushBase`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`namespace UnityEditor`
`8`	`8`	`{`
`9`	`9`	`[CustomGridBrush(false, true, false, "Random Brush")]`
	`10`	`+ [CreateAssetMenu(fileName = "New Random Brush", menuName = "Brushes/Random Brush")]`
`10`	`11`	`public class RandomBrush : GridBrush`
`11`	`12`	`{`
`12`	`13`	`public TileBase[] randomTiles;`
`@@ -35,17 +36,6 @@ public override void Paint(GridLayout grid, GameObject brushTarget, Vector3Int p`
`35`	`36`	`base.Paint(grid, brushTarget, position);`
`36`	`37`	`}`
`37`	`38`	`}`
`38`		`-`
`39`		`- [MenuItem("Assets/Create/Random Brush")]`
`40`		`- public static void CreateBrush()`
`41`		`- {`
`42`		`- string path = EditorUtility.SaveFilePanelInProject("Save Random Brush", "New Random Brush", "asset", "Save Random Brush", "Assets");`
`43`		`-`
`44`		`- if (path == "")`
`45`		`- return;`
`46`		`-`
`47`		`- AssetDatabase.CreateAsset(ScriptableObject.CreateInstance<RandomBrush>(), path);`
`48`		`- }`
`49`	`39`	`}`
`50`	`40`
`51`	`41`	`[CustomEditor(typeof(RandomBrush))]`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`namespace UnityEngine.Tilemaps`
`12`	`12`	`{`
`13`	`13`	`[Serializable]`
	`14`	`+ [CreateAssetMenu(fileName = "New Animated Tile", menuName = "Tiles/Animated Tile")]`
`14`	`15`	`public class AnimatedTile : TileBase`
`15`	`16`	`{`
`16`	`17`	`public Sprite[] m_AnimatedSprites;`
`@@ -41,18 +42,6 @@ public override bool GetTileAnimationData(Vector3Int location, ITilemap tileMap,`
`41`	`42`	`}`
`42`	`43`	`return false;`
`43`	`44`	`}`
`44`		`-`
`45`		`-#if UNITY_EDITOR`
`46`		`- [MenuItem("Assets/Create/Animated Tile")]`
`47`		`- public static void CreateAnimatedTile()`
`48`		`- {`
`49`		`- string path = EditorUtility.SaveFilePanelInProject("Save Animated Tile", "New Animated Tile", "asset", "Save Animated Tile", "Assets");`
`50`		`- if (path == "")`
`51`		`- return;`
`52`		`-`
`53`		`- AssetDatabase.CreateAsset(ScriptableObject.CreateInstance<AnimatedTile>(), path);`
`54`		`- }`
`55`		`-#endif`
`56`	`45`	`}`
`57`	`46`
`58`	`47`	`#if UNITY_EDITOR`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`namespace UnityEngine`
`7`	`7`	`{`
`8`	`8`	`[Serializable]`
`9`		`- [CreateAssetMenu]`
	`9`	`+ [CreateAssetMenu(fileName = "New Rule Override Tile", menuName = "Tiles/Rule Override Tile")]`
`10`	`10`	`public class RuleOverrideTile : TileBase`
`11`	`11`	`{`
`12`	`12`	`[Serializable]`
Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ private static void PasteRules(MenuCommand item)`
`360`	`360`	`EditorJsonUtility.FromJsonOverwrite(EditorGUIUtility.systemCopyBuffer, rulesWrapper);`
`361`	`361`	`tile.m_TilingRules.AddRange(rulesWrapper.rules);`
`362`	`362`	`}`
`363`		`- catch (Exception e)`
	`363`	`+ catch (Exception)`
`364`	`364`	`{`
`365`	`365`	`Debug.LogError("Unable to paste rules from system copy buffer");`
`366`	`366`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public class RuleTile<T> : RuleTile`
`9`	`9`	`public sealed override Type m_NeighborType { get { return typeof(T); } }`
`10`	`10`	`}`
`11`	`11`	`[Serializable]`
`12`		`- [CreateAssetMenu]`
	`12`	`+ [CreateAssetMenu(fileName = "New Rule Tile", menuName = "Tiles/Rule Tile")]`
`13`	`13`	`public class RuleTile : TileBase`
`14`	`14`	`{`
`15`	`15`	`#if UNITY_EDITOR`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace UnityEngine.Tilemaps`
`13`	`13`	`{`
`14`	`14`	`[Serializable]`
	`15`	`+ [CreateAssetMenu(fileName = "New Terrain Tile", menuName = "Tiles/Terrain Tile")]`
`15`	`16`	`public class TerrainTile : TileBase`
`16`	`17`	`{`
`17`	`18`	`[SerializeField]`
`@@ -167,19 +168,6 @@ private Matrix4x4 GetTransform(byte mask)`
`167`	`168`	`}`
`168`	`169`	`return Matrix4x4.identity;`
`169`	`170`	`}`
`170`		`-`
`171`		`-#if UNITY_EDITOR`
`172`		`- [MenuItem("Assets/Create/Terrain Tile")]`
`173`		`- public static void CreateTerrainTile()`
`174`		`- {`
`175`		`- string path = EditorUtility.SaveFilePanelInProject("Save Terrain Tile", "New Terrain Tile", "asset", "Save Terrain Tile", "Assets");`
`176`		`-`
`177`		`- if (path == "")`
`178`		`- return;`
`179`		`-`
`180`		`- AssetDatabase.CreateAsset(ScriptableObject.CreateInstance<TerrainTile>(), path);`
`181`		`- }`
`182`		`-#endif`
`183`	`171`	`}`
`184`	`172`
`185`	`173`	`#if UNITY_EDITOR`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ public struct WeightedSprite {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`[Serializable]`
	`15`	`+ [CreateAssetMenu(fileName = "New Weighted Random Tile", menuName = "Tiles/Weighted Random Tile")]`
`15`	`16`	`public class WeightedRandomTile : Tile {`
`16`	`17`	`[SerializeField] public WeightedSprite[] Sprites;`
`17`	`18`
`@@ -42,18 +43,6 @@ public override void GetTileData(Vector3Int location, ITilemap tileMap, ref Tile`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`	`}`
`45`		`-`
`46`		`-#if UNITY_EDITOR`
`47`		`- [MenuItem("Assets/Create/Weighted Random Tile")]`
`48`		`- public static void CreateRandomTile() {`
`49`		`- string path = EditorUtility.SaveFilePanelInProject("Save Weighted Random Tile", "New Weighted Random Tile", "asset",`
`50`		`- "Save Weighted Random Tile", "Assets");`
`51`		`-`
`52`		`- if (path == "") return;`
`53`		`-`
`54`		`- AssetDatabase.CreateAsset(CreateInstance<WeightedRandomTile>(), path);`
`55`		`- }`
`56`		`-#endif`
`57`	`46`	`}`
`58`	`47`
`59`	`48`	`#if UNITY_EDITOR`