refactor: use tickrate everywhere

Author: ThisAMJ

src/Features/Camera.cpp

@@ -209,7 +209,7 @@ CameraState Camera::InterpolateStates(float time) {
 		      LAST };
 
 	//reading 4 frames closest to time
-	float frameTime = time * 60.0f;
+	float frameTime = time * sar.game->Tickrate();
 	int frames[4] = {INT_MIN, INT_MIN, INT_MAX, INT_MAX};
 	for (auto const &state : camera->states) {
 		int stateTime = state.first;
@@ -285,7 +285,7 @@ void Camera::DrawInWorld() const {
 	MeshId mesh_cams = OverlayRender::createMesh(RenderCallback::none, RenderCallback::constant({ 255, 0, 0 }, true));
 	MeshId mesh_currentCam = OverlayRender::createMesh(RenderCallback::none, RenderCallback::constant({ 255, 255, 0 }, true));
 
-	float frameTime = 1.0f / 60;
+	float frameTime = 1.0f / 30; // don't draw a line for every frame, that's just too much
 	int maxTimeTicks = 0;
 	int minTimeTicks = INT_MAX;
 	for (auto const &state : camera->states) {
@@ -294,8 +294,8 @@ void Camera::DrawInWorld() const {
 	}
 
 	// changing in-game ticks to seconds.
-	float maxTime = maxTimeTicks * frameTime;
-	float minTime = minTimeTicks * frameTime;
+	float maxTime = maxTimeTicks * engine->GetIPT();
+	float minTime = minTimeTicks * engine->GetIPT();
 
 	// for each frame, calculate interpolated path
 	Vector pos = camera->InterpolateStates(minTime).origin;
@@ -348,24 +348,7 @@ void Camera::DrawInWorld() const {
 		);
 
 		Vector forward, right, up;
-		float cp, sp, cy, sy, cr, sr;
-		cp = cosf(DEG2RAD(state.angles.x));
-		sp = sinf(DEG2RAD(state.angles.x));
-		cy = cosf(DEG2RAD(state.angles.y));
-		sy = sinf(DEG2RAD(state.angles.y));
-		cr = cosf(DEG2RAD(state.angles.z));
-		sr = sinf(DEG2RAD(state.angles.z));
-
-		forward.x = cp * cy;
-		forward.y = cp * sy;
-		forward.z = -sp;
-
-		right.x = (-1 * sr * sp * cy + -1 * cr * -sy);
-		right.y = (-1 * sr * sp * sy + -1 * cr * cy);
-		right.z = -1 * sr * cp;
-
-		up = right.Cross(forward);
-
+		Math::AngleVectors(state.angles, &forward, &right, &up);
 
 		float fovScalar = tanf(DEG2RAD(state.fov / 2));
 
@@ -405,7 +388,7 @@ void Camera::OverrideView(CViewSetup *m_View) {
 	}
 
 	if (timeOffsetRefreshRequested) {
-		timeOffset = engine->GetClientTime() - engine->demoplayer->GetTick() / 60.0f;
+		timeOffset = engine->GetClientTime() - engine->demoplayer->GetTick() * engine->GetIPT();
 		timeOffsetRefreshRequested = false;
 	}
 
@@ -839,7 +822,7 @@ CON_COMMAND(sar_cam_path_goto, "sar_cam_path_goto <frame> [skipto] - sends the c
 		return console->Print("This frame does not exist.\n");
 	}
 
-	camera->currentState = camera->InterpolateStates(i * (1.0f / 60));
+	camera->currentState = camera->InterpolateStates(i * engine->GetIPT());
 
 	if (args.ArgC() == 3 && std::atoi(args[2]) == 1) {
 		if (engine->demoplayer->IsPlaying()) {
@@ -904,8 +887,8 @@ CON_COMMAND(sar_cam_path_export,
 		}
 
 		// changing in-game ticks to seconds.
-		float maxTime = maxTimeTicks / 60.0f;
-		float minTime = minTimeTicks / 60.0f;
+		float maxTime = maxTimeTicks * engine->GetIPT();
+		float minTime = minTimeTicks * engine->GetIPT();
 
 		if (daVinci) file << "C={\n";
 

src/Features/Demo/DemoParser.cpp

@@ -228,7 +228,7 @@ bool DemoParser::Parse(std::string filePath, Demo *demo, bool ghostRequest, std:
 					}
 
 					if (cmd.find("__END__") != std::string::npos) {
-						console->ColorMsg(Color(0, 255, 0, 255), "Segment length -> %d ticks: %.3fs\n", tick, tick / 60.f);
+						console->ColorMsg(Color(0, 255, 0, 255), "Segment length -> %d ticks: %.3fs\n", tick, tick * engine->GetIPT());
 						demo->segmentTicks = tick;
 					}
 					break;

src/Features/Demo/GhostLeaderboard.cpp

@@ -19,7 +19,7 @@ Variable ghost_leaderboard_y("ghost_leaderboard_y", "10", 0, "The x position of
 
 static std::string formatTicks(int ticks) {
 	if (ticks == INT_MAX) return "-";
-	return SpeedrunTimer::Format((float)ticks / 60.0);
+	return SpeedrunTimer::Format((float)ticks / sar.game->Tickrate());
 }
 
 void GhostLeaderboardHud::Paint(int slot) {
@@ -239,7 +239,7 @@ void GhostLeaderboardHud::SpeedrunStart(int ticks) {
 		return;
 	} else { // mode == 1
 		// race
-		this->lastLiveUpdate = (int)(engine->GetHostTime() * 60.0f);
+		this->lastLiveUpdate = (int)(engine->GetHostTime() * sar.game->Tickrate());
 		for (auto &ent : ghostLeaderboard.entries) {
 			ent.ticks = ticks;
 			ent.waiting = false;
@@ -251,7 +251,7 @@ void GhostLeaderboardHud::SpeedrunStart(int ticks) {
 void GhostLeaderboardHud::UpdateLive() {
 	if (ghost_leaderboard_mode.GetInt() != 1) return;
 
-	int newTime = (int)(engine->GetHostTime() * 60.0f);
+	int newTime = (int)(engine->GetHostTime() * sar.game->Tickrate());
 	int delta = newTime - this->lastLiveUpdate;
 	this->lastLiveUpdate = newTime;
 

src/Features/DiscordRichPresence.cpp

@@ -153,7 +153,7 @@ ON_EVENT(FRAME) {
 	int host, server, client;
 	engine->GetTicks(host, server, client);
 
-	if (host > lastExecutedPresence + 60) {
+	if (host > lastExecutedPresence + sar.game->Tickrate()) {
 		lastExecutedPresence = host;
 		UpdateDiscordRichPresence();
 	}

src/Features/Hud/PlacementHelperHud.cpp

@@ -88,7 +88,7 @@ ON_EVENT(RENDER) {
 		auto deferringToPortal = placementHelper->field<bool>("m_bDeferringToPortal");
 
 		auto currentTime = server->gpGlobals->curtime;
-		auto remainingBlockedTimeTicks = (int)(fmaxf(disableTime - currentTime, 0.0f) * 60.0f);
+		auto remainingBlockedTimeTicks = (int)(fmaxf(disableTime - currentTime, 0.0f) * sar.game->Tickrate());
 		auto placementBlocked = deferringToPortal || (remainingBlockedTimeTicks > 0);
 
 		auto sphereColor = Color(0, 200, 0, 64);

src/Features/Speedrun/SpeedrunTimer.cpp

@@ -29,7 +29,7 @@
 #include "Utils.hpp"
 
 #define SPEEDRUN_PACKET_TYPE "srtimer"
-#define SYNC_INTERVAL 60  // Sync every second, just in case
+#define SYNC_INTERVAL 1.0f  // Sync every second, just in case
 
 enum PacketType {
 	SYNC,
@@ -316,7 +316,7 @@ int SpeedrunTimer::GetOffsetTicks() {
 
 	if (*end) {
 		// Try to parse as a time instead
-		ticks = std::round(SpeedrunTimer::UnFormat(offset) * 60.0f);
+		ticks = std::round(SpeedrunTimer::UnFormat(offset) * sar.game->Tickrate());
 	}
 
 	return ticks;
@@ -443,7 +443,7 @@ void SpeedrunTimer::Update() {
 
 	if (engine->IsCoop() && !engine->IsOrange()) {
 		int tick = getCurrentTick();
-		if (tick < g_coopLastSyncTick || tick >= g_coopLastSyncTick + SYNC_INTERVAL) {
+		if (tick < g_coopLastSyncTick || tick >= g_coopLastSyncTick + roundf(SYNC_INTERVAL / engine->GetIPT())) {
 			sendCoopPacket(PacketType::SYNC);
 			g_coopLastSyncTick = tick;
 		}
@@ -990,11 +990,11 @@ CON_COMMAND(sar_speedrun_recover, "sar_speedrun_recover <ticks|time> - recover a
 	long ticks = strtol(time, &end, 10);
 	if (*end) {
 		// Try to parse as a time instead
-		ticks = std::round(SpeedrunTimer::UnFormat(time) * 60.0f);
+		ticks = std::round(SpeedrunTimer::UnFormat(time) * sar.game->Tickrate());
 	}
 
 	g_speedrun.recovery = ticks;
-	console->Print("Timer will start on next load at %s\n", SpeedrunTimer::Format(ticks / 60.0f).c_str());
+	console->Print("Timer will start on next load at %s\n", SpeedrunTimer::Format(ticks * engine->GetIPT()).c_str());
 }
 
 CON_COMMAND(sar_speedrun_export_all, "sar_speedrun_export_all <filename> - export the results of many speedruns to the specified CSV file\n") {

src/Features/SteamTimeline.cpp

@@ -1,6 +1,7 @@
 #include "SteamTimeline.hpp"
 
 #include "Event.hpp"
+#include "Modules/Engine.hpp"
 #include "Modules/SteamAPI.hpp"
 #include "Speedrun/SpeedrunTimer.hpp"
 
@@ -42,7 +43,7 @@ ON_EVENT(SPEEDRUN_FINISH) {
 	if (!steam->hasLoaded) return;
 	std::chrono::duration<float> offset = std::chrono::system_clock::now() - g_speedrunStart;
 
-	auto fl_time = SpeedrunTimer::GetTotalTicks() / 60.0f;
+	auto fl_time = SpeedrunTimer::GetTotalTicks() * engine->GetIPT();
 	auto time = SpeedrunTimer::Format(fl_time);
 
 	steam->g_timeline->SetTimelineStateDescription(("Speedrun " + time).c_str(), -offset.count());

src/Features/Stitcher.cpp

@@ -629,7 +629,7 @@ void Stitcher::OverrideView(CViewSetup *view) {
 		if (delta < 0) {
 			delta = 0;
 			last_cl_time = cl_time;
-		} else if (delta >= 1.0f / 60.0f) {
+		} else if (delta >= engine->GetIPT()) {
 			doMovement(delta);
 			last_cl_time = cl_time;
 		}

src/Features/Tas/TasPlayer.cpp

@@ -51,7 +51,14 @@ void SetPlaybackVars(bool active) {
 		old_interpolate = cl_interpolate.GetBool();
 		old_motionblur = mat_motion_blur_enabled.GetBool();
 		in_forceuser.SetValue(tasPlayer->playbackInfo.coopControlSlot >= 0 ? tasPlayer->playbackInfo.coopControlSlot : 100);
-		host_framerate.SetValue(60);
+		auto tickrate = 1.0f / engine->GetIPT();
+		if (fabsf(tickrate - roundf(tickrate)) < 0.0001f) {
+			// if it's close to a whole number, set it as an int
+			// (preempting floating point errors)
+			host_framerate.SetValue((int)roundf(tickrate));
+		} else {
+			host_framerate.SetValue(tickrate);
+		}
 		if (!sar_tas_interpolate.GetBool() && tasPlayer->IsUsingTools()) {
 			cl_interpolate.SetValue(false);
 			mat_motion_blur_enabled.SetValue(false);
@@ -90,7 +97,7 @@ void SetPlaybackVars(bool active) {
 			fps_max.SetValue(0);
 		} else if (tasPlayer->GetTick() >= sar_tas_skipto.GetInt()) {
 			engine->SetSkipping(false);
-			fps_max.SetValue((int)(sar_tas_playback_rate.GetFloat() * 60.0f));
+			fps_max.SetValue((int)(sar_tas_playback_rate.GetFloat() * sar.game->Tickrate()));
 		}
 	}
 

src/Modules/Engine.cpp

@@ -709,7 +709,7 @@ void Host_AccumulateTime_Detour(float dt) {
 		Host_AccumulateTime_Hook.Enable();
 	} else if (g_advance > 0) {
 		Host_AccumulateTime_Hook.Disable();
-		Host_AccumulateTime(1.0f/60);
+		Host_AccumulateTime(engine->GetIPT());
 		Host_AccumulateTime_Hook.Enable();
 		--g_advance;
 	} else {
@@ -720,7 +720,7 @@ void Host_AccumulateTime_Detour(float dt) {
 	// HACK: Force frametime to equal 2 ticks when loading
 	// Limits host_timescale effect on load times, faster loads
 	if (g_loadstate == LOADING && sar_loads_uncap.GetBool()) {
-		*host_frametime = *host_frametime_unbounded = 2.0f/60;
+		*host_frametime = *host_frametime_unbounded = 2.0f * engine->GetIPT();
 	}
 
 	if (*host_frametime != *host_frametime_unbounded) {