UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-06 07:14:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Restored AtlasAsset inspector region list.

Browse Source
This commit is contained in:
John 2016-09-27 01:45:44 +08:00 committed by GitHub
parent 721de143d2
commit 9bb546c6d6
1 changed files with 59 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
spine-unity/Assets/spine-unity/Asset Types/Editor/AtlasAssetInspector.cs
View File

@ -56,6 +56,13 @@ namespace Spine.Unity.Editor {
UpdateBakedList();
#endif
}
private List<AtlasRegion> Regions {
get {
FieldInfo field = typeof(Atlas).GetField("regions", BindingFlags.Instance | BindingFlags.NonPublic);
return (List<AtlasRegion>)field.GetValue(atlasAsset.GetAtlas());
}
}
#if REGION_BAKING_MESH
private List<bool> baked;
@ -92,8 +99,7 @@ namespace Spine.Unity.Editor {
var spriteSheet = t.spritesheet;
var sprites = new List<SpriteMetaData>(spriteSheet);
FieldInfo field = typeof(Atlas).GetField("regions", BindingFlags.Instance | BindingFlags.NonPublic);
var regions = (List<AtlasRegion>)field.GetValue(atlas);
var regions = this.Regions;
int textureHeight = texture.height;
char[] FilenameDelimiter = {'.'};
int updatedCount = 0;
@ -168,20 +174,27 @@ namespace Spine.Unity.Editor {
}
}
EditorGUILayout.Space();
if (atlasFile.objectReferenceValue != null) {
if (GUILayout.Button(
new GUIContent(
"Apply Regions as Texture Sprite Slices",
"Adds Sprite slices to atlas texture(s). " +
"Updates existing slices if ones with matching names exist. \n\n" +
"If your atlas was exported with Premultiply Alpha, " +
"your SpriteRenderer should use the generated Spine _Material asset (or any Material with a PMA shader) instead of Sprites-Default.")
, GUILayout.Height(70f))) {
var atlas = atlasAsset.GetAtlas();
foreach (var m in atlasAsset.materials)
UpdateSpriteSlices(m.mainTexture, atlas);
using (new EditorGUILayout.HorizontalScope()) {
EditorGUILayout.Space();
if (GUILayout.Button(
new GUIContent(
"Apply Regions as Texture Sprite Slices",
SpineEditorUtilities.Icons.unityIcon,
"Adds Sprite slices to atlas texture(s). " +
"Updates existing slices if ones with matching names exist. \n\n" +
"If your atlas was exported with Premultiply Alpha, " +
"your SpriteRenderer should use the generated Spine _Material asset (or any Material with a PMA shader) instead of Sprites-Default.")
, GUILayout.Height(30f))) {
var atlas = atlasAsset.GetAtlas();
foreach (var m in atlasAsset.materials)
UpdateSpriteSlices(m.mainTexture, atlas);
}
EditorGUILayout.Space();
}
}
EditorGUILayout.Space();
#if REGION_BAKING_MESH
if (atlasFile.objectReferenceValue != null) {
@ -289,6 +302,39 @@ namespace Spine.Unity.Editor {
#endif
}
#else
if (atlasFile.objectReferenceValue != null) {
EditorGUILayout.LabelField("Atlas Regions", EditorStyles.boldLabel);
var regions = this.Regions;
AtlasPage lastPage = null;
for (int i = 0; i < regions.Count; i++) {
if (lastPage != regions[i].page) {
if (lastPage != null) {
EditorGUILayout.Separator();
EditorGUILayout.Separator();
}
lastPage = regions[i].page;
Material mat = ((Material)lastPage.rendererObject);
if (mat != null) {
GUILayout.BeginHorizontal();
{
EditorGUI.BeginDisabledGroup(true);
EditorGUILayout.ObjectField(mat, typeof(Material), false, GUILayout.Width(250));
EditorGUI.EndDisabledGroup();
EditorGUI.indentLevel++;
}
GUILayout.EndHorizontal();
} else {
EditorGUILayout.LabelField(new GUIContent("Page missing material!", SpineEditorUtilities.Icons.warning));
}
}
EditorGUILayout.LabelField(new GUIContent(regions[i].name, SpineEditorUtilities.Icons.image));
}
EditorGUI.indentLevel--;
}
#endif
if (serializedObject.ApplyModifiedProperties() ||