subtick lerp view angles for scottish resistance

it's not ideal, but moving >180 is a bit hard and i don't want to break hold aim...

alternatives include server verification, delta, history log

Author: mastercoms

src/game/client/c_baseplayer.cpp

@@ -2472,14 +2472,32 @@ const QAngle& C_BasePlayer::Weapon_PunchAngle()
 		return vecCurPunch;
 	}
 
-	return Lerp( m_flInterpolationTime, m_Local.m_vecPreTickPunchAngle, vecCurPunch );
+	static QAngle vecReturnPunch;
+	vecReturnPunch.x = m_Local.m_vecPreTickPunchAngle.x + AngleDiff( vecCurPunch.x, m_Local.m_vecPreTickPunchAngle.x ) * m_flInterpolationTime;
+	vecReturnPunch.y = m_Local.m_vecPreTickPunchAngle.y + AngleDiff( vecCurPunch.y, m_Local.m_vecPreTickPunchAngle.y ) * m_flInterpolationTime;
+	vecReturnPunch.z = m_Local.m_vecPreTickPunchAngle.z + AngleDiff( vecCurPunch.z, m_Local.m_vecPreTickPunchAngle.z ) * m_flInterpolationTime;
+	return vecReturnPunch;
 }
 
 void C_BasePlayer::SetPunchAngle( const QAngle &angle )
 {
 	m_Local.m_vecPunchAngle = angle;
 }
 
+const QAngle& C_BasePlayer::Weapon_EyeAngles()
+{
+	if ( !IsInPostThink() || m_flInterpolationTime >= 1.0f )
+	{
+		return EyeAngles();
+	}
+
+	static QAngle vecReturn;
+	QAngle current = EyeAngles();
+	vecReturn.x = m_Local.m_vecPreTickEyeAngles.x + AngleDiff( current.x, m_Local.m_vecPreTickEyeAngles.x ) * m_flInterpolationTime;
+	vecReturn.y = m_Local.m_vecPreTickEyeAngles.y + AngleDiff( current.y, m_Local.m_vecPreTickEyeAngles.y ) * m_flInterpolationTime;
+	vecReturn.z = m_Local.m_vecPreTickEyeAngles.z + AngleDiff( current.z, m_Local.m_vecPreTickEyeAngles.z ) * m_flInterpolationTime;
+	return vecReturn;
+}
 
 float C_BasePlayer::GetWaterJumpTime() const
 {

src/game/client/c_baseplayer.h

@@ -331,6 +331,8 @@ class C_BasePlayer : public C_BaseCombatCharacter, public CGameEventListener
 	const QAngle& Weapon_PunchAngle();
 	void SetPunchAngle( const QAngle &angle );
 
+	const QAngle& Weapon_EyeAngles();
+
 	float					GetWaterJumpTime() const;
 	void					SetWaterJumpTime( float flWaterJumpTime );
 	float					GetSwimSoundTime( void ) const;

src/game/client/c_playerlocaldata.h

@@ -60,8 +60,9 @@ class CPlayerLocalData
 	// Base velocity that was passed in to server physics so 
 	//  client can predict conveyors correctly.  Server zeroes it, so we need to store here, too.
 	Vector					m_vecClientBaseVelocity;  
-	// Stored before command to subtick with the latest viewpunch
+	// Stored before command to subtick with the latest angles
 	QAngle m_vecPreTickPunchAngle;
+	QAngle m_vecPreTickEyeAngles;
 	CNetworkQAngle( m_vecPunchAngle );		// auto-decaying view angle adjustment
 	CInterpolatedVar< QAngle >	m_iv_vecPunchAngle;
 

src/game/client/prediction.cpp

@@ -960,8 +960,9 @@ void CPrediction::RunCommand( C_BasePlayer *player, CUserCmd *ucmd, IMoveHelper
 
 	// RUN MOVEMENT
 
-	// Store pre-tick viewpunch to lerp for subtick
+	// Store pre-tick angles to lerp for subtick
 	player->m_Local.m_vecPreTickPunchAngle = player->GetPunchAngle();
+	player->m_Local.m_vecPreTickEyeAngles = player->EyeAngles();
 
 	if ( !pVehicle )
 	{

src/game/server/player.cpp

@@ -3847,8 +3847,9 @@ void CBasePlayer::PlayerRunCommand(CUserCmd *ucmd, IMoveHelper *moveHelper)
 		}
 	}
 
-	// Store pre-tick viewpunch to lerp for subtick
+	// Store pre-tick angles to lerp for subtick
 	m_Local.m_vecPreTickPunchAngle = m_Local.m_vecPunchAngle;
+	m_Local.m_vecPreTickEyeAngles = EyeAngles();
 
 	PlayerMove()->RunCommand(this, ucmd, moveHelper);
 }
