Spine.Unity namespace and some editor tweaks.

spine-unity/Assets/spine-unity/Asset Types/Editor/AtlasAssetInspector.cs

@@ -28,17 +28,17 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
+//#define BAKE_ALL_BUTTON
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using System.IO;
 using UnityEditor;
 using UnityEngine;
 using Spine;
 
+namespace Spine.Unity {
 	
 	[CustomEditor(typeof(AtlasAsset))]
 	public class AtlasAssetInspector : Editor {
@@ -78,8 +78,6 @@ public class AtlasAssetInspector : Editor {
 			}
 		}
 
-
-
 		override public void OnInspectorGUI () {
 			serializedObject.Update();
 			AtlasAsset asset = (AtlasAsset)target;
@@ -166,6 +164,48 @@ public class AtlasAssetInspector : Editor {
 					GUILayout.EndHorizontal();
 				}
 				EditorGUI.indentLevel--;
+
+				#if BAKE_ALL_BUTTON
+				// Check state
+				bool allBaked = true;
+				bool allUnbaked = true;
+				for (int i = 0; i < regions.Count; i++) {
+					allBaked &= baked[i];
+					allUnbaked &= !baked[i];
+				}
+
+				if (!allBaked && GUILayout.Button("Bake All")) {
+					for (int i = 0; i < regions.Count; i++) {
+						if (!baked[i]) {
+							baked[i] = true;
+							bakedObjects[i] = SpineEditorUtilities.BakeRegion(atlasAsset, regions[i]);
+						}
+					}
+
+				} else if (!allUnbaked && GUILayout.Button("Unbake All")) {
+					bool unbakeResult = EditorUtility.DisplayDialog("Delete All Baked Regions", "Are you sure you want to unbake all region prefabs? This cannot be undone.", "Yes", "Cancel");
+					switch (unbakeResult) {
+					case true:
+						//delete
+						for (int i = 0; i < regions.Count; i++) {
+							if (baked[i]) {
+								string atlasAssetPath = AssetDatabase.GetAssetPath(atlasAsset);
+								string atlasAssetDirPath = Path.GetDirectoryName(atlasAssetPath);
+								string bakedDirPath = Path.Combine(atlasAssetDirPath, atlasAsset.name);
+								string bakedPrefabPath = Path.Combine(bakedDirPath, SpineEditorUtilities.GetPathSafeRegionName(regions[i]) + ".prefab").Replace("\\", "/");
+								AssetDatabase.DeleteAsset(bakedPrefabPath);
+								baked[i] = false;
+							}
+						}
+						break;
+					case false:
+						//do nothing
+						break;
+					}
+
+				}
+				#endif
+
 			}
 
 			if (serializedObject.ApplyModifiedProperties() ||
@@ -175,3 +215,5 @@ public class AtlasAssetInspector : Editor {
 			}
 		}
 	}
+
+}

spine-unity/Assets/spine-unity/Asset Types/Editor/SkeletonDataAssetInspector.cs

@@ -14,6 +14,7 @@ using UnityEditor.AnimatedValues;
 using UnityEngine;
 using Spine;
 
+namespace Spine.Unity {
 	[CustomEditor(typeof(SkeletonDataAsset))]
 	public class SkeletonDataAssetInspector : Editor {
 		static bool showAnimationStateData = true;
@@ -975,3 +976,5 @@ public class SkeletonDataAssetInspector : Editor {
 			return tex;
 		}
 	}
+		
+}

spine-unity/Assets/spine-unity/Editor/Menus.cs

@@ -28,14 +28,13 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
-
 using System;
 using System.IO;
 using UnityEditor;
 using UnityEngine;
-using Spine;
 
