X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_common.c;h=0c76d8df5496117dedfcde8e235279d1c35c10b1;hb=7fb47c3eb672f4468da8b5b452c09d44e1389d5f;hp=4991d231a31f00671635c154c246f9d0b1643e87;hpb=5f34184cad016aa2f8ea530b3be009703459e981;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_common.c b/player_common.c
index 4991d23..0c76d8d 100644
--- a/player_common.c
+++ b/player_common.c
@@ -1,12 +1,12 @@
 #ifndef PLAYER_COMMON_C
 #define PLAYER_COMMON_C
 
+#include "ent_skateshop.h"
 #include "player.h"
 #include "conf.h"
-
-VG_STATIC float
-   k_cam_spring            = 20.0f,
-   k_cam_damp              = 6.7f;
+#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 )
 {
@@ -46,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 */
@@ -60,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;
@@ -211,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.time_frame_delta;
-   player->cam_land_punch_v += ( Fd + Fs ) * vg.time_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] = 
@@ -235,49 +246,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( cl_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 };
-
-      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 );
-      }
+   angles[0] += jlook[0] * vg.time_delta * 4.0f * sensitivity;
+   float input_y = jlook[1] * vg.time_delta * 4.0f;
+   if( cl_invert_y ) input_y *= -1.0f;
 
-      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 */