From f19b230169634dbc4a2de24a6bff11920e6aad28 Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Wed, 25 Jan 2023 09:24:23 +0000
Subject: [PATCH] Bit of camera tidy up

---
 .../jni/OpenJK/codeJK2/cgame/cg_camera.cpp    | 57 +++++++------------
 1 file changed, 21 insertions(+), 36 deletions(-)

diff --git a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_camera.cpp b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_camera.cpp
index 3543479..7c746e9 100644
--- a/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_camera.cpp
+++ b/Projects/Android/jni/OpenJK/codeJK2/cgame/cg_camera.cpp
@@ -1095,41 +1095,31 @@ void CGCam_Update( void )
 	//Check for roffing angles
 	if ( (client_camera.info_state & CAMERA_ROFFING) && !(client_camera.info_state & CAMERA_FOLLOWING) )
 	{
-		if (!vr->immersive_cinematics)
+		for ( i = 0; i < 3; i++ )
 		{
-			for ( i = 0; i < 3; i++ )
-			{
-				cg.refdefViewAngles[i] =  client_camera.angles[i] + ( client_camera.angles2[i] / client_camera.pan_duration ) * ( cg.time - client_camera.pan_time );
-			}
+			cg.refdefViewAngles[i] =  client_camera.angles[i] + ( client_camera.angles2[i] / client_camera.pan_duration ) * ( cg.time - client_camera.pan_time );
 		}
 	}
 	else if ( client_camera.info_state & CAMERA_PANNING )
 	{
-		if (!vr->immersive_cinematics)
-		{
-			//Note: does not actually change the camera's angles until the pan time is done!
-			if ( client_camera.pan_time + client_camera.pan_duration < cg.time )
-			{//finished panning
-				for ( i = 0; i < 3; i++ )
-				{
-					client_camera.angles[i] = AngleNormalize360( ( client_camera.angles[i] + client_camera.angles2[i] ) );
-				}
+		//Note: does not actually change the camera's angles until the pan time is done!
+		if ( client_camera.pan_time + client_camera.pan_duration < cg.time )
+		{//finished panning
+			for ( i = 0; i < 3; i++ )
+			{
+				client_camera.angles[i] = AngleNormalize360( ( client_camera.angles[i] + client_camera.angles2[i] ) );
+			}
 
-				client_camera.info_state &= ~CAMERA_PANNING;
-				VectorCopy(client_camera.angles, cg.refdefViewAngles );
-			}
-			else
-			{//still panning
-				for ( i = 0; i < 3; i++ )
-				{
-					//NOTE: does not store the resultant angle in client_camera.angles until pan is done
-					cg.refdefViewAngles[i] = client_camera.angles[i] + ( client_camera.angles2[i] / client_camera.pan_duration ) * ( cg.time - client_camera.pan_time );
-				}
-			}
+			client_camera.info_state &= ~CAMERA_PANNING;
+			VectorCopy(client_camera.angles, cg.refdefViewAngles );
 		}
 		else
-		{
-			VectorCopy(client_camera.angles, cg.refdefViewAngles);
+		{//still panning
+			for ( i = 0; i < 3; i++ )
+			{
+				//NOTE: does not store the resultant angle in client_camera.angles until pan is done
+				cg.refdefViewAngles[i] = client_camera.angles[i] + ( client_camera.angles2[i] / client_camera.pan_duration ) * ( cg.time - client_camera.pan_time );
+			}
 		}
 	}
 	else 
@@ -1221,8 +1211,10 @@ void CGCam_Update( void )
 			VectorCopy(client_camera.angles, client_camera.stored_angles);
 		}
 
-		//Copy stored angles to refdef whether they have changed or not
-		VectorCopy(client_camera.stored_angles, cg.refdefViewAngles);
+		//Copy stored YAW angle to refdef whether it has changed or not, use pitch/roll direct from the hmd
+		float yaw = client_camera.stored_angles[YAW] + (vr->hmdorientation[YAW] - vr->hmdorientation_snap[YAW]) + vr->snapTurn;
+		VectorCopy(vr->hmdorientation, cg.refdefViewAngles);
+		cg.refdefViewAngles[YAW] = yaw;
 
 		//store previous state
 		previous_client_camera = client_camera;
@@ -1237,13 +1229,6 @@ void CGCam_Update( void )
 	//Normal fading - separate call because can finish after camera is disabled
 	CGCam_UpdateFade();
 
-	if (vr->immersive_cinematics)
-	{
-		float yaw = cg.refdefViewAngles[YAW] + (vr->hmdorientation[YAW] - vr->hmdorientation_snap[YAW]) + vr->snapTurn;
-		VectorCopy(vr->hmdorientation, cg.refdefViewAngles);
-		cg.refdefViewAngles[YAW] = yaw;
-	}
-
 	//Update shaking if there's any
 	//CGCam_UpdateSmooth( cg.refdef.vieworg, cg.refdefViewAngles );
 	CGCam_UpdateShake( cg.refdef.vieworg, cg.refdefViewAngles );