From: hgn Date: Wed, 13 Dec 2023 18:04:03 +0000 (+0000) Subject: hand slides X-Git-Url: https://harrygodden.com/git/?p=carveJwlIkooP6JGAAIwe30JlM.git;a=commitdiff_plain;h=5f47e6ce30b9da71d6c32559a8d43ba467a22159 hand slides --- diff --git a/input.h b/input.h index d60fece..fb2f3d9 100644 --- a/input.h +++ b/input.h @@ -54,6 +54,7 @@ enum sr_axis{ k_sraxis_mbrowse_h, k_sraxis_mbrowse_v, k_sraxis_replay_h, + k_sraxis_skid, k_sraxis_max }; @@ -77,10 +78,10 @@ static vg_input_op *input_button_list[] = { vg_mode_absmax, vg_joy_button, SDL_CONTROLLER_BUTTON_X, vg_end }, [k_srbind_use] = INPUT_BASIC( SDLK_e, SDL_CONTROLLER_BUTTON_Y ), -[k_srbind_reset] = INPUT_BASIC( SDLK_r, SDL_CONTROLLER_BUTTON_LEFTSHOULDER ), +[k_srbind_reset] = INPUT_BASIC( SDLK_r, SDL_CONTROLLER_BUTTON_DPAD_LEFT ), [k_srbind_dead_respawn] = - INPUT_BASIC( SDLK_q, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER ), -[k_srbind_camera]= INPUT_BASIC( SDLK_c, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER ), + INPUT_BASIC( SDLK_q, SDL_CONTROLLER_BUTTON_DPAD_RIGHT ), +[k_srbind_camera]= INPUT_BASIC( SDLK_c, SDL_CONTROLLER_BUTTON_DPAD_RIGHT ), [k_srbind_mleft] = INPUT_BASIC( SDLK_LEFT, SDL_CONTROLLER_BUTTON_DPAD_LEFT ), [k_srbind_mright]= INPUT_BASIC( SDLK_RIGHT, SDL_CONTROLLER_BUTTON_DPAD_RIGHT ), [k_srbind_world_left] = @@ -141,6 +142,11 @@ static vg_input_op *input_axis_list[] = { vg_mode_sub, vg_joy_axis, SDL_CONTROLLER_AXIS_TRIGGERLEFT, vg_end }, +[k_sraxis_skid] = (vg_input_op[]){ + vg_mode_add, vg_joy_button, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, + vg_mode_sub, vg_joy_button, SDL_CONTROLLER_BUTTON_LEFTSHOULDER, + vg_end +}, [k_sraxis_max]=NULL }; diff --git a/maps_src/dev_flatworld/main.mdl b/maps_src/dev_flatworld/main.mdl new file mode 100644 index 0000000..e86aba5 Binary files /dev/null and b/maps_src/dev_flatworld/main.mdl differ diff --git a/models_src/ch_none.mdl b/models_src/ch_none.mdl index e17c759..32f7274 100644 Binary files a/models_src/ch_none.mdl and b/models_src/ch_none.mdl differ diff --git a/player.h b/player.h index c18e51b..4396cbe 100644 --- a/player.h +++ b/player.h @@ -145,23 +145,25 @@ struct { mdl_context skeleton_meta; struct skeleton skeleton; - u32 id_hip, - id_chest, - id_ik_hand_l, - id_ik_hand_r, - id_ik_elbow_l, - id_ik_elbow_r, - id_head, - id_foot_l, - id_foot_r, - id_ik_foot_l, - id_ik_foot_r, - id_ik_knee_l, - id_ik_knee_r, - id_wheel_l, - id_wheel_r, - id_board, - id_eyes; + u8 id_hip, + id_chest, + id_ik_hand_l, + id_ik_hand_r, + id_ik_elbow_l, + id_ik_elbow_r, + id_head, + id_foot_l, + id_foot_r, + id_ik_foot_l, + id_ik_foot_r, + id_ik_knee_l, + id_ik_knee_r, + id_wheel_l, + id_wheel_r, + id_board, + id_eyes; + + u8 skeleton_mirror[32]; struct player_effects_data effect_data; } diff --git a/player_render.c b/player_render.c index 44ab25b..5b9b3be 100644 --- a/player_render.c +++ b/player_render.c @@ -46,6 +46,35 @@ static void player_load_animation_reference( const char *path ){ localplayer.id_ik_knee_r = skeleton_bone_id( sk, "knee.R" ); localplayer.id_eyes = skeleton_bone_id( sk, "eyes" ); + for( i32 i=0; ibone_count; i ++ ){ + localplayer.skeleton_mirror[i] = 0; + } + + for( i32 i=1; ibone_count-1; i ++ ){ + struct skeleton_bone *si = &sk->bones[i]; + + char tmp[64]; + vg_str str; + vg_strnull( &str, tmp, 64 ); + vg_strcat( &str, si->name ); + + char *L = vg_strch( &str, 'L' ); + if( !L ) continue; + u32 len = L-tmp; + + for( i32 j=i+1; jbone_count; j ++ ){ + struct skeleton_bone *sj = &sk->bones[j]; + + if( !strncmp( si->name, sj->name, len ) ){ + if( sj->name[len] == 'R' ){ + localplayer.skeleton_mirror[i] = j; + localplayer.skeleton_mirror[j] = i; + break; + } + } + } + } + setup_ragdoll_from_skeleton( sk, &localplayer.ragdoll ); /* allocate matrix buffers for localplayer and remote players */ diff --git a/player_skate.c b/player_skate.c index 94b523b..1c748dc 100644 --- a/player_skate.c +++ b/player_skate.c @@ -804,6 +804,8 @@ static void skate_apply_steering_model(void){ float rate = 26.0f, top = 1.0f; + f32 skid_target = 0.0f; + if( state->activity <= k_skate_activity_air_to_grind ){ rate = 6.0f * fabsf(steer); top = 1.5f; @@ -833,12 +835,22 @@ static void skate_apply_steering_model(void){ rate = 35.0f; top = 1.5f; } - + else { + f32 skid = axis_state(k_sraxis_skid); + if( fabsf(skid) > 0.1f ){ + skid_target = skid; + } + } + if( grab < 0.5f ){ top *= 1.0f+v3_length( state->throw_v )*k_mmthrow_steer; } } + vg_slewf( &state->skid, skid_target, k_rb_delta*(1.0f/0.1f) ); + steer = vg_lerpf( steer, state->skid*k_steer_ground*0.5f, + fabsf(state->skid*0.8f) ); + float current = v3_dot( localplayer.rb.to_world[1], localplayer.rb.w ), addspeed = (steer * -top) - current, maxaccel = rate * k_rb_delta, @@ -872,14 +884,19 @@ static void skate_apply_friction_model(void){ state->slip = slip; state->reverse = -vg_signf(vel[2]); + f32 lat = k_friction_lat; + + if( fabsf(axis_state(k_sraxis_skid)) > 0.1f ){ + lat = k_friction_lat * 2.0f; + } + vel[0] += vg_cfrictf( vel[0], k_friction_lat * k_rb_delta ); vel[2] += vg_cfrictf( vel[2], k_friction_resistance * k_rb_delta ); /* Pushing additive force */ - if( !button_press( k_srbind_jump ) ){ - if( button_press( k_srbind_push ) || (vg.time-state->start_push<0.75) ) - { + if( !button_press( k_srbind_jump ) && (fabsf(state->skid)<0.1f) ){ + if( button_press( k_srbind_push ) || (vg.time-state->start_push<0.75) ){ if( (vg.time - state->cur_push) > 0.25 ) state->start_push = vg.time; @@ -2697,7 +2714,6 @@ static void player__skate_animate(void){ v3f cam_offset; v3_mul( animator->offset, (v3f){1.0f,0.3f,1.0f}, cam_offset ); - v3_copy( cam_offset, localplayer.cam_control.tpv_offset_extra ); /* localized vectors */ m4x3_mulv( localplayer.rb.to_local, state->cog, animator->local_cog ); @@ -2711,24 +2727,34 @@ static void player__skate_animate(void){ { float desired = 0.0f; if( state->activity == k_skate_activity_ground ) - desired = vg_clampf( fabsf( state->slip ), 0.0f, 1.0f ); + desired = vg_clampf( vg_maxf(fabsf( state->slip ), + fabsf( state->skid ) ), 0.0f, 1.0f ); animator->slide = vg_lerpf( animator->slide, desired, 2.4f*vg.time_delta); + + f32 dirx = 0.0f; + if( fabsf(state->slip) > fabsf(dirx) ) dirx = state->slip; + if( fabsf(state->skid) > fabsf(dirx) ) dirx = state->skid; + if( fabsf( dirx ) > 0.025f ) dirx = vg_signf( dirx ); + dirx = vg_signf( state->slip ); + vg_slewf( &animator->x, dirx, 2.6f*vg.time_delta ); } + + cam_offset[0] += animator->slide * -animator->x; + v3_copy( cam_offset, localplayer.cam_control.tpv_offset_extra ); /* movement information */ int iair = state->activity <= k_skate_activity_air_to_grind; float dirz = state->reverse > 0.0f? 0.0f: 1.0f, - dirx = state->slip < 0.0f? 0.0f: 1.0f, - fly = iair? 1.0f: 0.0f, + fly = iair? 1.0f: 0.0f, wdist= player_skate.weight_distribution[2] / k_board_length; if( state->activity >= k_skate_activity_grind_any ) wdist = 0.0f; animator->z = vg_lerpf( animator->z, dirz, 2.4f*vg.time_delta ); - animator->x = vg_lerpf( animator->x, dirx, 0.6f*vg.time_delta ); + animator->skid = state->skid; animator->fly = vg_lerpf( animator->fly, fly, 3.4f*vg.time_delta ); animator->weight = vg_lerpf( animator->weight, wdist, 9.0f*vg.time_delta ); @@ -2843,10 +2869,14 @@ static void player__skate_animate(void){ animator->grabbing = state->grabbing; /* steer */ - joystick_state( k_srjoystick_steer, animator->steer ); + v2f steer; + joystick_state( k_srjoystick_steer, steer ); + animator->airdir = vg_lerpf( animator->airdir, + -steer[0], 2.4f*vg.time_delta ); - animator->airdir = vg_lerpf( animator->airdir, -animator->steer[0], - 2.4f*vg.time_delta ); + animator->steer[0] = steer[0]; + animator->steer[1] = vg_lerpf( animator->steer[1], + steer[0], 4.0f*vg.time_delta ); /* flip angle */ @@ -2962,8 +2992,28 @@ static void player__skate_pose( void *_animator, player_pose *pose ){ skeleton_lerp_pose( sk, apose, bpose, stand_blend, apose ); /* sliding */ - skeleton_sample_anim( sk, player_skate.anim_slide, animator->x * 0.5f, - bpose ); + f32 slide_frame = animator->x * 0.25f + 0.25f; + skeleton_sample_anim( sk, player_skate.anim_slide, slide_frame, bpose ); + + mdl_keyframe mirrored[32]; + for( u32 i=1; ibone_count; i ++ ){ + + mdl_keyframe *dest = &mirrored[i-1]; + u8 mapping = localplayer.skeleton_mirror[i]; + + if( mapping ) *dest = bpose[mapping-1]; /* R */ + else *dest = bpose[i-1]; /* L */ + + dest->co[2] *= -1.0f; + dest->q[0] *= -1.0f; + dest->q[1] *= -1.0f; + } + skeleton_lerp_pose( sk, bpose, mirrored, animator->z, bpose ); + + + + + skeleton_lerp_pose( sk, apose, bpose, animator->slide, apose ); if( animator->reverse > 0.0f ){ @@ -3118,7 +3168,8 @@ static void player__skate_pose( void *_animator, player_pose *pose ){ *kf_elbow_l = &pose->keyframes[localplayer.id_ik_elbow_l-1], *kf_elbow_r = &pose->keyframes[localplayer.id_ik_elbow_r-1], *kf_hand_l = &pose->keyframes[localplayer.id_ik_hand_l-1], - *kf_hand_r = &pose->keyframes[localplayer.id_ik_hand_r-1]; + *kf_hand_r = &pose->keyframes[localplayer.id_ik_hand_r-1], + *kf_hip = &pose->keyframes[localplayer.id_hip-1]; float warble = perlin1d( vg.time, 2.0f, 2, 300 ); warble *= vg_maxf(animator->grind, fabsf(animator->weight)) * 0.3f; @@ -3141,6 +3192,52 @@ static void player__skate_pose( void *_animator, player_pose *pose ){ q_inv( qrot, qrot ); q_mul( qrot, kf_head->q, kf_head->q ); q_normalize( kf_head->q ); + + + /* hand placement */ + + u32 hand_id = animator->z < 0.5f? + localplayer.id_ik_hand_l: localplayer.id_ik_hand_r; + + v3f sample_co; + m4x3f mmdl; + q_m3x3( pose->root_q, mmdl ); + q_mulv( pose->root_q, pose->keyframes[hand_id-1].co, mmdl[3] ); + v3_add( mmdl[3], pose->root_co, mmdl[3] ); + m4x3_mulv( mmdl, sk->bones[hand_id].co, sample_co ); + + v3_muladds( sample_co, mmdl[1], 0.3f, sample_co ); + vg_line_point( sample_co, 0.04f, 0xff0000ff ); + + v3f dir; + v3_muls( mmdl[1], -1.0f, dir ); + ray_hit hit = { .dist = 1.5f }; + if(ray_world( world_current_instance(), sample_co, dir, &hit, 0 )){ + vg_line_cross( hit.pos, 0xff0000ff, 0.05f ); + vg_line( sample_co, hit.pos, 0xffffffff ); + + f32 amt = vg_maxf( 0.0f, animator->slide-0.5f ) * + 2.0f * fabsf(animator->z*2.0f-1.0f); + + f32 d = (hit.dist - 0.3f) * amt; + pose->keyframes[hand_id-1].co[1] -= d; + kf_hip->co[1] -= d*0.4f; + } + + /* skid */ + f32 amt = vg_maxf(0.0f, (animator->slide - 0.5f) * 2.0f); + u8 skidders[] = { localplayer.id_ik_foot_l, + localplayer.id_ik_foot_r, + localplayer.id_board }; + v4f qskid; + q_axis_angle( qskid, (v3f){0,1,0}, -animator->steer[1]*0.2f ); + + for( u32 i=0; ikeyframes[ skidders[i]-1 ]; + keyframe_rotate_around( kf, + (v3f){0,0,0.4f*(animator->z*2.0f-1.0f)*amt}, + sk->bones[skidders[i]].co, qskid ); + } } } @@ -3271,7 +3368,7 @@ static void player__skate_animator_exchange( bitpack_ctx *ctx, void *data ){ bitpack_qv3f( ctx, 8, -1.0f, 1.0f, animator->offset ); bitpack_qv3f( ctx, 8, -1.0f, 1.0f, animator->local_cog ); bitpack_qf32( ctx, 8, 0.0f, 1.0f, &animator->slide ); - bitpack_qf32( ctx, 8, -1.0f, 1.0f, &animator->z ); + bitpack_qf32( ctx, 8, 0.0f, 1.0f, &animator->z ); bitpack_qf32( ctx, 8, -1.0f, 1.0f, &animator->x ); /* these could likely be pressed down into single bits if needed */ diff --git a/player_skate.h b/player_skate.h index 8af645b..04978ae 100644 --- a/player_skate.h +++ b/player_skate.h @@ -79,7 +79,7 @@ struct player_skate{ v3f land_normal; v4f smoothed_rotation; - f32 velocity_limit, grind_y_start; + f32 velocity_limit, grind_y_start, skid; } state; @@ -92,6 +92,7 @@ struct player_skate{ local_cog; f32 slide, + skid, z, x, fly,