From 3d19e22064d43cb8201cd535ff14a93b68e6fddf Mon Sep 17 00:00:00 2001 From: pharan Date: Thu, 31 Dec 2015 11:58:04 +0800 Subject: [PATCH] [XNA] Fixed compatibility with spine-csharp --- spine-xna/src/SkeletonMeshRenderer.cs | 5 +++-- spine-xna/src/SkeletonRegionRenderer.cs | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/spine-xna/src/SkeletonMeshRenderer.cs b/spine-xna/src/SkeletonMeshRenderer.cs index bf60c2e0b..6d2047824 100644 --- a/spine-xna/src/SkeletonMeshRenderer.cs +++ b/spine-xna/src/SkeletonMeshRenderer.cs @@ -90,10 +90,11 @@ namespace Spine { public void Draw (Skeleton skeleton) { float[] vertices = this.vertices; - List drawOrder = skeleton.DrawOrder; + var drawOrder = skeleton.DrawOrder; + var drawOrderItems = skeleton.DrawOrder.Items; float skeletonR = skeleton.R, skeletonG = skeleton.G, skeletonB = skeleton.B, skeletonA = skeleton.A; for (int i = 0, n = drawOrder.Count; i < n; i++) { - Slot slot = drawOrder[i]; + Slot slot = drawOrderItems[i]; Attachment attachment = slot.Attachment; if (attachment is RegionAttachment) { RegionAttachment regionAttachment = (RegionAttachment)attachment; diff --git a/spine-xna/src/SkeletonRegionRenderer.cs b/spine-xna/src/SkeletonRegionRenderer.cs index 2189b01a3..c20c6b410 100644 --- a/spine-xna/src/SkeletonRegionRenderer.cs +++ b/spine-xna/src/SkeletonRegionRenderer.cs @@ -83,10 +83,11 @@ namespace Spine { } public void Draw (Skeleton skeleton) { - List drawOrder = skeleton.DrawOrder; + var drawOrder = skeleton.DrawOrder; + var drawOrderItems = skeleton.DrawOrder.Items; float skeletonR = skeleton.R, skeletonG = skeleton.G, skeletonB = skeleton.B, skeletonA = skeleton.A; for (int i = 0, n = drawOrder.Count; i < n; i++) { - Slot slot = drawOrder[i]; + Slot slot = drawOrderItems[i]; RegionAttachment regionAttachment = slot.Attachment as RegionAttachment; if (regionAttachment != null) { BlendState blend = slot.Data.BlendMode == BlendMode.additive ? BlendState.Additive : defaultBlendState;