From 0452916719b949a27335ebea752bc155a1437088 Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Thu, 12 Jan 2023 16:50:37 -0800
Subject: [PATCH] Client: add a vertical camera bobbing effect.

---
 src/client/camera.qc    | 12 +++++++++++
 src/client/viewmodel.qc |  8 +++++++
 src/shared/player.qc    | 48 +++++++++++++++++++++++++++++++++++------
 3 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/src/client/camera.qc b/src/client/camera.qc
index 1389b8d..b7fb325 100644
--- a/src/client/camera.qc
+++ b/src/client/camera.qc
@@ -77,3 +77,15 @@ Camera_StrafeRoll(__inout vector camera_angle)
 
 	camera_angle[2] += roll;
 }
+
+float Viewmodel_GetBob(void);
+
+/* tilts the camera for a head-bob like effect when moving */
+void
+Camera_RunPosBob(vector angles, __inout vector camera_pos)
+{
+	int s = (float)getproperty(VF_ACTIVESEAT);
+	pCamBob = &g_camBobVars[s];
+	makevectors(view_angles);
+	camera_pos += (v_up * Viewmodel_GetBob());
+}
diff --git a/src/client/viewmodel.qc b/src/client/viewmodel.qc
index 8df1de2..c771393 100644
--- a/src/client/viewmodel.qc
+++ b/src/client/viewmodel.qc
@@ -81,6 +81,14 @@ Viewmodel_CalcBob(void)
 	pViewBob->m_flBob *= autocvar_cg_viewmodelScale;
 }
 
+float
+Viewmodel_GetBob(void)
+{
+	int s = (float)getproperty(VF_ACTIVESEAT);
+	pViewBob = &g_viewBobVars[s];
+	return pViewBob->m_flBob;
+}
+
 void
 Viewmodel_ApplyBob(entity gun)
 {
diff --git a/src/shared/player.qc b/src/shared/player.qc
index 29a1258..7ee882b 100644
--- a/src/shared/player.qc
+++ b/src/shared/player.qc
@@ -157,14 +157,15 @@ class player:NSClientPlayer
 	//virtual float() predraw;
 	//virtual void(void) postdraw;
 	virtual void UpdatePlayerAttachments(bool);
-	virtual void(float,float) ReceiveEntity;
-	virtual void(void) PredictPreFrame;
-	virtual void(void) PredictPostFrame;
+	virtual void ReceiveEntity(float,float);
+	virtual void PredictPreFrame(void);
+	virtual void PredictPostFrame(void);
+	virtual void UpdateAliveCam(void);
 #else
-	virtual void(void) EvaluateEntity;
-	virtual float(entity, float) SendEntity;
-	virtual void(float) Save;
-	virtual void(string,string) Restore;
+	virtual void EvaluateEntity(void);
+	virtual float SendEntity(entity, float);
+	virtual void Save(float);
+	virtual void Restore(string,string);
 #endif
 };
 
@@ -181,6 +182,39 @@ player::UpdatePlayerAnimation(float timelength)
 }
 
 #ifdef CLIENT
+void Camera_RunPosBob(vector angles, __inout vector camera_pos);
+void Camera_StrafeRoll(__inout vector camera_angle);
+void Shake_Update(NSClientPlayer);
+
+void
+player::UpdateAliveCam(void)
+{
+	vector cam_pos = GetEyePos();
+	Camera_RunPosBob(view_angles, cam_pos);
+
+	g_view.SetCameraOrigin(cam_pos);
+	Camera_StrafeRoll(view_angles);
+	g_view.SetCameraAngle(view_angles);
+
+	if (vehicle) {
+		NSVehicle veh = (NSVehicle)vehicle;
+
+		if (veh.UpdateView)
+			veh.UpdateView();
+	} else if (health) {
+		if (autocvar_pm_thirdPerson == TRUE) {
+			makevectors(view_angles);
+			vector vStart = [pSeat->m_vecPredictedOrigin[0], pSeat->m_vecPredictedOrigin[1], pSeat->m_vecPredictedOrigin[2] + 16] + (v_right * 4);
+			vector vEnd = vStart + (v_forward * -48) + [0,0,16] + (v_right * 4);
+			traceline(vStart, vEnd, FALSE, this);
+			g_view.SetCameraOrigin(trace_endpos + (v_forward * 5));
+		}
+	}
+
+	Shake_Update(this);
+	g_view.AddPunchAngle(punchangle);
+}
+
 .string oldmodel;
 string Weapons_GetPlayermodel(player, int);