v3_normalize( support_axis );
while( bh_next( world->geo_bh, &it, box, &idx ) ){
- u32 *ptri = &world->scene_geo->arrindices[ idx*3 ];
+ u32 *ptri = &world->scene_geo.arrindices[ idx*3 ];
v3f tri[3];
struct world_surface *surf = world_tri_index_surface(world,ptri[0]);
- if( !(surf->info.flags & k_material_flag_skate_surface) )
+ if( !(surf->info.flags & k_material_flag_grindable) )
continue;
for( int j=0; j<3; j++ )
- v3_copy( world->scene_geo->arrvertices[ptri[j]].co, tri[j] );
+ v3_copy( world->scene_geo.arrvertices[ptri[j]].co, tri[j] );
for( int j=0; j<3; j++ ){
int i0 = j,
v3_copy( co, inf->log[ inf->log_length ++ ] );
v3_copy( n, inf->n );
- u32 *tri = &trace_world->scene_geo->arrindices[ idx*3 ];
+ u32 *tri = &trace_world->scene_geo.arrindices[ idx*3 ];
struct world_surface *surf =
world_tri_index_surface( trace_world, tri[0] );
inf->score = -v3_dot( ve, inf->n );
inf->land_dist = t + k_trace_delta * t1;
-
/* Bias prediction towords ramps */
- if( !(surf->info.flags & k_material_flag_skate_surface) )
+ if( !(surf->info.flags & k_material_flag_skate_target) )
inf->score *= 10.0f;
+ if( surf->info.flags & k_material_flag_boundary )
+ s->possible_jump_count --;
+
break;
}
v3_copy( best->v, player->rb.v );
s->land_dist = best->land_dist;
- v2f steer = { player->input_js1h->axis.value,
- player->input_js1v->axis.value };
- v2_normalize_clamp( steer );
s->state.gravity_bias = best->gravity;
if( best->type == k_prediction_grind ){
s->state.activity = k_skate_activity_air_to_grind;
}
+ v2f steer;
+ v2_copy( srinput.joy_steer, steer );
+ v2_normalize_clamp( steer );
+
if( (fabsf(steer[1]) > 0.5f) && (s->land_dist >= 1.5f) ){
s->state.flip_rate = (1.0f/s->land_dist) * vg_signf(steer[1]) *
s->state.reverse ;
q_axis_angle( correction, axis,
acosf(angle)*2.0f*VG_TIMESTEP_FIXED );
q_mul( correction, player->rb.q, player->rb.q );
-
- v2f steer = { player->input_js1h->axis.value,
- player->input_js1v->axis.value };
- v2_normalize_clamp( steer );
}
VG_STATIC int player_skate_trick_input( player_instance *player );
{
struct player_skate *s = &player->_skate;
- float grabt = player->input_grab->axis.value;
+ float grabt = srinput.axis_grab;
if( grabt > 0.5f ){
v2_muladds( s->state.grab_mouse_delta, vg.mouse_delta, 0.02f,
struct player_skate *s = &player->_skate;
/* Steering */
- float steer = player->input_js1h->axis.value,
- grab = player->input_grab->axis.value;
+ float steer = srinput.joy_steer[0],
+ grab = srinput.axis_grab;
steer = vg_signf( steer ) * steer*steer * k_steer_ground;
/* Pushing additive force */
- if( !player->input_jump->button.value ){
- if( player->input_push->button.value ||
- (vg.time-s->state.start_push<0.75) )
+ if( !button_press( k_srbind_jump ) ){
+ if( button_press( k_srbind_push ) || (vg.time-s->state.start_push<0.75) )
{
if( (vg.time - s->state.cur_push) > 0.25 )
s->state.start_push = vg.time;
{
struct player_skate *s = &player->_skate;
int charging_jump_prev = s->state.charging_jump;
- s->state.charging_jump = player->input_jump->button.value;
+ s->state.charging_jump = button_press( k_srbind_jump );
/* Cannot charge this in air */
if( s->state.activity <= k_skate_activity_air_to_grind ){
s->grind_cooldown = 30;
s->state.activity = k_skate_activity_ground;
- float tilt = player->input_js1h->axis.value * 0.3f;
+ float tilt = srinput.joy_steer[0] * 0.4f;
tilt *= vg_signf(v3_dot( player->rb.v, s->grind_dir ));
v4f qtilt;
s->state.jump_charge = 0.0f;
s->state.jump_time = vg.time;
- v2f steer = { player->input_js1h->axis.value,
- player->input_js1v->axis.value };
- v2_normalize_clamp( steer );
-
audio_lock();
audio_oneshot_3d( &audio_jumps[rand()%2], player->rb.co, 40.0f, 1.0f );
audio_unlock();
/* Throw / collect routine
*/
- if( player->input_grab->axis.value > 0.5f ){
+ if( srinput.axis_grab > 0.5f ){
if( s->state.activity == k_skate_activity_ground ){
/* Throw */
v3_muls( player->rb.to_world[1], k_mmthrow_scale, s->state.throw_v );
v3_normalize( ideal_dir );
v3_muladds( player->rb.co, ideal_dir,
- 1.0f-player->input_grab->axis.value, ideal_cog );
+ 1.0f-srinput.axis_grab, ideal_cog );
v3_sub( ideal_cog, s->state.cog, ideal_diff );
/* Apply velocities */
VG_STATIC int player_skate_trick_input( player_instance *player )
{
- return (player->input_trick0->button.value) |
- (player->input_trick1->button.value << 1) |
- (player->input_trick2->button.value << 1) |
- (player->input_trick2->button.value);
+ return (button_press( k_srbind_trick0 ) ) |
+ (button_press( k_srbind_trick1 ) << 1) |
+ (button_press( k_srbind_trick2 ) << 1) |
+ (button_press( k_srbind_trick2 ) );
}
VG_STATIC void player__skate_pre_update( player_instance *player )
{
struct player_skate *s = &player->_skate;
- if( vg_input_button_down( player->input_use ) ){
+ if( button_down( k_srbind_use ) ){
player->subsystem = k_player_subsystem_walk;
v3f angles;
jump_info *jump = &s->possible_jumps[i];
if( jump->log_length == 0 ){
- vg_fatal_exit_loop( "assert: jump->log_length == 0\n" );
+ vg_fatal_error( "assert: jump->log_length == 0\n" );
}
for( int j=0; j<jump->log_length - 1; j ++ ){
if( idx != -1 )
{
- u32 *tri = &world->scene_geo->arrindices[ idx * 3 ];
+ u32 *tri = &world->scene_geo.arrindices[ idx * 3 ];
v3f verts[3];
for( int j=0; j<3; j++ )
- v3_copy( world->scene_geo->arrvertices[ tri[j] ].co, verts[j] );
+ v3_copy( world->scene_geo.arrvertices[ tri[j] ].co, verts[j] );
v3f vert0, vert1, n;
v3_sub( verts[1], verts[0], vert0 );
int reverse_dir = v3_dot( player->rb.to_world[2], player->rb.v ) < 0.0f?1:-1;
if( s->state.manual_direction == 0 ){
- if( (player->input_js1v->axis.value > 0.7f) &&
+ if( (srinput.joy_steer[1] > 0.7f) &&
(s->state.activity == k_skate_activity_ground) &&
(s->state.jump_charge <= 0.01f) )
s->state.manual_direction = reverse_dir;
}
else{
- if( player->input_js1v->axis.value < 0.1f ){
+ if( srinput.joy_steer[1] < 0.1f ){
s->state.manual_direction = 0;
}
else{
}
if( s->state.manual_direction ){
- float amt = vg_minf( player->input_js1v->axis.value * 8.0f, 1.0f );
+ float amt = vg_minf( srinput.joy_steer[1] * 8.0f, 1.0f );
s->weight_distribution[2] = k_board_length * amt *
(float)s->state.manual_direction;
}
v3_normalize( fwd );
- float way = player->input_js1v->axis.value *
+ float way = srinput.joy_steer[1] *
vg_signf( v3_dot( raw_nplane, player->rb.v ) );
v4f q;
skate_grind_decay( player, &inf_avg, 1.0f );
- float way = player->input_js1v->axis.value *
+ float way = srinput.joy_steer[1] *
vg_signf( v3_dot( player->rb.to_world[2], player->rb.v ) );
v4f q;
v3f up, target_up;
struct player_skate *s = &player->_skate;
if( s->grind_cooldown > 100 ){
- vg_fatal_exit_loop( "wth!\n" );
+ vg_fatal_error( "wth!\n" );
}
/* debounces this state manager a little bit */
s->state.activity == k_skate_activity_grind_back50 ||
s->state.activity == k_skate_activity_grind_front50 )
{
- float tilt = player->input_js1v->axis.value;
+ float tilt = srinput.joy_steer[1];
if( fabsf(tilt) >= 0.25f ){
v3f raw = {0.0f,0.0f,tilt};
m3x3_mulv( player->rb.to_world, raw, raw );
- float way = player->input_js1v->axis.value *
- vg_signf( v3_dot( raw, player->rb.v ) );
+ float way = tilt * vg_signf( v3_dot( raw, player->rb.v ) );
if( way < 0.0f ) allow_front = 0;
else allow_back = 0;
res_front50 = skate_grind_truck_entry( player, -1.0f, &inf_front50 );
if( res_back50 != res_front50 ){
- int wants_to_do_that = fabsf(player->input_js1v->axis.value) >= 0.25f;
+ int wants_to_do_that = fabsf(srinput.joy_steer[1]) >= 0.25f;
res_back50 &= wants_to_do_that;
res_front50 &= wants_to_do_that;
mdl_keyframe air_pose[32];
{
- float target = -player->input_js1h->axis.value;
+ float target = -srinput.joy_steer[1];
s->blend_airdir = vg_lerpf( s->blend_airdir, target, 2.4f*vg.time_delta );
static v2f grab_choice;
- v2f grab_input = { player->input_js2h->axis.value,
- player->input_js2v->axis.value };
+ v2f grab_input;
+ v2_copy( srinput.joy_grab, grab_input );
v2_add( s->state.grab_mouse_delta, grab_input, grab_input );
+
if( v2_length2( grab_input ) <= 0.001f )
grab_input[0] = -1.0f;
else
q_mul( kf_board->q, qtrick, kf_board->q );
q_normalize( kf_board->q );
-
- /* foot weight distribution */
- if( s->blend_weight > 0.0f ){
- kf_foot_l->co[2] += s->blend_weight * 0.2f;
- kf_foot_r->co[2] += s->blend_weight * 0.1f;
- }
- else{
- kf_foot_r->co[2] += s->blend_weight * 0.3f;
- kf_foot_l->co[2] += s->blend_weight * 0.1f;
+ struct player_board *board = player->board;
+
+ if( board ){
+ /* foot weight distribution */
+ if( s->blend_weight > 0.0f ){
+ kf_foot_l->co[2] =
+ vg_lerpf( kf_foot_l->co[2],
+ board->truck_positions[k_board_truck_back][2]+0.3f,
+ 0.5f*s->blend_weight );
+ }
+ else{
+ kf_foot_r->co[2] =
+ vg_lerpf( kf_foot_r->co[2],
+ board->truck_positions[k_board_truck_front][2]-0.3f,
+ -0.5f*s->blend_weight );
+ }
}
float slapm = vg_maxf( 1.0f-v3_length2( s->state.trick_vel ), 0.0f );
/* transform */
rb_extrapolate( &player->rb, dest->root_co, dest->root_q );
- v3_muladds( dest->root_co, player->rb.to_world[1], -0.1f, dest->root_co );
- float substep = vg.time_fixed_extrapolate;
+ v3f ext_up,ext_co;
+ q_mulv( dest->root_q, (v3f){0.0f,1.0f,0.0f}, ext_up );
+ v3_copy( dest->root_co, ext_co );
+ v3_muladds( dest->root_co, ext_up, -0.1f, dest->root_co );
v4f qflip;
if( (s->state.activity <= k_skate_activity_air_to_grind) &&
(fabsf(s->state.flip_rate) > 0.01f) )
{
+ float substep = vg.time_fixed_extrapolate;
float t = s->state.flip_time+s->state.flip_rate*substep*k_rb_delta;
sign = vg_signf( t );
q_normalize( dest->root_q );
v3f rotation_point, rco;
- v3_muladds( player->rb.co, player->rb.to_world[1], 0.5f, rotation_point );
+ v3_muladds( ext_co, ext_up, 0.5f, rotation_point );
v3_sub( dest->root_co, rotation_point, rco );
q_mulv( qflip, rco, rco );
m4x3_mulv( av->sk.final_mtx[ av->id_head ], head, s->state.head_position );
m4x3_mulv( player->rb.to_local, s->state.head_position,
s->state.head_position );
+
+ /* TODO: Extrapolate to_local matrix? */
}
VG_STATIC void player__skate_reset_animator( player_instance *player )
projects / carveJwlIkooP6JGAAIwe30JlM.git / blobdiff