X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=skeleton.h;h=788bd197f9c70203244900147267f06349dc0c37;hb=d13f2700b1773551307685cc7c34c804ccd6d664;hp=34e1b8e8fba779b0e9c2bb11ca1c068106d6eaee;hpb=3ee65e6e24bfc39db7c7dd8c1f4cec3d5c42d0f8;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/skeleton.h b/skeleton.h index 34e1b8e..788bd19 100644 --- a/skeleton.h +++ b/skeleton.h @@ -19,6 +19,11 @@ struct skeleton mdl_keyframe kf; + u32 orig_node; + + int collider; + boxf hitbox; + char name[16]; } *bones; @@ -42,6 +47,7 @@ struct skeleton u32 bone_count, ik_count, + collider_count, anim_count, bindable_count; /* TODO: try to place IK last in the rig from export so that we dont always upload transforms for @@ -55,15 +61,33 @@ static u32 skeleton_bone_id( struct skeleton *skele, const char *name ) if( !strcmp( skele->bones[i].name, name )) return i; } + return 0; } +static void keyframe_copy_pose( mdl_keyframe *kfa, mdl_keyframe *kfb, int num ) +{ + for( int i=0; i= 0.99f ) + { + keyframe_copy_pose( kfb, kfd, count ); + return; + } + for( int i=0; ilength-1) / anim->rate; + skeleton_sample_anim( skele, anim, vg_minf( end, time ), output ); + + if( time > end ) + return 0; + else + return 1; +} + typedef enum anim_apply { k_anim_apply_always, @@ -354,7 +392,7 @@ static struct skeleton_anim *skeleton_get_anim( struct skeleton *skele, /* Setup an animated skeleton from model */ static int skeleton_setup( struct skeleton *skele, mdl_header *mdl ) { - u32 bone_count = 1, skeleton_root = 0, ik_count = 0; + u32 bone_count = 1, skeleton_root = 0, ik_count = 0, collider_count = 0; skele->bone_count = 0; skele->bones = NULL; skele->final_mtx = NULL; @@ -377,14 +415,14 @@ static int skeleton_setup( struct skeleton *skele, mdl_header *mdl ) skele->bone_count = inf->channels; skele->ik_count = inf->ik_count; - skele->bones = malloc(sizeof(struct skeleton_bone)*skele->bone_count); - skele->ik = malloc(sizeof(struct skeleton_ik)*skele->ik_count); + skele->collider_count = inf->collider_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 ) { - int is_ik = pnode->classtype == k_classtype_ik_bone, - is_bone = (pnode->classtype == k_classtype_bone) || is_ik; + int is_bone = pnode->classtype == k_classtype_bone; if( is_bone ) { @@ -398,16 +436,17 @@ static int skeleton_setup( struct skeleton *skele, mdl_header *mdl ) } struct skeleton_bone *sb = &skele->bones[bone_count]; + struct classtype_bone *bone_inf = mdl_get_entdata( mdl, pnode ); + int is_ik = bone_inf->ik_target; v3_copy( pnode->co, sb->co ); v3_copy( pnode->s, sb->end ); sb->parent = pnode->parent-skeleton_root; strncpy( sb->name, mdl_pstr(mdl,pnode->pstr_name), 15 ); + sb->deform = bone_inf->deform; if( is_ik ) { - struct classtype_ik_bone *ik_inf = mdl_get_entdata( mdl, pnode ); - sb->deform = ik_inf->deform; sb->ik = 1; /* TODO: place into new IK array */ skele->bones[ sb->parent ].ik = 1; @@ -420,16 +459,29 @@ static int skeleton_setup( struct skeleton *skele, mdl_header *mdl ) struct skeleton_ik *ik = &skele->ik[ ik_count ++ ]; ik->upper = bone_count; ik->lower = sb->parent; - ik->target = ik_inf->target; - ik->pole = ik_inf->pole; + ik->target = bone_inf->ik_target; + ik->pole = bone_inf->ik_pole; } else { - struct classtype_bone *bone_inf = mdl_get_entdata( mdl, pnode ); - sb->deform = bone_inf->deform; sb->ik = 0; } + sb->collider = bone_inf->collider; + sb->orig_node = i; + box_copy( bone_inf->hitbox, sb->hitbox ); + + if( bone_inf->collider ) + { + if( collider_count == skele->collider_count ) + { + vg_error( "Too many collider bones\n" ); + goto error_dealloc; + } + + collider_count ++; + } + bone_count ++; } else @@ -445,6 +497,13 @@ static int skeleton_setup( struct skeleton *skele, mdl_header *mdl ) return 0; } + if( collider_count != skele->collider_count ) + { + vg_error( "Loaded %u colliders out of %u\n", collider_count, + skele->collider_count ); + goto error_dealloc; + } + if( bone_count != skele->bone_count ) { vg_error( "Loaded %u bones out of %u\n", bone_count, skele->bone_count ); @@ -461,10 +520,11 @@ static int skeleton_setup( struct skeleton *skele, mdl_header *mdl ) v3_zero( skele->bones[0].co ); v3_copy( (v3f){0.0f,1.0f,0.0f}, skele->bones[0].end ); 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++ ) { @@ -473,11 +533,11 @@ static int skeleton_setup( struct skeleton *skele, mdl_header *mdl ) skele->anims[i].rate = anim->rate; skele->anims[i].length = anim->length; - strncpy( skele->anims[i].name, mdl_pstr(mdl, anim->pstr_name), 32 ); + strncpy( skele->anims[i].name, mdl_pstr(mdl, anim->pstr_name), 31 ); 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 ); @@ -485,11 +545,12 @@ static int skeleton_setup( struct skeleton *skele, mdl_header *mdl ) skeleton_create_inverses( skele ); vg_success( "Loaded skeleton with %u bones\n", skele->bone_count ); + vg_success( " %u colliders\n", skele->collider_count ); return 1; error_dealloc: - free( skele->bones ); - free( skele->ik ); + vg_free( skele->bones ); + vg_free( skele->ik ); return 0; }