X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=character.h;h=5ce456f24a1648493bd2056aa57156c4efac401b;hb=9c85e110fa8b965195438d96625ff9753af362a6;hp=047b714df02f62db79b113299848d467abdc2691;hpb=1656d58a7bd17df4a1edcc9677ade4dbafc82229;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/character.h b/character.h index 047b714..5ce456f 100644 --- a/character.h +++ b/character.h @@ -63,7 +63,8 @@ struct character { glmesh mesh; - submodel parts[ PART_COUNT ]; + mdl_submesh parts[ PART_COUNT ]; + v3f origins[ PART_COUNT ]; m4x3f matrices[ PART_COUNT ]; /* Auxillary information */ @@ -96,7 +97,7 @@ struct character static void character_offset( struct character *ch, enum character_part parent, enum character_part child ) { - v3_sub( ch->parts[ child ].pivot, ch->parts[ parent ].pivot, + v3_sub( ch->origins[ child ], ch->origins[ parent ], ch->offsets[ child ] ); } @@ -105,35 +106,44 @@ static int character_load( struct character *ch, const char *name ) char buf[64]; snprintf( buf, sizeof(buf)-1, "models/%s.mdl", name ); - model *src = vg_asset_read( buf ); + mdl_header *src = mdl_load( buf ); if( !src ) - { - vg_error( "Could not open 'models/%s.mdl'", name ); return 0; - } int error_count = 0; for( int i=0; iparts[i], 0, sizeof(mdl_submesh) ); + v3_zero( ch->origins[i] ); + + if( !pnode ) { vg_warn( "Character file does not contain an '_%s' part.\n", character_part_strings[i] ); error_count ++; - - memset( &ch->parts[i], 0, sizeof(submodel) ); + continue; + } + + mdl_submesh *sm = mdl_node_submesh( src, pnode, 0 ); + + if( !sm ) + { + vg_warn( "Character file's '_%s' part has no mesh.\n", + character_part_strings[i] ); + error_count ++; continue; } ch->parts[i] = *sm; + v3_copy( pnode->co, ch->origins[i] ); } - model_unpack( src, &ch->mesh ); + mdl_unpack_glmesh( src, &ch->mesh ); if( !error_count ) vg_success( "Loaded character file '%s' with no errors\n", name ); @@ -259,11 +269,16 @@ static void character_eval( struct character *ch ) m4x3_mulv( mats[k_chpart_body1], offs[k_chpart_neck], mats[k_chpart_neck][3] ); +#if 1 v4f qhead; q_axis_angle( qhead, (v3f){ 0.0f,1.0f,0.0f }, ch->rhead ); q_m3x3( qhead, mats[k_chpart_head] ); - //m3x3_mul( mats[k_chpart_neck], mats[k_chpart_head], mats[k_chpart_head] ); m4x3_mulv( mats[k_chpart_neck], offs[k_chpart_head], mats[k_chpart_head][3]); + m3x3_mul( mats[k_chpart_neck], mats[k_chpart_head], mats[k_chpart_head] ); +#else + m4x3_mulv( mats[k_chpart_neck], offs[k_chpart_head], mats[k_chpart_head][3]); + m3x3_copy( mats[k_chpart_neck], mats[k_chpart_head] ); +#endif /* Feet */ m3x3_copy( mats[k_chpart_leg_l1], mats[k_chpart_foot_l] ); @@ -422,7 +437,7 @@ void character_final_pose( struct character *ch, v3f cog, character_pose *pose, float q ) { character_pose npose; - float dip = vg_clampf(cog[1], -1.0f, 0.3f) * 0.35f, + float dip = vg_clampf(cog[1], -1.0f, 0.3f) * 0.5f, tilt = vg_clampf(cog[2], -1.0f, 1.0f) * 0.3f; v4f rz; m4x3f tr; @@ -447,6 +462,18 @@ void character_final_pose( struct character *ch, v3f cog, character_pose_blend( ch, &npose, q ); } +static void character_yaw_upper( struct character *ch, float yaw ) +{ + m3x3f r; + v4f q; + + q_axis_angle( q, (v3f){0.0f,1.0f,0.0f}, yaw ); + q_m3x3( q, r ); + + m3x3_mulv( r, ch->ik_body.pole, ch->ik_body.pole ); + m3x3_mulv( r, ch->ik_body.end, ch->ik_body.end ); +} + static void zero_ik_basic( struct ik_basic *ik ) { v3_zero( ik->base ); @@ -472,7 +499,7 @@ static void character_testpose( struct character *ch, float t ) *pole = ch->ik_body.pole; hips[0] = cosf(t*1.325f)*0.25f; - hips[1] = (sinf(t)*0.2f+0.6f) * ch->parts[ k_chpart_body0 ].pivot[1]; + hips[1] = (sinf(t)*0.2f+0.6f) * ch->origins[ k_chpart_body0 ][1]; hips[2] = 0.0f; collar[0] = hips[0]; @@ -526,6 +553,7 @@ static void character_testpose( struct character *ch, float t ) m4x3_identity( ch->matrices[k_chpart_wf] ); } +static float *player_cam_pos(void); static void character_draw( struct character *ch, float temp ) { shader_character_use(); @@ -534,6 +562,8 @@ static void character_draw( struct character *ch, float temp ) vg_tex2d_bind( &tex_pallet, 0 ); shader_character_uTexMain( 0 ); shader_character_uOpacity( temp ); + shader_character_uCamera( player_cam_pos() ); + shader_link_standard_ub( _shader_character.id, 2 ); glEnable( GL_CULL_FACE ); glCullFace( GL_BACK ); @@ -542,8 +572,13 @@ static void character_draw( struct character *ch, float temp ) for( int i=4; imatrices[i] ); - submodel_draw( &ch->parts[i] ); + mdl_draw_submesh( &ch->parts[i] ); } for( int i=0; i<2; i++ ) @@ -551,14 +586,14 @@ static void character_draw( struct character *ch, float temp ) if( ch->shoes[i] ) { shader_character_uMdl( ch->matrices[i] ); - submodel_draw( &ch->parts[i] ); + mdl_draw_submesh( &ch->parts[i] ); } else { shader_character_uMdl( ch->matrices[i+2] ); - submodel_draw( &ch->parts[i] ); + mdl_draw_submesh( &ch->parts[i] ); shader_character_uMdl( ch->matrices[i] ); - submodel_draw( &ch->parts[i+2] ); + mdl_draw_submesh( &ch->parts[i+2] ); } } } @@ -651,14 +686,14 @@ static void character_init_ragdoll_joints( struct character *ch ) { struct rd_joint *joint = &rd_joints[i]; - float *hinge = ch->parts[joint->ib].pivot; + float *hinge = ch->origins[joint->ib]; v3_sub( hinge, ch->ragdoll[joint->ia].co, joint->lca ); v3_sub( hinge, ch->ragdoll[joint->ib].co, joint->lcb ); } for( int i=0; iparts[i].pivot; + float *pivot = ch->origins[i]; v3_sub( ch->ragdoll[i].co, pivot, ch->ragdoll[i].delta ); } } @@ -675,27 +710,27 @@ static void character_init_ragdoll( struct character *ch ) v3f chest_dims = { chest_depth, chest_height, chest_width }; character_rd_box( ch, k_chpart_body1, chest_dims ); - v3_copy( ch->parts[k_chpart_body1].pivot, rbs[k_chpart_body1].co ); + v3_copy( ch->origins[k_chpart_body1], rbs[k_chpart_body1].co ); rbs[k_chpart_body1].co[1] += chest_height*0.5f; /* Torso */ v3f torso_dims = { chest_depth, offs[k_chpart_body1][1]-offs[k_chpart_leg_l0][1], chest_width*0.85f }; - v3_copy( ch->parts[k_chpart_body0].pivot, rbs[k_chpart_body0].co ); + v3_copy( ch->origins[k_chpart_body0], rbs[k_chpart_body0].co ); character_rd_box( ch, k_chpart_body0, torso_dims ); /* Neck */ v3f neck_dims = { chest_depth*0.5f, offs[k_chpart_head][1], chest_depth*0.5f }; - v3_copy( ch->parts[k_chpart_neck].pivot, rbs[k_chpart_neck].co ); + v3_copy( ch->origins[k_chpart_neck], rbs[k_chpart_neck].co ); rbs[k_chpart_neck].co[1] += neck_dims[1]*0.5f; character_rd_box( ch, k_chpart_neck, neck_dims ); /* Head */ v3f head_dims = { chest_width*0.5f, chest_width*0.5f, chest_width*0.5f }; - v3_copy( ch->parts[k_chpart_head].pivot, rbs[k_chpart_head].co ); + v3_copy( ch->origins[k_chpart_head], rbs[k_chpart_head].co ); rbs[k_chpart_head].co[1] += head_dims[1]*0.5f; character_rd_box( ch, k_chpart_head, head_dims ); @@ -713,18 +748,18 @@ static void character_init_ragdoll( struct character *ch ) character_rd_box( ch, k_chpart_hand_l, hand_dims ); character_rd_box( ch, k_chpart_hand_r, hand_dims ); - v3_copy( ch->parts[k_chpart_arm_l0].pivot, rbs[k_chpart_arm_l0].co ); + v3_copy( ch->origins[k_chpart_arm_l0], rbs[k_chpart_arm_l0].co ); rbs[k_chpart_arm_l0].co[2] += ua_dims[2] * 0.5f; - v3_copy( ch->parts[k_chpart_arm_l1].pivot, rbs[k_chpart_arm_l1].co ); + v3_copy( ch->origins[k_chpart_arm_l1], rbs[k_chpart_arm_l1].co ); rbs[k_chpart_arm_l1].co[2] += la_dims[2] * 0.5f; - v3_copy( ch->parts[k_chpart_hand_l].pivot, rbs[k_chpart_hand_l].co ); + v3_copy( ch->origins[k_chpart_hand_l], rbs[k_chpart_hand_l].co ); rbs[k_chpart_hand_l].co[2] += hand_dims[2] * 0.5f; - v3_copy( ch->parts[k_chpart_arm_r0].pivot, rbs[k_chpart_arm_r0].co ); + v3_copy( ch->origins[k_chpart_arm_r0], rbs[k_chpart_arm_r0].co ); rbs[k_chpart_arm_r0].co[2] -= ua_dims[2] * 0.5f; - v3_copy( ch->parts[k_chpart_arm_r1].pivot, rbs[k_chpart_arm_r1].co ); + v3_copy( ch->origins[k_chpart_arm_r1], rbs[k_chpart_arm_r1].co ); rbs[k_chpart_arm_r1].co[2] -= la_dims[2] * 0.5f; - v3_copy( ch->parts[k_chpart_hand_r].pivot, rbs[k_chpart_hand_r].co ); + v3_copy( ch->origins[k_chpart_hand_r], rbs[k_chpart_hand_r].co ); rbs[k_chpart_hand_r].co[2] -= hand_dims[2] * 0.5f; /* LEgs */ @@ -741,19 +776,19 @@ static void character_init_ragdoll( struct character *ch ) character_rd_box( ch, k_chpart_foot_l, foot_dims ); character_rd_box( ch, k_chpart_foot_r, foot_dims ); - v3_copy( ch->parts[k_chpart_leg_l0].pivot, rbs[k_chpart_leg_l0].co ); + v3_copy( ch->origins[k_chpart_leg_l0], rbs[k_chpart_leg_l0].co ); rbs[k_chpart_leg_l0].co[1] -= ul_dims[1] * 0.5f; - v3_copy( ch->parts[k_chpart_leg_l1].pivot, rbs[k_chpart_leg_l1].co ); + v3_copy( ch->origins[k_chpart_leg_l1], rbs[k_chpart_leg_l1].co ); rbs[k_chpart_leg_l1].co[1] -= ll_dims[1] * 0.5f; - v3_copy( ch->parts[k_chpart_foot_l].pivot, rbs[k_chpart_foot_l].co ); + v3_copy( ch->origins[k_chpart_foot_l], rbs[k_chpart_foot_l].co ); rbs[k_chpart_foot_l].co[1] -= foot_dims[1] * 0.5f; rbs[k_chpart_foot_l].co[0] -= foot_dims[0] * 0.5f; - v3_copy( ch->parts[k_chpart_leg_r0].pivot, rbs[k_chpart_leg_r0].co ); + v3_copy( ch->origins[k_chpart_leg_r0], rbs[k_chpart_leg_r0].co ); rbs[k_chpart_leg_r0].co[1] -= ul_dims[1] * 0.5f; - v3_copy( ch->parts[k_chpart_leg_r1].pivot, rbs[k_chpart_leg_r1].co ); + v3_copy( ch->origins[k_chpart_leg_r1], rbs[k_chpart_leg_r1].co ); rbs[k_chpart_leg_r1].co[1] -= ll_dims[1] * 0.5f; - v3_copy( ch->parts[k_chpart_foot_r].pivot, rbs[k_chpart_foot_r].co ); + v3_copy( ch->origins[k_chpart_foot_r], rbs[k_chpart_foot_r].co ); rbs[k_chpart_foot_r].co[1] -= foot_dims[1] * 0.5f; rbs[k_chpart_foot_r].co[0] -= foot_dims[0] * 0.5f;