Clean up.

This commit is contained in:
NathanSweet 2013-04-01 20:21:31 +02:00
parent dfd090d220
commit e3cc3e4fb2
2 changed files with 7 additions and 7 deletions

View File

@ -66,7 +66,6 @@ int main () {
Skeleton_updateWorldTransform(skeleton); Skeleton_updateWorldTransform(skeleton);
} }
Skeleton_free(skeleton);
SkeletonData_free(skeletonData); SkeletonData_free(skeletonData);
Atlas_free(atlas); Atlas_free(atlas);
} }

View File

@ -63,13 +63,14 @@ AtlasPage* AtlasPage_new (const char* name) {
/**/ /**/
void _SfmlSkeleton_free (Skeleton* skeleton) { void _SfmlSkeleton_free (Skeleton* self) {
SfmlSkeleton* self = SUB_CAST(SfmlSkeleton, skeleton); _Skeleton_deinit(self);
_Skeleton_deinit(SUPER(self));
FREE(self); FREE(self);
} }
Skeleton* Skeleton_new (SkeletonData* data, SkeletonDrawable* drawable) { Skeleton* _SfmlSkeleton_new (SkeletonData* data, SkeletonDrawable* drawable) {
Bone_setYDown(1);
SfmlSkeleton* self = NEW(SfmlSkeleton); SfmlSkeleton* self = NEW(SfmlSkeleton);
_Skeleton_init(SUPER(self), data); _Skeleton_init(SUPER(self), data);
VTABLE(Skeleton, self) ->free = _SfmlSkeleton_free; VTABLE(Skeleton, self) ->free = _SfmlSkeleton_free;
@ -82,12 +83,12 @@ Skeleton* Skeleton_new (SkeletonData* data, SkeletonDrawable* drawable) {
SkeletonDrawable::SkeletonDrawable (SkeletonData* skeletonData) : SkeletonDrawable::SkeletonDrawable (SkeletonData* skeletonData) :
vertexArray(new VertexArray(Quads, skeletonData->boneCount * 4)), vertexArray(new VertexArray(Quads, skeletonData->boneCount * 4)),
texture(0) { texture(0) {
Bone_setYDown(1); skeleton = _SfmlSkeleton_new(skeletonData, this);
skeleton = Skeleton_new(skeletonData, this);
} }
SkeletonDrawable::~SkeletonDrawable () { SkeletonDrawable::~SkeletonDrawable () {
delete vertexArray; delete vertexArray;
Skeleton_free(skeleton);
} }
void SkeletonDrawable::draw (RenderTarget& target, RenderStates states) const { void SkeletonDrawable::draw (RenderTarget& target, RenderStates states) const {