- player->camera_type_blend =
- vg_lerpf( player->camera_type_blend,
- (player->camera_mode == k_cam_firstperson)? 1.0f: 0.0f,
- 5.0f * vg.frame_delta );
- float t = player->camera_type_blend;
-
- v3f p0, p1, a0, a1;
- v3_lerp( player->follow_pos, player->override_pos,
- player->cam_position_override_strength, p1 );
- camera_lerp_angles( player->follow_angles, player->override_angles,
- player->cam_angles_override_strength, a1 );
-
- v3_copy( player->fpv_pos, p0 );
- v3_copy( player->fpv_angles, a0 );
-
- v3_lerp( p0, p1, player->camera_type_blend, player->cam.pos );
- camera_lerp_angles( a0, a1, player->camera_type_blend, player->cam.angles );
-
-
-#endif
- /* FIXME: cl_fov */
-
-#if 0
- 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;
-#endif
+ v3_lerp( tpv_pos, fpv_pos, cc->camera_type_blend, localplayer.cam.pos );
+ v3_copy( localplayer.angles, localplayer.cam.angles );
+
+ /* Camera shake */
+ f32 speed = v3_length(localplayer.rb.v),
+ strength = k_cam_shake_strength * speed;
+ localplayer.cam_trackshake +=
+ speed*k_cam_shake_trackspeed*vg.time_frame_delta;
+
+ v2f rnd = {vg_perlin_fract_1d( localplayer.cam_trackshake, 1.0f, 4, 20 ),
+ vg_perlin_fract_1d( localplayer.cam_trackshake, 1.0f, 4, 63 ) };
+ v2_muladds( localplayer.cam.angles, rnd, strength, localplayer.cam.angles );
+
+ v3f Fd, Fs, F;
+ v3_muls( localplayer.cam_land_punch_v, -k_cam_damp, Fd );
+ v3_muls( localplayer.cam_land_punch, -k_cam_spring, Fs );
+ v3_muladds( localplayer.cam_land_punch, localplayer.cam_land_punch_v,
+ vg.time_frame_delta, localplayer.cam_land_punch );
+ v3_add( Fd, Fs, F );
+ v3_muladds( localplayer.cam_land_punch_v, F, vg.time_frame_delta,
+ localplayer.cam_land_punch_v );
+ v3_add( localplayer.cam_land_punch, localplayer.cam.pos,
+ localplayer.cam.pos );