From ef793dd97618906c361a898ad1e7d230f798f321 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Wed, 3 Apr 2013 17:24:30 +0200 Subject: [PATCH] Slots and bones start in bind pose. --- spine-c/src/spine/Bone.c | 3 +-- spine-c/src/spine/Slot.c | 5 +---- spine-sfml/example/main.cpp | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/spine-c/src/spine/Bone.c b/spine-c/src/spine/Bone.c index 1faf6b453..90047463d 100644 --- a/spine-c/src/spine/Bone.c +++ b/spine-c/src/spine/Bone.c @@ -41,8 +41,7 @@ Bone* Bone_create (BoneData* data, Bone* parent) { Bone* self = NEW(Bone); CONST_CAST(BoneData*, self->data) = data; CONST_CAST(Bone*, self->parent) = parent; - self->scaleX = 1; - self->scaleY = 1; + Bone_setToBindPose(self); return self; } diff --git a/spine-c/src/spine/Slot.c b/spine-c/src/spine/Slot.c index a29c652d7..72a949e10 100644 --- a/spine-c/src/spine/Slot.c +++ b/spine-c/src/spine/Slot.c @@ -41,10 +41,7 @@ Slot* Slot_create (SlotData* data, Skeleton* skeleton, Bone* bone) { CONST_CAST(SlotData*, self->data) = data; CONST_CAST(Skeleton*, self->skeleton) = skeleton; CONST_CAST(Bone*, self->bone) = bone; - self->r = 1; - self->g = 1; - self->b = 1; - self->a = 1; + Slot_setToBindPose(self); return self; } diff --git a/spine-sfml/example/main.cpp b/spine-sfml/example/main.cpp index 46ad6a5be..ff7e6342d 100644 --- a/spine-sfml/example/main.cpp +++ b/spine-sfml/example/main.cpp @@ -104,7 +104,7 @@ void goblins () { skeleton->flipX = false; skeleton->flipY = false; Skeleton_setSkinByName(skeleton, "goblin"); - Skeleton_setToBindPose(skeleton); + Skeleton_setSlotsToBindPose(skeleton); Skeleton_setAttachment(skeleton, "left hand item", "dagger"); Skeleton_getRootBone(skeleton)->x = 320;