X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=player.h;h=b2a69bd4090ec7a6b157324f49051d2497076366;hb=297468e5a3cc8c7805c16fdd615f42f3876eb908;hp=92667821e84363b2ffda5c4134e9a6cc637c31d0;hpb=0ae443b3f6b4b753f9a2eba58da597ae8cb14b4f;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player.h b/player.h index 9266782..b2a69bd 100644 --- a/player.h +++ b/player.h @@ -2,6 +2,10 @@ * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved */ +/* + * TODO: Tilt camera down to face borde when its behind you or out of vision + */ + #ifndef PLAYER_H #define PLAYER_H @@ -14,7 +18,9 @@ #include "bvh.h" VG_STATIC float - k_walkspeed = 20.0f, /* no longer used */ + k_walkspeed = 12.0f, + k_air_accelerate = 20.0f, + k_runspeed = 20.0f, k_board_radius = 0.3f, k_board_length = 0.45f, @@ -29,7 +35,7 @@ VG_STATIC float k_steer_air = 3.6f, k_steer_air_lerp = 0.3f, k_pump_force = 0.0f, - k_downforce = 5.0f, + k_downforce = 8.0f, k_walk_downforce = 8.0f, k_jump_charge_speed = (1.0f/1.0f), k_jump_force = 5.0f, @@ -62,12 +68,15 @@ VG_STATIC struct gplayer v3f a, v_last, m, bob, vl; /* Utility */ - float vswitch, slip, slip_last, - reverse; + float vswitch, slip, slip_last, reverse; float grab, jump, pushing, push_time; + v2f grab_mouse_delta; + + int lift_frames; + double start_push; - int in_air, on_board, jump_charge, jump_dir; + int in_air, on_board, jump_charge, jump_dir, grind; m3x3f vr,vr_pstep; } @@ -81,12 +90,32 @@ VG_STATIC struct gplayer int rewind_sound_wait; v3f land_target; - v3f land_target_log[22]; - u32 land_target_colours[22]; + + struct land_log + { + v3f positions[50]; + u32 colour; + int count; + } + land_log[22]; int land_log_count; v3f handl_target, handr_target, handl, handr; + + /* Input */ + struct input_binding *input_js1h, + *input_js1v, + *input_js2h, + *input_js2v, + *input_jump, + *input_push, + *input_walk, + *input_walkh, + *input_walkv, + *input_switch_mode, + *input_reset, + *input_grab; /* Camera */ float air_blend; @@ -120,7 +149,8 @@ VG_STATIC struct gplayer walk_timer, fjump, fonboard, - frun; + frun, + fgrind; float walk; int step_phase; @@ -189,6 +219,8 @@ VG_STATIC void player_save_rewind_frame(void); /* * Submodules */ +VG_STATIC void player_mouseview(void); + #include "player_physics.h" #include "player_ragdoll.h" #include "player_model.h" @@ -203,6 +235,66 @@ VG_STATIC void player_save_rewind_frame(void); VG_STATIC void player_init(void) /* 1 */ { + player.input_js1h = vg_create_named_input( "steer-h", k_input_type_axis ); + player.input_js1v = vg_create_named_input( "steer-v", k_input_type_axis ); + player.input_grab = vg_create_named_input( "grab", k_input_type_axis_norm ); + player.input_js2h = vg_create_named_input( "grab-h", k_input_type_axis ); + player.input_js2v = vg_create_named_input( "grab-v", k_input_type_axis ); + player.input_jump = vg_create_named_input( "jump", k_input_type_button ); + player.input_push = vg_create_named_input( "push", k_input_type_button ); + player.input_walk = vg_create_named_input( "walk", k_input_type_button ); + + player.input_walkh = vg_create_named_input( "walk-h", + k_input_type_axis ); + player.input_walkv = vg_create_named_input( "walk-v", + k_input_type_axis ); + + + player.input_switch_mode = vg_create_named_input( "switch-mode", + k_input_type_button ); + player.input_reset = vg_create_named_input( "reset", k_input_type_button ); + + const char *default_cfg[] = + { + "bind steer-h gp-ls-h", + "bind -steer-h a", + "bind +steer-h d", + + "bind steer-v gp-ls-v", + "bind -steer-v w", + "bind +steer-v s", + + "bind grab gp-rt", + "bind +grab shift", + "bind grab-h gp-rs-h", + "bind grab-v gp-rs-v", + + "bind jump space", + "bind jump gp-a", + + "bind push gp-b", + "bind push w", + + "bind walk shift", + "bind walk gp-ls", + + "bind walk-h gp-ls-h", + "bind walk-v -gp-ls-v", + "bind +walk-h d", + "bind -walk-h a", + "bind +walk-v w", + "bind -walk-v s", + + "bind reset gp-lb", + "bind reset r", + + "bind switch-mode gp-y", + "bind switch-mode e", + }; + + for( int i=0; iaxis.value, + player.input_js2v->axis.value }; + + if( (v2_length2(last_input) > 0.001f) && (v2_length2(input) > 0.001f) ) + { + v2_sub( input, last_input, vel ); + v2_muls( vel, 1.0f/vg.time_delta, vel ); + } + else + { + v2_zero( vel ); + } + + v2_lerp( vel_smooth, vel, vg.time_delta*8.0f, vel_smooth ); + + v2_muladds( player.angles, vel_smooth, vg.time_delta, player.angles ); + v2_copy( input, last_input ); + } + else + { + player.angles[0] += player.input_js2h->axis.value * vg.time_delta * 4.0f; + player.angles[1] += player.input_js2v->axis.value * vg.time_delta * 4.0f; + } + + player.angles[1] = vg_clampf( player.angles[1], -VG_PIf*0.5f, VG_PIf*0.5f ); +} + /* Deal with input etc */ VG_STATIC void player_update_pre(void) { @@ -299,7 +450,7 @@ VG_STATIC void player_update_pre(void) return; } - if( vg_get_button_down( "reset" ) ) + if( vg_input_button_down( player.input_reset ) && !menu_enabled() ) { if( player.is_dead ) { @@ -363,7 +514,7 @@ VG_STATIC void player_update_pre(void) } } - if( vg_get_button_down( "switchmode" ) ) + if( vg_input_button_down( player.input_switch_mode ) && !menu_enabled() ) { phys->on_board ^= 0x1; @@ -380,9 +531,12 @@ VG_STATIC void player_update_pre(void) audio_unlock(); } + + if( !phys->on_board ) + player_mouseview(); } -VG_STATIC void player_update_fixed(void) /* 2 */ +VG_STATIC void player_update_fixed(void) /* 2 */ { if( player.rewinding ) return; @@ -412,8 +566,14 @@ VG_STATIC void player_update_fixed(void) /* 2 VG_STATIC void player_update_post(void) { for( int i=0; icount - 1; j ++ ) + vg_line( log->positions[j], log->positions[j+1], log->colour ); + + vg_line_cross( log->positions[log->count-1], log->colour, 0.25f ); + } if( player.is_dead ) {