X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_common.c;h=169cbf4ba5f7640b0708f7c7966e1a0bba0c5a12;hb=cb1d2f9fbec8a274aaf7a80c5fb552b928148b1e;hp=4cb1a0bd77c5650187b7c884a365404fa1b5f15b;hpb=16f58e6b8d79762919000b9ae8266ad55a01a870;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/player_common.c b/player_common.c index 4cb1a0b..169cbf4 100644 --- a/player_common.c +++ b/player_common.c @@ -1,8 +1,12 @@ #ifndef PLAYER_COMMON_C #define PLAYER_COMMON_C +#include "ent_skateshop.h" #include "player.h" #include "conf.h" +#include "input.h" +#include "menu.h" +#include "vg/vg_perlin.h" VG_STATIC void player_vector_angles( v3f angles, v3f v, float C, float k ) { @@ -42,7 +46,7 @@ VG_STATIC void player_camera_portal_correction( player_instance *player ) vg_success( "Plane cleared\n" ); player_apply_transport_to_cam( player->gate_waiting->transport ); player->gate_waiting = NULL; - player->viewable_world = get_active_world(); + player->viewable_world = world_current_instance(); } else{ /* de-transform camera and player back */ @@ -56,8 +60,6 @@ VG_STATIC void player_camera_portal_correction( player_instance *player ) } } -static v3f TEMP_TPV_EXTRA; - VG_STATIC void player__cam_iterate( player_instance *player ) { struct player_avatar *av = player->playeravatar; @@ -85,17 +87,17 @@ VG_STATIC void player__cam_iterate( player_instance *player ) player->cam_velocity_influence_smooth = vg_lerpf( player->cam_velocity_influence_smooth, player->cam_velocity_influence, - vg.frame_delta * 8.0f ); + vg.time_frame_delta * 8.0f ); player->cam_velocity_coefficient_smooth = vg_lerpf( player->cam_velocity_coefficient_smooth, player->cam_velocity_coefficient, - vg.frame_delta * 8.0f ); + vg.time_frame_delta * 8.0f ); player->cam_velocity_constant_smooth = vg_lerpf( player->cam_velocity_constant_smooth, player->cam_velocity_constant, - vg.frame_delta * 8.0f ); + vg.time_frame_delta * 8.0f ); enum camera_mode target_mode = player->camera_mode; @@ -105,20 +107,20 @@ VG_STATIC void player__cam_iterate( player_instance *player ) player->camera_type_blend = vg_lerpf( player->camera_type_blend, (target_mode == k_cam_firstperson)? 1.0f: 0.0f, - 5.0f * vg.frame_delta ); + 5.0f * vg.time_frame_delta ); v3_lerp( player->fpv_viewpoint_smooth, player->fpv_viewpoint, - vg.frame_delta * 8.0f, player->fpv_viewpoint_smooth ); + vg.time_frame_delta * 8.0f, player->fpv_viewpoint_smooth ); v3_lerp( player->fpv_offset_smooth, player->fpv_offset, - vg.frame_delta * 8.0f, player->fpv_offset_smooth ); + vg.time_frame_delta * 8.0f, player->fpv_offset_smooth ); v3_lerp( player->tpv_offset_smooth, player->tpv_offset, - vg.frame_delta * 8.0f, player->tpv_offset_smooth ); + vg.time_frame_delta * 8.0f, player->tpv_offset_smooth ); /* fov -- simple blend */ - float fov_skate = vg_lerpf( 97.0f, 135.0f, cl_fov ), - fov_walk = vg_lerpf( 90.0f, 110.0f, cl_fov ); + float fov_skate = vg_lerpf( 97.0f, 135.0f, k_fov ), + fov_walk = vg_lerpf( 90.0f, 110.0f, k_fov ); player->cam.fov = vg_lerpf( fov_walk, fov_skate, player->camera_type_blend ); @@ -135,7 +137,7 @@ VG_STATIC void player__cam_iterate( player_instance *player ) /* angles */ v3f velocity_angles; - v3_lerp( player->cam_velocity_smooth, player->rb.v, 4.0f*vg.frame_delta, + v3_lerp( player->cam_velocity_smooth, player->rb.v, 4.0f*vg.time_frame_delta, player->cam_velocity_smooth ); v3f velocity_local; @@ -163,7 +165,7 @@ VG_STATIC void player__cam_iterate( player_instance *player ) * it is done in the local basis then transformed back */ v3f future; - v3_muls( player->rb.v, 0.4f*vg.frame_delta, future ); + v3_muls( player->rb.v, 0.4f*vg.time_frame_delta, future ); m3x3_mulv( player->invbasis, future, future ); v3f camera_follow_dir = @@ -189,7 +191,7 @@ VG_STATIC void player__cam_iterate( player_instance *player ) v3f pco; v4f pq; rb_extrapolate( &player->rb, pco, pq ); - v3_lerp( player->tpv_lpf, pco, 20.0f*vg.frame_delta, player->tpv_lpf ); + v3_lerp( player->tpv_lpf, pco, 20.0f*vg.time_frame_delta, player->tpv_lpf ); /* now move into world */ @@ -207,11 +209,24 @@ VG_STATIC void player__cam_iterate( player_instance *player ) v3_lerp( tpv_pos, fpv_pos, player->camera_type_blend, player->cam.pos ); v3_copy( player->angles, player->cam.angles ); - float Fd = -player->cam_land_punch_v * k_cam_damp, - Fs = -player->cam_land_punch * k_cam_spring; - player->cam_land_punch += player->cam_land_punch_v * vg.frame_delta; - player->cam_land_punch_v += ( Fd + Fs ) * vg.frame_delta; - player->cam.angles[1] += player->cam_land_punch; + /* Camera shake */ + f32 speed = v3_length(player->rb.v), + strength = k_cam_shake_strength * speed; + player->cam_trackshake += speed*k_cam_shake_trackspeed*vg.time_frame_delta; + + v2f rnd = {perlin1d( player->cam_trackshake, 1.0f, 4, 20 ), + perlin1d( player->cam_trackshake, 1.0f, 4, 63 ) }; + v2_muladds( player->cam.angles, rnd, strength, player->cam.angles ); + + v3f Fd, Fs, F; + v3_muls( player->cam_land_punch_v, -k_cam_damp, Fd ); + v3_muls( player->cam_land_punch, -k_cam_spring, Fs ); + v3_muladds( player->cam_land_punch, player->cam_land_punch_v, + vg.time_frame_delta, player->cam_land_punch ); + v3_add( Fd, Fs, F ); + v3_muladds( player->cam_land_punch_v, F, vg.time_frame_delta, + player->cam_land_punch_v ); + v3_add( player->cam_land_punch, player->cam.pos, player->cam.pos ); /* override camera */ player->cam.angles[0] = @@ -222,6 +237,37 @@ VG_STATIC void player__cam_iterate( player_instance *player ) player->cam_override_strength ); v3_lerp( player->cam.pos, player->cam_override_pos, player->cam_override_strength, player->cam.pos ); + player->cam.fov = vg_lerpf( player->cam.fov, player->cam_override_fov, + player->cam_override_strength ); + + + if( k_cinema >= 0.0001f ){ + ent_camera *cam = NULL; + f32 min_dist = k_cinema; + + world_instance *world = player->viewable_world; + for( u32 i=0; ient_camera); i++ ){ + ent_camera *c = mdl_arritm(&world->ent_camera,i); + + f32 dist = v3_dist( c->transform.co, player->rb.co ); + + if( dist < min_dist ){ + min_dist = dist; + cam = c; + } + } + + if( cam ){ + player->cam.fov = cam->fov; + v3_copy( cam->transform.co, player->cam.pos ); + v3f v0; + if( k_cinema_fixed ) + mdl_transform_vector( &cam->transform, (v3f){0.0f,-1.0f,0.0f}, v0 ); + else v3_sub( player->rb.co, cam->transform.co, v0 ); + m3x3_mulv( player->invbasis, v0, v0 ); + player_vector_angles( player->cam.angles, v0, 1.0f, 0.0f ); + } + } /* portal transitions */ player_camera_portal_correction( player ); @@ -229,49 +275,40 @@ VG_STATIC void player__cam_iterate( player_instance *player ) VG_STATIC void player_look( player_instance *player, v3f angles ) { + if( vg_ui.wants_mouse ) return; + + float sensitivity = 1.0f-menu.factive; + angles[2] = 0.0f; v2f mouse_input; v2_copy( vg.mouse_delta, mouse_input ); - if( cl_invert_y ) - mouse_input[1] *= -1.0f; - v2_muladds( angles, mouse_input, 0.0025f, angles ); + if( k_invert_y ) mouse_input[1] *= -1.0f; + v2_muladds( angles, mouse_input, 0.0025f * sensitivity, angles ); - if( vg_input.controller_should_use_trackpad_look ){ - static v2f last_input; - static v2f vel; - static v2f vel_smooth; + v2f jlook; + joystick_state( k_srjoystick_look, jlook ); - v2f input = { player->input_js2h->axis.value, - player->input_js2v->axis.value }; + angles[0] += jlook[0] * vg.time_delta * 4.0f * sensitivity; + float input_y = jlook[1] * vg.time_delta * 4.0f; + if( k_invert_y ) input_y *= -1.0f; - if( cl_invert_y ) - input[1] *= -1.0f; - - 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( angles, vel_smooth, vg.time_delta, angles ); - v2_copy( input, last_input ); - } - else{ - angles[0] += player->input_js2h->axis.value * vg.time_delta * 4.0f; + angles[1] += input_y * sensitivity; + angles[1] = vg_clampf( angles[1], -VG_PIf*0.5f, VG_PIf*0.5f ); +} - float input_y = player->input_js2v->axis.value * vg.time_delta * 4.0f; - if( cl_invert_y ) - input_y *= -1.0f; +struct player_board *player_get_player_board( struct player_instance *player ) +{ + struct player_board *board = NULL; - angles[1] += input_y; + if( localplayer.board_view_slot ){ + struct cache_board *cache_view = localplayer.board_view_slot; + if( cache_view->state == k_cache_board_state_loaded ){ + board = &cache_view->board; + } } - angles[1] = vg_clampf( angles[1], -VG_PIf*0.5f, VG_PIf*0.5f ); + return board; } #endif /* PLAYER_COMMON_C */