camera shake

diff --git a/player.c b/player.c
index 6c610aeda2114a73047a1d46984742405b4db70f..e000c513b5f140c4cc5e7167c2b148f8cf526aec 100644 (file)
--- a/player.c
+++ b/player.c
@@ -38,6 +38,8 @@ VG_STATIC void player_init(void)
    VG_VAR_F32( k_cam_damp );
    VG_VAR_F32( k_cam_spring );
    VG_VAR_F32( k_cam_punch );
+   VG_VAR_F32( k_cam_shake_strength );
+   VG_VAR_F32( k_cam_shake_trackspeed );
 }
 
 PLAYER_API

diff --git a/player.h b/player.h
index 984fcef7cf6489a1ab1db7beadb605d3a4a72888..3039bd7991284608ef949713b208dc0cb4de2f7a 100644 (file)
--- a/player.h
+++ b/player.h
@@ -49,6 +49,7 @@ struct player_instance
    v3f cam_override_angles;
    float cam_override_fov;
    float cam_override_strength;
+   f32 cam_trackshake;
 
    float cam_velocity_influence,
          cam_velocity_coefficient,

diff --git a/player_common.c b/player_common.c
index c9cf3b7388e1bee9d7966764d4920b0dc760682f..0c76d8df5496117dedfcde8e235279d1c35c10b1 100644 (file)
--- a/player_common.c
+++ b/player_common.c
@@ -6,6 +6,7 @@
 #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 )
 {
@@ -208,6 +209,15 @@ 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 );
 
+   /* 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 );

diff --git a/player_common.h b/player_common.h
index 285a3dec0537e74c9c357ee320391ca3f42242d1..ab982289db1e72696d85be059fc07745b73ac921 100644 (file)
--- a/player_common.h
+++ b/player_common.h
@@ -8,7 +8,9 @@ static v3f TEMP_TPV_EXTRA; /* TODO: what? */
 VG_STATIC float
    k_cam_spring            =  20.0f,
    k_cam_damp              =  6.7f,
-   k_cam_punch             = -1.0f;
+   k_cam_punch             = -1.0f,
+   k_cam_shake_strength    =  1.0f,
+   k_cam_shake_trackspeed  =  1.0f;
 
 VG_STATIC void player_look( player_instance *player, v3f angles );
 VG_STATIC void player__cam_iterate( player_instance *player );