UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #374 from pharan/sortinglayerinspector

Browse Source 
Added Sorting Layers GUI to SkeletonRenderer and SkeletonAnimation
This commit is contained in:
Fenrisul 2015-03-08 15:52:53 -07:00
commit 8544125ead
2 changed files with 57 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spine-unity/Assets/spine-unity/Editor/SkeletonAnimationInspector.cs
View File

@ -66,6 +66,7 @@ public class SkeletonAnimationInspector : SkeletonRendererInspector {
} }
} }
EditorGUILayout.Space();
//TODO: Refactor this to use GenericMenu and callbacks to avoid interfering with control by other behaviours. //TODO: Refactor this to use GenericMenu and callbacks to avoid interfering with control by other behaviours.
// Animation name. // Animation name.
@ -80,10 +81,7 @@ public class SkeletonAnimationInspector : SkeletonRendererInspector {
animationIndex = i + 1; animationIndex = i + 1;
} }
EditorGUILayout.BeginHorizontal(); animationIndex = EditorGUILayout.Popup("Animation", animationIndex, animations);
EditorGUILayout.LabelField("Animation", GUILayout.Width(EditorGUIUtility.labelWidth));
animationIndex = EditorGUILayout.Popup(animationIndex, animations);
EditorGUILayout.EndHorizontal();
String selectedAnimationName = animationIndex == 0 ? null : animations[animationIndex]; String selectedAnimationName = animationIndex == 0 ? null : animations[animationIndex];
if (component.AnimationName != selectedAnimationName) { if (component.AnimationName != selectedAnimationName) {

66
spine-unity/Assets/spine-unity/Editor/SkeletonRendererInspector.cs
View File

@ -28,12 +28,18 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*****************************************************************************/ *****************************************************************************/
using System; using System;
using System.Reflection;
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
[CustomEditor(typeof(SkeletonRenderer))] [CustomEditor(typeof(SkeletonRenderer))]
public class SkeletonRendererInspector : Editor { public class SkeletonRendererInspector : Editor {
protected SerializedProperty skeletonDataAsset, initialSkinName, normals, tangents, meshes, immutableTriangles, submeshSeparators, front; protected SerializedProperty skeletonDataAsset, initialSkinName, normals, tangents, meshes, immutableTriangles, submeshSeparators, front;
protected bool advancedFoldout;
private static MethodInfo EditorGUILayoutSortingLayerField;
protected SerializedObject rendererSerializedObject;
protected SerializedProperty sortingLayerIDProperty;
protected virtual void OnEnable () { protected virtual void OnEnable () {
SpineEditorUtilities.ConfirmInitialization(); SpineEditorUtilities.ConfirmInitialization();
@ -45,6 +51,12 @@ public class SkeletonRendererInspector : Editor {
immutableTriangles = serializedObject.FindProperty("immutableTriangles"); immutableTriangles = serializedObject.FindProperty("immutableTriangles");
submeshSeparators = serializedObject.FindProperty("submeshSeparators"); submeshSeparators = serializedObject.FindProperty("submeshSeparators");
front = serializedObject.FindProperty("frontFacing"); front = serializedObject.FindProperty("frontFacing");
if(EditorGUILayoutSortingLayerField == null)
EditorGUILayoutSortingLayerField = typeof(EditorGUILayout).GetMethod("SortingLayerField", BindingFlags.Static | BindingFlags.NonPublic, null, new Type[] { typeof(GUIContent), typeof(SerializedProperty), typeof(GUIStyle) }, null);
rendererSerializedObject = new SerializedObject(((SkeletonRenderer)target).GetComponent<Renderer>());
sortingLayerIDProperty = rendererSerializedObject.FindProperty("m_SortingLayerID");
} }
protected virtual void gui () { protected virtual void gui () {
@ -84,22 +96,49 @@ public class SkeletonRendererInspector : Editor {
skinIndex = i; skinIndex = i;
} }
EditorGUILayout.BeginHorizontal(); skinIndex = EditorGUILayout.Popup("Initial Skin", skinIndex, skins);
EditorGUILayout.LabelField("Initial Skin", GUILayout.Width(EditorGUIUtility.labelWidth));
skinIndex = EditorGUILayout.Popup(skinIndex, skins);
EditorGUILayout.EndHorizontal();
initialSkinName.stringValue = skins[skinIndex]; initialSkinName.stringValue = skins[skinIndex];
} }
EditorGUILayout.PropertyField(meshes, EditorGUILayout.Space();
new GUIContent("Render Meshes", "Disable to optimize rendering for skeletons that don't use meshes"));
EditorGUILayout.PropertyField(immutableTriangles, // Sorting Layers
new GUIContent("Immutable Triangles", "Enable to optimize rendering for skeletons that never change attachment visbility")); {
EditorGUILayout.PropertyField(normals); var renderer = component.GetComponent<Renderer>();
EditorGUILayout.PropertyField(tangents); if(renderer != null) {
EditorGUILayout.PropertyField(front); EditorGUI.BeginChangeCheck();
EditorGUILayout.PropertyField(submeshSeparators, true);
if(EditorGUILayoutSortingLayerField != null && sortingLayerIDProperty != null) {
EditorGUILayoutSortingLayerField.Invoke(null, new object[] { new GUIContent("Sorting Layer"), sortingLayerIDProperty, EditorStyles.popup } );
} else {
renderer.sortingLayerID = EditorGUILayout.IntField("Sorting Layer ID", renderer.sortingLayerID);
}
renderer.sortingOrder = EditorGUILayout.IntField("Order in Layer", renderer.sortingOrder);
if(EditorGUI.EndChangeCheck()) {
rendererSerializedObject.ApplyModifiedProperties();
EditorUtility.SetDirty(renderer);
}
}
}
// More Render Options...
{
advancedFoldout = EditorGUILayout.Foldout(advancedFoldout, "Advanced");
if(advancedFoldout) {
EditorGUI.indentLevel++;
EditorGUILayout.PropertyField(meshes,
new GUIContent("Render Meshes", "Disable to optimize rendering for skeletons that don't use meshes"));
EditorGUILayout.PropertyField(immutableTriangles,
new GUIContent("Immutable Triangles", "Enable to optimize rendering for skeletons that never change attachment visbility"));
EditorGUILayout.PropertyField(normals);
EditorGUILayout.PropertyField(tangents);
EditorGUILayout.PropertyField(front);
EditorGUILayout.PropertyField(submeshSeparators, true);
EditorGUI.indentLevel--;
}
}
} }
override public void OnInspectorGUI () { override public void OnInspectorGUI () {
@ -112,4 +151,5 @@ public class SkeletonRendererInspector : Editor {
((SkeletonRenderer)target).Reset(); ((SkeletonRenderer)target).Reset();
} }
} }
} }