- 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 );