From 62769c3e7197da20668ce1bdbb38f807ed6391f7 Mon Sep 17 00:00:00 2001 From: pharan Date: Thu, 18 Oct 2018 21:34:36 +0800 Subject: [PATCH] [unity] Cleanup old renaming. --- .../Editor/SkeletonUtilityBoneInspector.cs | 6 ++-- .../Editor/SkeletonUtilityInspector.cs | 32 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs index e1b798f52..4f339a7e2 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs @@ -258,12 +258,12 @@ namespace Spine.Unity.Editor { GameObject go = skeletonUtility.SpawnBoneRecursively(bone, utilityBone.transform, utilityBone.mode, utilityBone.position, utilityBone.rotation, utilityBone.scale); SkeletonUtilityBone[] newUtilityBones = go.GetComponentsInChildren(); foreach (SkeletonUtilityBone utilBone in newUtilityBones) - SkeletonGameObjectsInspector.AttachIcon(utilBone); + SkeletonUtilityInspector.AttachIcon(utilBone); } } else { var bone = (Bone)obj; GameObject go = skeletonUtility.SpawnBone(bone, utilityBone.transform, utilityBone.mode, utilityBone.position, utilityBone.rotation, utilityBone.scale); - SkeletonGameObjectsInspector.AttachIcon(go.GetComponent()); + SkeletonUtilityInspector.AttachIcon(go.GetComponent()); Selection.activeGameObject = go; EditorGUIUtility.PingObject(go); } @@ -272,7 +272,7 @@ namespace Spine.Unity.Editor { void SpawnOverride () { GameObject go = skeletonUtility.SpawnBone(utilityBone.bone, utilityBone.transform.parent, SkeletonUtilityBone.Mode.Override, utilityBone.position, utilityBone.rotation, utilityBone.scale); go.name = go.name + " [Override]"; - SkeletonGameObjectsInspector.AttachIcon(go.GetComponent()); + SkeletonUtilityInspector.AttachIcon(go.GetComponent()); Selection.activeGameObject = go; EditorGUIUtility.PingObject(go); } diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/SkeletonUtility/Editor/SkeletonUtilityInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/SkeletonUtility/Editor/SkeletonUtilityInspector.cs index 4ccc85a6e..5734a7a7c 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/SkeletonUtility/Editor/SkeletonUtilityInspector.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/SkeletonUtility/Editor/SkeletonUtilityInspector.cs @@ -41,17 +41,17 @@ namespace Spine.Unity.Editor { using Icons = SpineEditorUtilities.Icons; [CustomEditor(typeof(SkeletonUtility))] - public class SkeletonGameObjectsInspector : UnityEditor.Editor { + public class SkeletonUtilityInspector : UnityEditor.Editor { - SkeletonUtility skeletonGameObjects; + SkeletonUtility skeletonUtility; Skeleton skeleton; SkeletonRenderer skeletonRenderer; bool isPrefab; readonly GUIContent SpawnHierarchyButtonLabel = new GUIContent("Spawn Hierarchy", Icons.skeleton); void OnEnable () { - skeletonGameObjects = (SkeletonUtility)target; - skeletonRenderer = skeletonGameObjects.GetComponent(); + skeletonUtility = (SkeletonUtility)target; + skeletonRenderer = skeletonUtility.GetComponent(); skeleton = skeletonRenderer.Skeleton; if (skeleton == null) { @@ -78,7 +78,7 @@ namespace Spine.Unity.Editor { EditorGUILayout.PropertyField(serializedObject.FindProperty("boneRoot"), SpineInspectorUtility.TempContent("Skeleton Root")); - bool hasRootBone = skeletonGameObjects.boneRoot != null; + bool hasRootBone = skeletonUtility.boneRoot != null; if (!hasRootBone) EditorGUILayout.HelpBox("No hierarchy found. Use Spawn Hierarchy to generate GameObjects for bones.", MessageType.Info); @@ -90,9 +90,9 @@ namespace Spine.Unity.Editor { if (hasRootBone) { if (SpineInspectorUtility.CenteredButton(new GUIContent("Remove Hierarchy"))) { - Undo.RegisterCompleteObjectUndo(skeletonGameObjects, "Remove Hierarchy"); - Undo.DestroyObjectImmediate(skeletonGameObjects.boneRoot.gameObject); - skeletonGameObjects.boneRoot = null; + Undo.RegisterCompleteObjectUndo(skeletonUtility, "Remove Hierarchy"); + Undo.DestroyObjectImmediate(skeletonUtility.boneRoot.gameObject); + skeletonUtility.boneRoot = null; } } } @@ -134,23 +134,23 @@ namespace Spine.Unity.Editor { } void SpawnFollowHierarchy () { - Selection.activeGameObject = skeletonGameObjects.SpawnHierarchy(SkeletonUtilityBone.Mode.Follow, true, true, true); - AttachIconsToChildren(skeletonGameObjects.boneRoot); + Selection.activeGameObject = skeletonUtility.SpawnHierarchy(SkeletonUtilityBone.Mode.Follow, true, true, true); + AttachIconsToChildren(skeletonUtility.boneRoot); } void SpawnFollowHierarchyRootOnly () { - Selection.activeGameObject = skeletonGameObjects.SpawnRoot(SkeletonUtilityBone.Mode.Follow, true, true, true); - AttachIconsToChildren(skeletonGameObjects.boneRoot); + Selection.activeGameObject = skeletonUtility.SpawnRoot(SkeletonUtilityBone.Mode.Follow, true, true, true); + AttachIconsToChildren(skeletonUtility.boneRoot); } void SpawnOverrideHierarchy () { - Selection.activeGameObject = skeletonGameObjects.SpawnHierarchy(SkeletonUtilityBone.Mode.Override, true, true, true); - AttachIconsToChildren(skeletonGameObjects.boneRoot); + Selection.activeGameObject = skeletonUtility.SpawnHierarchy(SkeletonUtilityBone.Mode.Override, true, true, true); + AttachIconsToChildren(skeletonUtility.boneRoot); } void SpawnOverrideHierarchyRootOnly () { - Selection.activeGameObject = skeletonGameObjects.SpawnRoot(SkeletonUtilityBone.Mode.Override, true, true, true); - AttachIconsToChildren(skeletonGameObjects.boneRoot); + Selection.activeGameObject = skeletonUtility.SpawnRoot(SkeletonUtilityBone.Mode.Override, true, true, true); + AttachIconsToChildren(skeletonUtility.boneRoot); } }