From 9eba3e1bbd83b485cc227fb3887856c9e5f827b6 Mon Sep 17 00:00:00 2001 From: pharan Date: Mon, 1 Oct 2018 21:57:32 +0800 Subject: [PATCH] [unity] Move instantiation code. --- .../Spine/Editor/spine-unity/Editor/Menus.cs | 15 ++------------- .../spine-unity/Editor/SpineEditorUtilities.cs | 11 +++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Menus.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Menus.cs index 8859fecb1..c3b90295d 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Menus.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Menus.cs @@ -37,23 +37,12 @@ namespace Spine.Unity.Editor { public static class Menus { [MenuItem("GameObject/Spine/SkeletonRenderer", false, 10)] static public void CreateSkeletonRendererGameObject () { - CreateSpineGameObject("New SkeletonRenderer"); + SpineEditorUtilities.EditorInstantiation.InstantiateEmptySpineGameObject("New SkeletonRenderer"); } [MenuItem("GameObject/Spine/SkeletonAnimation", false, 10)] static public void CreateSkeletonAnimationGameObject () { - CreateSpineGameObject("New SkeletonAnimation"); - } - - static void CreateSpineGameObject (string name) where T : MonoBehaviour { - var parentGameObject = Selection.activeObject as GameObject; - var parentTransform = parentGameObject == null ? null : parentGameObject.transform; - - var gameObject = new GameObject(name, typeof(T)); - gameObject.transform.SetParent(parentTransform, false); - EditorUtility.FocusProjectWindow(); - Selection.activeObject = gameObject; - EditorGUIUtility.PingObject(Selection.activeObject); + SpineEditorUtilities.EditorInstantiation.InstantiateEmptySpineGameObject("New SkeletonAnimation"); } } } diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs index 7f8bf5a31..b6648ec2a 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs @@ -1227,6 +1227,17 @@ namespace Spine.Unity.Editor { return newSkeletonAnimation; } + public static void InstantiateEmptySpineGameObject (string name) where T : MonoBehaviour { + var parentGameObject = Selection.activeObject as GameObject; + var parentTransform = parentGameObject == null ? null : parentGameObject.transform; + + var gameObject = new GameObject(name, typeof(T)); + gameObject.transform.SetParent(parentTransform, false); + EditorUtility.FocusProjectWindow(); + Selection.activeObject = gameObject; + EditorGUIUtility.PingObject(Selection.activeObject); + } + #region SkeletonMecanim #if SPINE_SKELETONMECANIM public static SkeletonMecanim InstantiateSkeletonMecanim (SkeletonDataAsset skeletonDataAsset, string skinName) {