X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skeleton.h;h=788bd197f9c70203244900147267f06349dc0c37;hb=d13f2700b1773551307685cc7c34c804ccd6d664;hp=abbef4e0d9445fa1a17ec14f83d068371f81a9a9;hpb=c2d67378dd5c82de50b8fbbbe222ec6be2da4eee;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skeleton.h b/skeleton.h index abbef4e..788bd19 100644 --- a/skeleton.h +++ b/skeleton.h @@ -416,8 +416,8 @@ static int skeleton_setup( struct skeleton *skele, mdl_header *mdl ) skele->bone_count = inf->channels; skele->ik_count = inf->ik_count; skele->collider_count = inf->collider_count; - skele->bones = malloc(sizeof(struct skeleton_bone)*skele->bone_count); - skele->ik = malloc(sizeof(struct skeleton_ik)*skele->ik_count); + skele->bones =vg_alloc(sizeof(struct skeleton_bone)*skele->bone_count); + skele->ik = vg_alloc(sizeof(struct skeleton_ik)*skele->ik_count); skeleton_root = i; } else if( skele->bone_count ) @@ -522,9 +522,9 @@ static int skeleton_setup( struct skeleton *skele, mdl_header *mdl ) skele->bones[0].parent = 0xffffffff; skele->bones[0].collider = 0; - skele->final_mtx = malloc( sizeof(m4x3f) * skele->bone_count ); + skele->final_mtx = vg_alloc( sizeof(m4x3f) * skele->bone_count ); skele->anim_count = inf->anim_count; - skele->anims = malloc( sizeof(struct skeleton_anim) * inf->anim_count); + skele->anims = vg_alloc( sizeof(struct skeleton_anim) * inf->anim_count); for( int i=0; ianim_count; i++ ) { @@ -537,7 +537,7 @@ static int skeleton_setup( struct skeleton *skele, mdl_header *mdl ) u32 total_keyframes = (skele->bone_count-1)*anim->length; size_t block_size = sizeof(mdl_keyframe) * total_keyframes; - mdl_keyframe *dst = malloc( block_size ); + mdl_keyframe *dst = vg_alloc( block_size ); skele->anims[i].anim_data = dst; memcpy( dst, mdl_get_animdata( mdl, anim ), block_size ); @@ -549,8 +549,8 @@ static int skeleton_setup( struct skeleton *skele, mdl_header *mdl ) return 1; error_dealloc: - free( skele->bones ); - free( skele->ik ); + vg_free( skele->bones ); + vg_free( skele->ik ); return 0; }