@@ -8797,7 +8798,11 @@ const QAngle& CBasePlayer::Weapon_PunchAngle()
 		return vecCurPunch;
 	}
 
-	return Lerp( m_flInterpolationTime, m_Local.m_vecPreTickPunchAngle, vecCurPunch );
+	static QAngle vecReturnPunch;
+	vecReturnPunch.x = m_Local.m_vecPreTickPunchAngle.x + AngleDiff( vecCurPunch.x, m_Local.m_vecPreTickPunchAngle.x ) * m_flInterpolationTime;
+	vecReturnPunch.y = m_Local.m_vecPreTickPunchAngle.y + AngleDiff( vecCurPunch.y, m_Local.m_vecPreTickPunchAngle.y ) * m_flInterpolationTime;
+	vecReturnPunch.z = m_Local.m_vecPreTickPunchAngle.z + AngleDiff( vecCurPunch.z, m_Local.m_vecPreTickPunchAngle.z ) * m_flInterpolationTime;
+	return vecReturnPunch;
 }
 
 
@@ -8821,6 +8826,21 @@ void CBasePlayer::SetPunchAngle( const QAngle &punchAngle )
 	}
 }
 
+const QAngle& CBasePlayer::Weapon_EyeAngles()
+{
+	if ( !IsInPostThink() || m_flInterpolationTime >= 1.0f )
+	{
+		return EyeAngles();
+	}
+
+	static QAngle vecReturn;
+	QAngle current = EyeAngles();
+	vecReturn.x = m_Local.m_vecPreTickEyeAngles.x + AngleDiff( current.x, m_Local.m_vecPreTickEyeAngles.x ) * m_flInterpolationTime;
+	vecReturn.y = m_Local.m_vecPreTickEyeAngles.y + AngleDiff( current.y, m_Local.m_vecPreTickEyeAngles.y ) * m_flInterpolationTime;
+	vecReturn.z = m_Local.m_vecPreTickEyeAngles.z + AngleDiff( current.z, m_Local.m_vecPreTickEyeAngles.z ) * m_flInterpolationTime;
+	return vecReturn;
+}
+
 //-----------------------------------------------------------------------------
 // Purpose: Apply a movement constraint to the player
 //-----------------------------------------------------------------------------

src/game/server/player.h

@@ -625,6 +625,8 @@ class CBasePlayer : public CBaseCombatCharacter
 	const QAngle& Weapon_PunchAngle();
 	void SetPunchAngle( const QAngle &punchAngle );
 
+	const QAngle& Weapon_EyeAngles();
+
 	virtual void DoMuzzleFlash();
 
 	const char *GetLastKnownPlaceName( void ) const	{ return m_szLastPlaceName; }	// return the last nav place name the player occupied

src/game/server/playerlocaldata.h

@@ -43,8 +43,9 @@ class CPlayerLocalData
 
 	Vector				m_vecOverViewpoint;			// Viewpoint overriding the real player's viewpoint
 
-	// Stored before command to subtick with the latest viewpunch
+	// Stored before command to subtick with the latest angles
 	QAngle m_vecPreTickPunchAngle;
+	QAngle m_vecPreTickEyeAngles;
 
 	// Fully ducked
 	CNetworkVar( bool, m_bDucked );

src/game/shared/tf/tf_weapon_pipebomblauncher.cpp

@@ -624,7 +624,7 @@ bool CTFPipebombLauncher::ModifyPipebombsInView( int iEffect )
 
 	// Dot product from the view angle to determine which bombs to detonate.
 	Vector vecPlayerForward;
-	AngleVectors( pPlayer->EyeAngles(), &vecPlayerForward, NULL, NULL );
+	AngleVectors( pPlayer->Weapon_EyeAngles(), &vecPlayerForward, NULL, NULL );
 	vecPlayerForward.NormalizeInPlace();
 
 	// Determine the dynamic dot product threshold based on FOV