feat: add experimental camera smoothing in raw tas

Author: Krzyhau

src/Features/Tas/TasController.cpp

@@ -112,10 +112,11 @@ 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.
-	if (cmd->tick_count == 0) return;
+	bool wasInExtraMouseSamples = inExtraMouseSamples;
+	inExtraMouseSamples = cmd->tick_count == 0;
 
 	// doing some debugs to test the behaviour of the real controller
-	if (sar_tas_real_controller_debug.GetBool()) {
+	if (sar_tas_real_controller_debug.GetBool() && !inExtraMouseSamples) {
 		int debugType = sar_tas_real_controller_debug.GetInt();
 		if (debugType == 1) {
 			console->Print("forwardmove: %.5f, sidemove: %.5f\n", cmd->forwardmove, cmd->sidemove);
@@ -140,6 +141,23 @@ void TasController::ControllerMove(int nSlot, float flFrametime, CUserCmd *cmd)
 
 	//console->Print("TasController::ControllerMove (%d, ", cmd->tick_count);
 
+	if (inExtraMouseSamples && !tasPlayer->IsUsingTools()) {
+		if (!wasInExtraMouseSamples) {
+			viewanglesPreExtraMouseSamples = engine->GetAngles(nSlot);
+		}
+
+		extraMouseSamplesAccumulatedTime += flFrametime;
+
+		auto extraViewAnalog = tasPlayer->FetchRawExtraViewAnalog(nSlot, extraMouseSamplesAccumulatedTime);
+		ApplyViewAnalog(nSlot, nullptr, extraViewAnalog, true);
+
+		return;
+	}
+
+	if (wasInExtraMouseSamples) {
+		extraMouseSamplesAccumulatedTime = 0.0f;
+	}
+
 	tasPlayer->FetchInputs(nSlot, this, cmd);
 
 	//TAS is now controlling inputs. Reset everything we can.
@@ -197,17 +215,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()) {
-		QAngle viewangles;
-		viewangles = engine->GetAngles(nSlot);
-
-		viewangles.y -= viewAnalog.x;  // positive values should rotate right.
-		viewangles.x -= viewAnalog.y;  // positive values should rotate up.
-		viewangles.x = std::min(std::max(viewangles.x, -cl_pitchdown.GetFloat()), cl_pitchup.GetFloat());
-
-		cmd->mousedx = (int)(-viewAnalog.x);
-		cmd->mousedy = (int)(-viewAnalog.y);
-
-		engine->SetAngles(nSlot, viewangles);
+		ApplyViewAnalog(nSlot, cmd, viewAnalog, wasInExtraMouseSamples);
 	}
 
 	{
@@ -219,3 +227,23 @@ void TasController::ControllerMove(int nSlot, float flFrametime, CUserCmd *cmd)
 		tasPlayer->DumpUsercmd(nSlot, &tmp, tasPlayer->GetTick() + 1, "client"); // off-by-one bullshit on tick count
 	}
 }
+
+void TasController::ApplyViewAnalog(int nSlot, CUserCmd *cmd, Vector analog, bool usePreExtraMouseSampleAngles) {
+	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());
+
+	if (cmd != nullptr) {
+		cmd->mousedx = (int)(-analog.x);
+		cmd->mousedy = (int)(-analog.y);
+	}
+
+	engine->SetAngles(nSlot, viewangles);
+}

src/Features/Tas/TasController.hpp

@@ -38,6 +38,10 @@ class TasController : public Feature {
 
 	bool enabled;
 
+	bool inExtraMouseSamples;
+	float extraMouseSamplesAccumulatedTime;
+	QAngle viewanglesPreExtraMouseSamples;
+
 public:
 	TasController();
 	~TasController();
@@ -60,6 +64,9 @@ class TasController : public Feature {
 	void SetButtonState(TasControllerInput i, bool state);
 
 	void ControllerMove(int nSlot, float flFrametime, CUserCmd *cmd);
+
+private:
+	void ApplyViewAnalog(int nSlot, CUserCmd *cmd, Vector analog, bool usePreExtraMouseSampleAngles);
 };
 
 extern TasController *tasControllers[2];

src/Features/Tas/TasPlayer.cpp

@@ -168,7 +168,7 @@ void TasPlayer::Activate(TasPlaybackInfo info) {
 		playbackInfo.slots[slot].ClearGeneratedContent();
 
 		currentRequestRawFramebulkIndex[slot] = 0;
-	
+		currentExtraViewAnalogRawFramebulkIndex[slot] = 0;
 	}
 
 	active = true;
@@ -565,6 +565,28 @@ void TasPlayer::SaveProcessedFramebulks() {
 	}
 }
 
+// Used by controller for ExtraMouseSample's. Not necessary for gameplay inputs but makes raw playback smooth
+Vector TasPlayer::FetchRawExtraViewAnalog(int slot, float frametime) {
+
+	int tasTick = currentTick + 1;
+	float frametimeInTicks = frametime / engine->GetIPT();
+	int lastSampleTick = ceilf(tasTick + frametimeInTicks);
+
+	GetRawFramebulkAt(slot, tasTick, currentExtraViewAnalogRawFramebulkIndex[slot]);
+	unsigned framebulkIndex = currentExtraViewAnalogRawFramebulkIndex[slot];
+
+	Vector accumulatedAnalog = Vector();
+
+	float remainingFrametimeInTicks = frametimeInTicks;
+	for (int tick = tasTick; tick <= lastSampleTick; tick++) {
+		TasFramebulk fb = GetRawFramebulkAt(slot, tick, framebulkIndex);
+		accumulatedAnalog += fb.viewAnalog * fminf(1.0f, remainingFrametimeInTicks);
+		remainingFrametimeInTicks -= 1.0f;
+	}
+
+	return accumulatedAnalog;
+}
+
 /*
     This function is called by TAS controller's ControllerMove function.
     Even with alternateticks, the shortest interval between two ticks

src/Features/Tas/TasPlayer.hpp

@@ -76,6 +76,7 @@ class TasPlayer : public Feature {
 
 	// used to cache last used framebulk to quickly access it for playback
 	unsigned currentRequestRawFramebulkIndex[2];
+	unsigned currentExtraViewAnalogRawFramebulkIndex[2];
 
 public:
 	void Update();
@@ -118,6 +119,7 @@ class TasPlayer : public Feature {
 	void SaveUsercmdDebugs(int slot);
 	void SavePlayerInfoDebugs(int slot);
 
+	Vector FetchRawExtraViewAnalog(int slot, float frametime);
 	void FetchInputs(int slot, TasController *controller, CUserCmd *cmd);
 	TasFramebulk SamplePreProcessedFramebulk(int slot, int tasTick, void *player, CUserCmd *cmd);
 	void PostProcess(int slot, void *player, CUserCmd *cmd);