X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=anim_test.h;h=054e95563787395d22bfd55f5e0e1be86cb0f97c;hb=3ee65e6e24bfc39db7c7dd8c1f4cec3d5c42d0f8;hp=86c6853b7d884d6ceab8c63a5f15758b76e3d6d4;hpb=6a4dafa6fe9a3dd4bb88698bbe964154364390ec;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/anim_test.h b/anim_test.h index 86c6853..054e955 100644 --- a/anim_test.h +++ b/anim_test.h @@ -1,3 +1,7 @@ +/* + * Copyright (C) Mount0 Software, Harry Godden - All Rights Reserved + */ + #ifndef ANIM_TEST_H #define ANIM_TEST_H @@ -47,11 +51,7 @@ static void anim_test_update(void) skeleton_sample_anim( &animtest.skele, animtest.anim_highg, b, bpose ); skeleton_lerp_pose( &animtest.skele, apose, bpose, a, apose ); - skeleton_apply_pose( &animtest.skele, apose, k_anim_apply_defer_ik ); - skeleton_apply_ik_pass( &animtest.skele ); - skeleton_apply_pose( &animtest.skele, apose, k_anim_apply_deffered_only ); - skeleton_apply_inverses( &animtest.skele ); - skeleton_apply_transform( &animtest.skele, transform ); + skeleton_apply_standard( &animtest.skele, apose, transform ); skeleton_debug( &animtest.skele ); } @@ -73,6 +73,9 @@ static void anim_test_render( vg_tex2d *tex ) vg_tex2d_bind( tex, 0 ); shader_viewchar_uTexMain( 0 ); shader_viewchar_uPv( vg_pv ); + + shader_link_standard_ub( _shader_viewchar.id, 2 ); + glUniformMatrix4x3fv( _uniform_viewchar_uTransforms, animtest.skele.bone_count, 0,