-public class Menus {
+namespace Spine.Unity {
+	public static class Menus {
 		[MenuItem("Assets/Create/Spine Atlas")]
 		static public void CreateAtlas () {
 			CreateAsset<AtlasAsset>("New Atlas");
@@ -82,3 +81,4 @@ public class Menus {
 			EditorGUIUtility.PingObject(Selection.activeObject);
 		}
 	}
+}

spine-unity/Assets/spine-unity/Editor/SkeletonAnimationInspector.cs

@@ -28,12 +28,13 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
-
 using System;
 using UnityEditor;
 using UnityEngine;
 using Spine;
 
+namespace Spine.Unity {
+	
 	[CustomEditor(typeof(SkeletonAnimation))]
 	public class SkeletonAnimationInspector : SkeletonRendererInspector {
 		protected SerializedProperty animationName, loop, timeScale, autoReset;
@@ -110,3 +111,4 @@ public class SkeletonAnimationInspector : SkeletonRendererInspector {
 			}
 		}
 	}
+}

spine-unity/Assets/spine-unity/Editor/SkeletonAnimatorInspector.cs

@@ -1,5 +1,3 @@
-
-
 /*****************************************************************************
  * SkeletonAnimatorInspector created by Mitch Thompson
  * Full irrevocable rights and permissions granted to Esoteric Software
@@ -7,8 +5,8 @@
 using System;
 using UnityEditor;
 using UnityEngine;
-using Spine;
 
+namespace Spine.Unity {
 	[CustomEditor(typeof(SkeletonAnimator))]
 	public class SkeletonAnimatorInspector : SkeletonRendererInspector {
 		protected SerializedProperty layerMixModes;
@@ -41,3 +39,4 @@ public class SkeletonAnimatorInspector : SkeletonRendererInspector {
 			}
 		}
 	}
+}

spine-unity/Assets/spine-unity/Editor/SkeletonRendererInspector.cs

@@ -33,6 +33,8 @@ using System;
 using UnityEditor;
 using UnityEngine;
 
+namespace Spine.Unity {
+	
 	[CustomEditor(typeof(SkeletonRenderer))]
 	public class SkeletonRendererInspector : Editor {
 		protected static bool advancedFoldout;
@@ -140,7 +142,7 @@ public class SkeletonRendererInspector : Editor {
 			serializedObject.Update();
 			DrawInspectorGUI();
 			if (serializedObject.ApplyModifiedProperties() ||
-			(Event.current.type == EventType.ValidateCommand && Event.current.commandName == "UndoRedoPerformed")
+				(UnityEngine.Event.current.type == EventType.ValidateCommand && UnityEngine.Event.current.commandName == "UndoRedoPerformed")
 			) {
 				if (!Application.isPlaying)
 					((SkeletonRenderer)target).Initialize(true);
@@ -148,3 +150,4 @@ public class SkeletonRendererInspector : Editor {
 		}
 
 	}
+}

spine-unity/Assets/spine-unity/Editor/SpineInspectorUtility.cs

@@ -34,6 +34,7 @@ using System.Collections;
 using UnityEditor;
 using System.Reflection;
 
+namespace Spine.Unity {
 	public static class SpineInspectorUtility {
 
 		#region Sorting Layer Field Helpers
@@ -90,3 +91,5 @@ public static class SpineInspectorUtility {
 		}
 		#endregion
 	}
+
+}

spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/Editor/SkeletonGraphicInspector.cs

@@ -149,7 +149,7 @@ namespace Spine.Unity {
 			EditorGUIUtility.PingObject(Selection.activeObject);
 		}
 
-		[MenuItem("Assets/Spine/Instantiate (UnityUI)", false, 0)]
+		[MenuItem("Assets/Spine/Instantiate (UnityUI)", false, 10)]
 		static void InstantiateSkeletonGraphic () {
 			Object[] arr = Selection.objects;
 			foreach (Object o in arr) {
@@ -161,7 +161,7 @@ namespace Spine.Unity {
 			}
 		}
 
-		[MenuItem("Assets/Spine/Instantiate (UnityUI)", true, 0)]
+		[MenuItem("Assets/Spine/Instantiate (UnityUI)", true, 10)]
 		static bool ValidateInstantiateSkeletonGraphic () {
 			Object[] arr = Selection.objects;
 

spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs

@@ -212,7 +212,7 @@ namespace Spine.Unity {
 					spineMeshGenerator.Scale = canvas.referencePixelsPerUnit; // TODO: move this to a listener to of the canvas?
 
 				canvasRenderer.SetMesh(spineMeshGenerator.GenerateMesh(skeleton));
-				this.UpdateMaterial();
+				//this.UpdateMaterial(); // TODO: This allocates memory.
 			}
 		}
 		#endregion