feat: make tas raw interpolation less invasive

in order to avoid potential playback issues, since this feature is
purely for presentational purposes, it has been modified to override
client-side behaviour to take those extra mouse samples into account,
without affecting server simulation at all.

...also the previous implementation was straight up bugged lmao

Author: Krzyhau

docs/cvars.md

@@ -633,7 +633,7 @@
 |sar_tas_stop|cmd|sar_tas_stop - stop TAS playing|
 |sar_tas_tools_enabled|1|Enables tool processing for TAS script making.|
 |sar_tas_tools_force|0|Force tool playback for TAS scripts; primarily for debugging.|
-|sar_tas_use_raw_interpolation|0|Allows TAS controller to perform extra mouse samples to make camera movement more smooth. Can affect raw playback outcome!|
+|sar_tas_use_raw_interpolation|1|Overrides camera and viewmodel to use offset based on extra mouse samples during raw TAS playback.|
 |sar_teleport|cmd|sar_teleport [noportals] - teleports the player to the last saved location|
 |sar_teleport_setpos|cmd|sar_teleport_setpos - saves current location for teleportation|
 |sar_tick_debug|0|Output debugging information to the console related to ticks and frames.|

src/Features/Camera.cpp

@@ -405,6 +405,12 @@ void Camera::OverrideView(ViewSetup *m_View) {
 	float real_frame_time = std::chrono::duration_cast<std::chrono::duration<float>>(now - last_frame).count();
 	last_frame = now;
 
+	if (tasPlayer->IsRunning() && !tasPlayer->IsUsingTools() && sar_tas_use_raw_interpolation.GetBool()) {
+		auto offset = tasControllers[GET_SLOT()]->GetExtraMouseSamplesAngles();
+		m_View->angles.x += offset.x;
+		m_View->angles.y += offset.y;
+	}
+
 	if (sar_cam_force_eye_pos.GetBool() && sv_cheats.GetBool()) {
 		Vector eyePos;
 		QAngle eyeAng;

src/Features/Tas/TasController.cpp

@@ -19,7 +19,7 @@ const int g_TasControllerInGameButtons[] = {
 };
 
 Variable sar_tas_real_controller_debug("sar_tas_real_controller_debug", "0", 0, 4, "Debugs controller.\n");
-Variable sar_tas_use_raw_interpolation("sar_tas_use_raw_interpolation", "0", "Allows TAS controller to perform extra mouse samples to make camera movement more smooth. Can affect raw playback outcome!\n");
+Variable sar_tas_use_raw_interpolation("sar_tas_use_raw_interpolation", "1", "Overrides camera and viewmodel to use offset based on extra mouse samples during raw TAS playback.\n");
 
 TasController *tasControllers[2];
 
@@ -108,12 +108,18 @@ void TasController::SetButtonState(TasControllerInput i, bool state) {
 	btn->state = state;
 }
 
+QAngle TasController::GetExtraMouseSamplesAngles() {
+	// setting those to set angles is tricky and breaks compability, we can thank
+	// altticks and floating point arithmetics for that. Instead, we're overriding
+	// client-side behaviour only to simply make raw present better.
+	return extraMouseSamplesAngles;
+}
+
 std::chrono::time_point<std::chrono::high_resolution_clock> g_lastControllerMove;
 
 void TasController::ControllerMove(int nSlot, float flFrametime, CUserCmd *cmd) {
 	// ControllerMove is executed several times for one tick. Most of them
 	// are called from ExtraMouseSamples with 0 tick count. We want to filter them out.
-	bool wasInExtraMouseSamples = inExtraMouseSamples;
 	inExtraMouseSamples = cmd->tick_count == 0;
 
 	// doing some debugs to test the behaviour of the real controller
@@ -142,29 +148,19 @@ void TasController::ControllerMove(int nSlot, float flFrametime, CUserCmd *cmd)
 
 	//console->Print("TasController::ControllerMove (%d, ", cmd->tick_count);
 
-	if (!sar_tas_use_raw_interpolation.GetBool()) {
-		// without raw interpolation, treat is as if extra mouse samples never happened
-		wasInExtraMouseSamples = false;
-		if (inExtraMouseSamples) {
-			return;
-		}
-	}
-
-	if (inExtraMouseSamples && !tasPlayer->IsUsingTools()) {
-		if (!wasInExtraMouseSamples) {
-			viewanglesPreExtraMouseSamples = engine->GetAngles(nSlot);
-		}
-
+	if (!inExtraMouseSamples) {
+		extraMouseSamplesAccumulatedTime = 0.0f;
+		extraMouseSamplesAngles = QAngle();
+	} else if (sar_tas_use_raw_interpolation.GetBool()) {
 		extraMouseSamplesAccumulatedTime += flFrametime;
 
 		auto extraViewAnalog = tasPlayer->FetchRawExtraViewAnalog(nSlot, extraMouseSamplesAccumulatedTime);
-		ApplyViewAnalog(nSlot, nullptr, extraViewAnalog, true);
-
-		return;
+		extraMouseSamplesAngles.x = -extraViewAnalog.y;
+		extraMouseSamplesAngles.y = -extraViewAnalog.x;
 	}
 
-	if (wasInExtraMouseSamples) {
-		extraMouseSamplesAccumulatedTime = 0.0f;
+	if (inExtraMouseSamples) {
+		return;  // further controller logic should happen only during ticks, not extra mouse samples
 	}
 
 	tasPlayer->FetchInputs(nSlot, this, cmd);
@@ -224,7 +220,7 @@ void TasController::ControllerMove(int nSlot, float flFrametime, CUserCmd *cmd)
 	// don't do this part if tools are enabled.
 	// tools processing will do it instead
 	if (!tasPlayer->IsUsingTools()) {
-		ApplyViewAnalog(nSlot, cmd, viewAnalog, wasInExtraMouseSamples);
+		ApplyViewAnalog(nSlot, cmd, viewAnalog);
 	}
 
 	{
@@ -237,14 +233,10 @@ void TasController::ControllerMove(int nSlot, float flFrametime, CUserCmd *cmd)
 	}
 }
 
-void TasController::ApplyViewAnalog(int nSlot, CUserCmd *cmd, Vector analog, bool usePreExtraMouseSampleAngles) {
+void TasController::ApplyViewAnalog(int nSlot, CUserCmd *cmd, Vector analog) {
 	QAngle viewangles;
 	viewangles = engine->GetAngles(nSlot);
 
-	if (usePreExtraMouseSampleAngles) {
-		viewangles = viewanglesPreExtraMouseSamples;
-	}
-
 	viewangles.y -= analog.x;  // positive values should rotate right.
 	viewangles.x -= analog.y;  // positive values should rotate up.
 	viewangles.x = std::min(std::max(viewangles.x, -cl_pitchdown.GetFloat()), cl_pitchup.GetFloat());

src/Features/Tas/TasController.hpp

@@ -40,7 +40,7 @@ class TasController : public Feature {
 
 	bool inExtraMouseSamples;
 	float extraMouseSamplesAccumulatedTime;
-	QAngle viewanglesPreExtraMouseSamples;
+	QAngle extraMouseSamplesAngles;
 
 public:
 	TasController();
@@ -63,15 +63,18 @@ class TasController : public Feature {
 	bool GetButtonState(TasControllerInput i);
 	void SetButtonState(TasControllerInput i, bool state);
 
+	QAngle GetExtraMouseSamplesAngles();
+
 	void ControllerMove(int nSlot, float flFrametime, CUserCmd *cmd);
 
 private:
-	void ApplyViewAnalog(int nSlot, CUserCmd *cmd, Vector analog, bool usePreExtraMouseSampleAngles);
+	void ApplyViewAnalog(int nSlot, CUserCmd *cmd, Vector analog);
 };
 
 extern TasController *tasControllers[2];
 
 extern Variable sar_tas_real_controller_debug;
+extern Variable sar_tas_use_raw_interpolation;
 
 extern Variable cl_pitchdown;
 extern Variable cl_pitchup;

src/Modules/Client.cpp

@@ -842,6 +842,12 @@ Hook g_DrawOpaqueRenderablesHook(&Client::DrawOpaqueRenderables_Hook);
 
 extern Hook g_CalcViewModelLagHook;
 DETOUR_T(void, Client::CalcViewModelLag, Vector &origin, QAngle &angles, QAngle &original_angles) {
+	if (tasPlayer->IsRunning() && !tasPlayer->IsUsingTools() && sar_tas_use_raw_interpolation.GetBool()) {
+		auto offset = tasControllers[GET_SLOT()]->GetExtraMouseSamplesAngles();
+		angles.x += offset.x;
+		angles.y += offset.y;
+	}
+
 	if (sar_disable_weapon_sway.GetBool()) {
 		return;
 	}