Skip to content

Lock compass to player view when ragdolling #1606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AdamTadeusz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Lock compass to player view when ragdolling #1606

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a143b5
init
AdamTadeusz Jan 13, 2026
73bb210
use vieworigin too
AdamTadeusz Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/game/client/neo/ui/neo_hud_compass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include "c_neo_player.h"
#include "neo_gamerules.h"
#include "view.h"

#include "iclientmode.h"
#include <vgui/ILocalize.h>
Expand Down Expand Up @@ -69,11 +70,10 @@ void CNEOHud_Compass::Paint()

static C_NEO_Player *GetFirstPersonPlayer()
{
auto pLocalPlayer = C_NEO_Player::GetLocalNEOPlayer();
C_NEO_Player *pFPPlayer = pLocalPlayer;
if (pLocalPlayer->GetObserverMode() == OBS_MODE_IN_EYE)
C_NEO_Player *pFPPlayer = C_NEO_Player::GetLocalNEOPlayer();
if (pFPPlayer->GetObserverMode() == OBS_MODE_IN_EYE)
{
auto *pTargetPlayer = dynamic_cast<C_NEO_Player *>(pLocalPlayer->GetObserverTarget());
auto *pTargetPlayer = dynamic_cast<C_NEO_Player *>(pFPPlayer->GetObserverTarget());
if (pTargetPlayer && !pTargetPlayer->IsObserver())
{
pFPPlayer = pTargetPlayer;
Expand Down Expand Up @@ -101,9 +101,9 @@ void CNEOHud_Compass::UpdateStateForNeoHudElementDraw()
if (NEORules()->GhostExists() || NEORules()->GetJuggernautMarkerPos() != vec3_origin)
{
const Vector objPos = NEORules()->GetGameType() == NEO_GAME_TYPE_JGR ? NEORules()->GetJuggernautMarkerPos() : NEORules()->GetGhostPos();
const Vector objVec = objPos - pFPPlayer->EyePosition();
const Vector objVec = objPos - MainViewOrigin();
const float objYaw = RAD2DEG(atan2f(objVec.y, objVec.x));
float objAngle = safeAngle(- objYaw + pFPPlayer->EyeAngles()[YAW]);
float objAngle = safeAngle(- objYaw + MainViewAngles()[YAW]);
m_objAngle = Clamp(objAngle, -(float)m_fov / 2, (float)m_fov / 2);
}

Expand All @@ -114,8 +114,8 @@ void CNEOHud_Compass::UpdateStateForNeoHudElementDraw()
// Update Rangefinder
trace_t tr;
Vector vecForward;
AngleVectors(pFPPlayer->EyeAngles(), &vecForward);
UTIL_TraceLine(pFPPlayer->EyePosition(), pFPPlayer->EyePosition() + (vecForward * MAX_TRACE_LENGTH),
AngleVectors(MainViewAngles(), &vecForward);
UTIL_TraceLine(MainViewOrigin(), MainViewOrigin() + (vecForward * MAX_TRACE_LENGTH),
MASK_SHOT, pFPPlayer, COLLISION_GROUP_NONE, &tr);
const float flDist = METERS_PER_INCH * tr.startpos.DistTo(tr.endpos);
if (flDist >= 999.0f || tr.surface.flags & (SURF_SKY | SURF_SKY2D))
Expand Down Expand Up @@ -183,7 +183,7 @@ void CNEOHud_Compass::DrawCompass() const
m_xPos + m_width, m_yPos + m_height,
m_boxColor);

const float angle = -player->EyeAngles()[YAW];
const float angle = -MainViewAngles()[YAW];
const int steps = ARRAYSIZE(ROSE);
for (int i = 0; i < steps; i += m_separators ? 1 : 2) {
const float stepAngle = (float)(i * 360) / steps;
Expand Down