From fcf90be386624775941c759dce2b28a842789c8e Mon Sep 17 00:00:00 2001 From: Fenrisul Date: Fri, 13 Mar 2015 20:24:30 -0700 Subject: [PATCH] Return Attachment after adding from Sprite. Misc clean up --- .../Assets/spine-unity/SkeletonExtensions.cs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/spine-unity/Assets/spine-unity/SkeletonExtensions.cs b/spine-unity/Assets/spine-unity/SkeletonExtensions.cs index 403497517..e073bcca4 100644 --- a/spine-unity/Assets/spine-unity/SkeletonExtensions.cs +++ b/spine-unity/Assets/spine-unity/SkeletonExtensions.cs @@ -105,28 +105,24 @@ public static class SkeletonExtensions { bone.Y = position.y; } - public static void AttachUnitySprite (this Skeleton skeleton, string slotName, Sprite sprite, string shaderName = "Spine/Skeleton") { - var loader = new SpriteAttachmentLoader(sprite, Shader.Find(shaderName)); - - var att = loader.NewRegionAttachment(null, sprite.name, ""); + public static Attachment AttachUnitySprite (this Skeleton skeleton, string slotName, Sprite sprite, string shaderName = "Spine/Skeleton") { + var att = sprite.ToRegionAttachment(shaderName); skeleton.FindSlot(slotName).Attachment = att; - loader = null; + return att; } - public static void AddUnitySprite (this SkeletonData skeletonData, string slotName, Sprite sprite, string skinName = "", string shaderName = "Spine/Skeleton") { - var loader = new SpriteAttachmentLoader(sprite, Shader.Find(shaderName)); - var att = loader.NewRegionAttachment(null, sprite.name, ""); + public static Attachment AddUnitySprite (this SkeletonData skeletonData, string slotName, Sprite sprite, string skinName = "", string shaderName = "Spine/Skeleton") { + var att = sprite.ToRegionAttachment(shaderName); var slotIndex = skeletonData.FindSlotIndex(slotName); Skin skin = skeletonData.defaultSkin; if (skinName != "") skin = skeletonData.FindSkin(skinName); - skin.AddAttachment(slotIndex, att.Name, att); - loader = null; + return att; } public static RegionAttachment ToRegionAttachment (this Sprite sprite, string shaderName = "Spine/Skeleton") { @@ -135,5 +131,4 @@ public static class SkeletonExtensions { loader = null; return att; } - } \ No newline at end of file