feat: use client trace wherever possible

improving orange huds n stuff

Author: ThisAMJ

src/Features/Demo/GhostEntity.cpp

@@ -419,10 +419,10 @@ void GhostEntity::FollowPov(ViewSetup *view) {
 		// want to view from; that way, we can avoid the camera clipping
 		// into a wall
 
-		void *player = server->GetPlayer(1);
+		void *player = client->GetPlayer(GET_SLOT() + 1);
 		if (!player) return; // Probably shouldn't ever happen
 
-		angles = engine->GetAngles(0);
+		angles = engine->GetAngles(GET_SLOT());
 
 		CTraceFilterSimple filter;
 		filter.SetPassEntity(player);
@@ -445,7 +445,7 @@ void GhostEntity::FollowPov(ViewSetup *view) {
 
 		CGameTrace tr;
 
-		engine->TraceRay(engine->engineTrace->ThisPtr(), ray, MASK_SOLID_BRUSHONLY, &filter, &tr);
+		engine->TraceRayClient(engine->engineTraceClient->ThisPtr(), ray, MASK_SOLID_BRUSHONLY, &filter, &tr);
 
 		Vector campos = tr.endpos + forward * cam_wall_dist;
 
@@ -464,7 +464,7 @@ void GhostEntity::StopFollowing() {
 	r_portalsopenall.SetValue(r_portalsopenall_value);
 	r_drawviewmodel.SetValue(r_drawviewmodel_value);
 	crosshairVariable.SetValue(crosshair_value);
-	void *player = server->GetPlayer(1);
+	void *player = server->GetPlayer(GET_SLOT() + 1);
 	if (player) {
 		SE(player)->field<int>("m_fFlags") &= ~FL_GODMODE;
 		SE(player)->field<int>("m_fFlags") &= ~FL_NOTARGET;
@@ -690,12 +690,12 @@ ON_EVENT(PRE_TICK) {
 	GhostEntity *ghost = GhostEntity::GetFollowTarget();
 	if (!ghost) return;
 
-	void *player = server->GetPlayer(1);
+	void *player = server->GetPlayer(GET_SLOT() + 1);
 	if (!player) return;
 
 	// We use ent_setpos to prevent 'setpos into world' errors being
 	// spewed in console
-	auto cmd = Utils::ssprintf("ent_setpos 1 %.6f %.6f %.6f", ghost->data.position.x, ghost->data.position.y, ghost->data.position.z);
+	auto cmd = Utils::ssprintf("ent_setpos %d %.6f %.6f %.6f", GET_SLOT() + 1, ghost->data.position.x, ghost->data.position.y, ghost->data.position.z);
 	engine->ExecuteCommand(cmd.c_str());
 
 	// Make sure we have godmode so we can't die while spectating someone

src/Features/Demo/GhostRenderer.cpp

@@ -174,29 +174,9 @@ CON_COMMAND(ghost_locator, "ghost_locator - Sends a coop-like ping to other ghos
 		return console->Print("Must be connected to a ghost server.\n");
 	}
 
-	Vector cam_pos;
-	QAngle cam_ang;
-	camera->GetEyePos<false>(GET_SLOT(), cam_pos, cam_ang);
-
-	Vector dir;
-	Math::AngleVectors(cam_ang, &dir);
-	dir *= 8192.0f;
-
 	CGameTrace tr;
-
-	Ray_t ray;
-	ray.m_IsRay = true;
-	ray.m_IsSwept = true;
-	ray.m_Start = VectorAligned(cam_pos.x, cam_pos.y, cam_pos.z);
-	ray.m_Delta = VectorAligned(dir.x, dir.y, dir.z);
-	ray.m_StartOffset = VectorAligned();
-	ray.m_Extents = VectorAligned();
-
-	CTraceFilterSimple filter;
-	filter.SetPassEntity(server->GetPlayer(GET_SLOT() + 1)); // TODO: orange?
-
-	engine->TraceRay(engine->engineTrace->ThisPtr(), ray, MASK_SHOT_PORTAL, &filter, &tr);
-
-	client->ShowLocator(tr.endpos, tr.plane.normal, GhostEntity::set_color);
-	networkManager.NotifyLocator(tr.endpos, tr.plane.normal);
+	if (engine->TraceFromCamera<false>(8192.0f, MASK_SHOT_PORTAL, tr)) {
+		client->ShowLocator(tr.endpos, tr.plane.normal, GhostEntity::set_color);
+		networkManager.NotifyLocator(tr.endpos, tr.plane.normal);
+	}
 }

src/Features/Hud/AimPointHud.cpp

@@ -47,33 +47,8 @@ static bool shouldDraw() {
 static bool updateTrace(int slot) {
 	if (!session->isRunning) return false;
 
-	void *player = server->GetPlayer(slot + 1);
-	if (!player) return false;
-
-	g_last_trace_valid = false;
-
-	Vector cam_pos;
-	QAngle cam_ang;
-	camera->GetEyePos<false>(GET_SLOT(), cam_pos, cam_ang);
-
-	Vector dir;
-	Math::AngleVectors(cam_ang, &dir);
-	dir *= TRACE_LENGTH;
-
 	CGameTrace tr;
-
-	Ray_t ray;
-	ray.m_IsRay = true;
-	ray.m_IsSwept = true;
-	ray.m_Start = VectorAligned(cam_pos.x, cam_pos.y, cam_pos.z);
-	ray.m_Delta = VectorAligned(dir.x, dir.y, dir.z);
-	ray.m_StartOffset = VectorAligned();
-	ray.m_Extents = VectorAligned();
-
-	CTraceFilterSimple filter;
-	filter.SetPassEntity(player);
-
-	engine->TraceRay(engine->engineTrace->ThisPtr(), ray, MASK_VISIBLE, &filter, &tr);
+	engine->TraceFromCamera<false>(TRACE_LENGTH, MASK_VISIBLE, tr);
 
 	g_last_trace = tr;
 	g_last_trace_valid = tr.plane.normal.Length() > 0.9;

src/Features/Hud/Crosshair.cpp

@@ -68,38 +68,8 @@ bool Crosshair::GetCurrentSize(int &xSize, int &ySize) {
 }
 
 bool Crosshair::IsSurfacePortalable() {
-	void *player = server->GetPlayer(GET_SLOT() + 1);
-
-	if (player == nullptr || (int)player == -1)
-		return false;
-
-	Vector camPos = server->GetAbsOrigin(player) + server->GetViewOffset(player);
-
-	QAngle angle = engine->GetAngles(GET_SLOT());
-
-	float X = DEG2RAD(angle.x), Y = DEG2RAD(angle.y);
-	auto cosX = std::cos(X), cosY = std::cos(Y);
-	auto sinX = std::sin(X), sinY = std::sin(Y);
-
-	Vector dir(cosY * cosX, sinY * cosX, -sinX);
-
-	Vector finalDir = Vector(dir.x, dir.y, dir.z).Normalize() * 65536.0;
-
-	Ray_t ray;
-	ray.m_IsRay = true;
-	ray.m_IsSwept = true;
-	ray.m_Start = VectorAligned(camPos.x, camPos.y, camPos.z);
-	ray.m_Delta = VectorAligned(finalDir.x, finalDir.y, finalDir.z);
-	ray.m_StartOffset = VectorAligned();
-	ray.m_Extents = VectorAligned();
-
-	CTraceFilterSimple filter;
-	filter.SetPassEntity(server->GetPlayer(GET_SLOT() + 1));
-
 	CGameTrace tr;
-	engine->TraceRay(engine->engineTrace->ThisPtr(), ray, MASK_SHOT_PORTAL, &filter, &tr);
-
-	if (tr.fraction >= 1) {
+	if (!engine->TraceFromCamera<false>(65536.0, MASK_SHOT_PORTAL, tr)) {
 		return false;
 	}
 

src/Features/PlacementScanner.cpp

@@ -21,25 +21,9 @@
 static std::optional<CGameTrace> camTrace() {
 	if (!session->isRunning) return {};
 
-	void *player = server->GetPlayer(1);
-	if (!player) return {};
-
-	CTraceFilterSimple filter;
-	filter.SetPassEntity(player);
-
-	Vector cam = camera->GetPosition(GET_SLOT());
-	Vector delta = camera->GetForwardVector(GET_SLOT()) * TRACE_LENGTH;
-
-	Ray_t ray;
-	ray.m_IsRay = true;
-	ray.m_IsSwept = true;
-	ray.m_Start = VectorAligned(cam.x, cam.y, cam.z);
-	ray.m_Delta = VectorAligned(delta.x, delta.y, delta.z);
-	ray.m_StartOffset = VectorAligned();
-
 	CGameTrace tr;
 
-	engine->TraceRay(engine->engineTrace->ThisPtr(), ray, MASK_SHOT_PORTAL, &filter, &tr);
+	engine->TraceFromCamera<false>(TRACE_LENGTH, MASK_SHOT_PORTAL, tr);
 
 	return tr.plane.normal.Length() > 0.9 ? tr : std::optional<CGameTrace>{};
 }

src/Features/Routing/Ruler.cpp

@@ -87,19 +87,7 @@ void RulerManager::UpdateCreator() {
 	dir *= sar_ruler_max_trace_dist.GetFloat();
 
 	CGameTrace tr;
-
-	Ray_t ray;
-	ray.m_IsRay = true;
-	ray.m_IsSwept = true;
-	ray.m_Start = VectorAligned(cam_pos.x, cam_pos.y, cam_pos.z);
-	ray.m_Delta = VectorAligned(dir.x, dir.y, dir.z);
-	ray.m_StartOffset = VectorAligned();
-	ray.m_Extents = VectorAligned();
-
-	CTraceFilterSimple filter;
-	filter.SetPassEntity(server->GetPlayer(GET_SLOT() + 1));
-
-	engine->TraceRay(engine->engineTrace->ThisPtr(), ray, MASK_SHOT_PORTAL, &filter, &tr);
+	engine->TraceFromCamera<false>(sar_ruler_max_trace_dist.GetFloat(), MASK_SHOT_PORTAL, tr);
 
 	// valid trace
 	if (tr.plane.normal.Length() > 0.9) {

src/Features/Routing/SeamshotFind.cpp

@@ -8,7 +8,6 @@
 #include "Modules/Client.hpp"
 #include "Modules/Console.hpp"
 #include "Modules/Engine.hpp"
-#include "Modules/Server.hpp"
 #include "Variable.hpp"
 
 Variable sar_seamshot_finder("sar_seamshot_finder", "0", 0, 1, "Enables or disables seamshot finder overlay.\n");
@@ -33,9 +32,9 @@ CGameTrace TracePortalShot(const Vector &start, const Vector &dir, float length)
 	ray.m_Extents = VectorAligned();
 
 	CTraceFilterSimple filter;
-	filter.SetPassEntity(server->GetPlayer(GET_SLOT() + 1));
+	filter.SetPassEntity(client->GetPlayer(GET_SLOT() + 1));
 
-	engine->TraceRay(engine->engineTrace->ThisPtr(), ray, MASK_SHOT_PORTAL, &filter, &tr);
+	engine->TraceRayClient(engine->engineTraceClient->ThisPtr(), ray, MASK_SHOT_PORTAL, &filter, &tr);
 
 	//hack
 	if (ray.m_Start.y == start.y) {
@@ -46,7 +45,7 @@ CGameTrace TracePortalShot(const Vector &start, const Vector &dir, float length)
 
 ON_EVENT(RENDER) {
 	if (sv_cheats.GetBool() && sar_seamshot_finder.GetBool()) {
-		void *player = server->GetPlayer(GET_SLOT() + 1);
+		void *player = client->GetPlayer(GET_SLOT() + 1);
 
 		if (player == nullptr || (int)player == -1)
 			return;