{
glmesh mesh;
- submodel parts[ PART_COUNT ];
+ mdl_submesh parts[ PART_COUNT ];
+ v3f origins[ PART_COUNT ];
m4x3f matrices[ PART_COUNT ];
/* Auxillary information */
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 ] );
}
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; i<PART_COUNT; i++ )
{
snprintf( buf, sizeof(buf)-1, "%s_%s", name, character_part_strings[i] );
- submodel *sm = submodel_get( src, buf );
+ mdl_node *pnode = mdl_node_from_name( src, buf );
- if( !sm )
+ memset( &ch->parts[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 );
*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];
#endif
shader_character_uMdl( ch->matrices[i] );
- submodel_draw( &ch->parts[i] );
+ mdl_draw_submesh( &ch->parts[i] );
}
for( int i=0; i<2; i++ )
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] );
}
}
}
{
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; i<PART_COUNT; i++ )
{
- float *pivot = ch->parts[i].pivot;
+ float *pivot = ch->origins[i];
v3_sub( ch->ragdoll[i].co, pivot, ch->ragdoll[i].delta );
}
}
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 );
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 */
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;