upgrade to vg_msgv2

[carveJwlIkooP6JGAAIwe30JlM.git] / skeleton.h

diff --git a/skeleton.h b/skeleton.h
index 2fcfb5023f171540b517c989a918914061a8c754..052975239bd6988290a2c731b8d4d4565fdc4b7a 100644 (file)
--- a/skeleton.h
+++ b/skeleton.h
@@ -61,7 +61,7 @@ VG_STATIC u32 skeleton_bone_id( struct skeleton *skele, const char *name )
    }
 
    vg_error( "skeleton_bone_id( *, \"%s\" );\n", name );
-   vg_fatal_exit_loop( "Bone does not exist\n" );
+   vg_fatal_error( "Bone does not exist\n" );
 
    return 0;
 }
@@ -73,6 +73,22 @@ VG_STATIC void keyframe_copy_pose( mdl_keyframe *kfa, mdl_keyframe *kfb,
       kfb[i] = kfa[i];
 }
 
+
+/* apply a rotation from the perspective of root */
+VG_STATIC void keyframe_rotate_around( mdl_keyframe *kf, 
+                                       v3f origin, v3f offset, v4f q )
+{
+   v3f v0, co;
+   v3_add( kf->co, offset, co );
+   v3_sub( co, origin, v0 );
+   q_mulv( q, v0, v0 );
+   v3_add( v0, origin, co );
+   v3_sub( co, offset, kf->co );
+
+   q_mul( q, kf->q, kf->q );
+   q_normalize( kf->q );
+}
+
 /*
  * Lerp between two sets of keyframes and store in dest. Rotations use Nlerp.
  */
@@ -387,7 +403,7 @@ VG_STATIC struct skeleton_anim *skeleton_get_anim( struct skeleton *skele,
    }
 
    vg_error( "skeleton_get_anim( *, \"%s\" )\n", name );
-   vg_fatal_exit_loop( "Invalid animation name\n" );
+   vg_fatal_error( "Invalid animation name\n" );
 
    return NULL;
 }
@@ -421,11 +437,16 @@ VG_STATIC void skeleton_alloc_from( struct skeleton *skele,
    skele->ik         = vg_linear_alloc( lin_alloc, ik_size );
    skele->final_mtx  = vg_linear_alloc( lin_alloc, mtx_size );
    skele->anims      = vg_linear_alloc( lin_alloc, anim_size );
+
+   memset( skele->bones, 0, bone_size );
+   memset( skele->ik, 0, ik_size );
+   memset( skele->final_mtx, 0, mtx_size );
+   memset( skele->anims, 0, anim_size );
 }
 
 VG_STATIC void skeleton_fatal_err(void)
 {
-   vg_fatal_exit_loop( "Skeleton setup failed" );
+   vg_fatal_error( "Skeleton setup failed" );
 }
 
 /* Setup an animated skeleton from model. mdl's metadata should stick around */