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

SkeletonRenderer optional custom material per slot.

Browse Source
This commit is contained in:
pharan 2016-03-04 03:05:11 +08:00
parent e1b709c1eb
commit 19ff671add
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spine-unity/Assets/spine-unity/SkeletonRenderer.cs
View File

@ -54,6 +54,10 @@ public class SkeletonRenderer : MonoBehaviour {
// Submesh Separation // Submesh Separation
[SpineSlot] public string[] submeshSeparators = new string[0]; [SpineSlot] public string[] submeshSeparators = new string[0];
[HideInInspector] public List<Slot> submeshSeparatorSlots = new List<Slot>(); [HideInInspector] public List<Slot> submeshSeparatorSlots = new List<Slot>();
// Custom Slot Material
[System.NonSerialized] private readonly Dictionary<Slot, Material> customSlotMaterials = new Dictionary<Slot, Material>();
public Dictionary<Slot, Material> CustomSlotMaterials { get { return customSlotMaterials; } }
#endregion #endregion
[System.NonSerialized] public bool valid; [System.NonSerialized] public bool valid;
@ -207,6 +211,8 @@ public class SkeletonRenderer : MonoBehaviour {
drawOrder.Count != storedAttachments.Count || // Number of slots changed (when does this happen?) drawOrder.Count != storedAttachments.Count || // Number of slots changed (when does this happen?)
immutableTriangles != storedState.immutableTriangles; // Immutable Triangles flag changed. immutableTriangles != storedState.immutableTriangles; // Immutable Triangles flag changed.
bool isCustomMaterialsPopulated = customSlotMaterials.Count > 0;
for (int i = 0; i < drawOrderCount; i++) { for (int i = 0; i < drawOrderCount; i++) {
Slot slot = drawOrderItems[i]; Slot slot = drawOrderItems[i];
Bone bone = slot.bone; Bone bone = slot.bone;
@ -252,13 +258,22 @@ public class SkeletonRenderer : MonoBehaviour {
} }
#if !SPINE_TK2D #if !SPINE_TK2D
Material material = (Material)((AtlasRegion)rendererObject).page.rendererObject; // Material material = (Material)((AtlasRegion)rendererObject).page.rendererObject; // For no customSlotMaterials
Material material;
if (isCustomMaterialsPopulated) {
if (!customSlotMaterials.TryGetValue(slot, out material)) {
material = (Material)((AtlasRegion)rendererObject).page.rendererObject;
}
} else {
material = (Material)((AtlasRegion)rendererObject).page.rendererObject;
}
#else #else
Material material = (rendererObject.GetType() == typeof(Material)) ? (Material)rendererObject : (Material)((AtlasRegion)rendererObject).page.rendererObject; Material material = (rendererObject.GetType() == typeof(Material)) ? (Material)rendererObject : (Material)((AtlasRegion)rendererObject).page.rendererObject;
#endif #endif
// Populate submesh when material changes. (or when forced to separate by a submeshSeparator) // Populate submesh when material changes. (or when forced to separate by a submeshSeparator)
if ((lastMaterial != null && lastMaterial.GetInstanceID() != material.GetInstanceID()) || if ((vertexCount > 0 && lastMaterial.GetInstanceID() != material.GetInstanceID()) ||
(submeshSeparatorSlotsCount > 0 && submeshSeparatorSlots.Contains(slot))) { (submeshSeparatorSlotsCount > 0 && submeshSeparatorSlots.Contains(slot))) {
workingSubmeshArguments.Add( workingSubmeshArguments.Add(