Skip to content

fix: 106544: fix edgecase where lowest hp number was always rotated b… #410

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
FlufflesTheMicrosaur wants to merge 3 commits into
base: master
Choose a base branch
from
+15 −6
Open

fix: 106544: fix edgecase where lowest hp number was always rotated b… #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5f1c7d
fix: 106544: fix edgecase where lowest hp number was always rotated b…
FlufflesTheMicrosaur Mar 31, 2026
a07a0a7
Merge remote-tracking branch 'origin/master' into fix/106544-unnecess…
FlufflesTheMicrosaur Apr 2, 2026
4f39bb9
feat: 106544: additional helper functions to enable t DrawIntegrityBo…
FlufflesTheMicrosaur Apr 2, 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
7 changes: 7 additions & 0 deletions Alchemy/Include/Euclid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ constexpr Metric PI = 3.14159265358979;
constexpr Metric HALF_PI = 0.5 * PI;
constexpr Metric TAU = 2.0 * PI;

constexpr Metric RAD_EPSILON = 0.0000001;
constexpr Metric DEG_EPSILON = RAD_EPSILON * 180.0 / PI;

const Metric SQRT_3 = sqrt(3.0);

constexpr Metric DBL_INFINITY = 1.7976931348623158e+308; // DBL_MAX
Expand Down Expand Up @@ -61,9 +64,13 @@ inline int AngleMiddle (int iLowAngle, int iHighAngle)
inline int AngleToDegrees (Metric rAngle) { return AngleMod(mathRound(rAngle * 180.0 / PI)); }

inline Metric mathAngleMod (double rAngle) { if (rAngle >= 0.0) return fmod(rAngle, TAU); else return TAU - fmod(-rAngle, TAU); }
inline Metric mathAngleMod180 (double rAngle) { return mathAngleMod(rAngle + PI) - PI; }
inline Metric mathAngleModDegrees (double rAngle) { if (rAngle >= 0.0) return fmod(rAngle, 360.0); else return 360.0 - fmod(-rAngle, 360.0); }
inline Metric mathAngleMod180Degrees (double rAngle) { return mathAngleModDegrees(rAngle + 180.0) - 180.0; }
inline Metric mathAngleBearing (Metric rAngle, Metric rOrigin) { Metric rDiff = mathAngleMod(rAngle - rOrigin); return (rDiff > PI ? rDiff - TAU : rDiff); }
inline Metric mathAngleDiff (double rFrom, double rTo) { return mathAngleMod(rTo - rFrom); }
inline Metric mathAngleIsZero (double rAngle) { return abs(mathAngleMod180(rAngle)) < RAD_EPSILON; }
inline Metric mathAngleIsZeroDegrees (double rAngle) { return abs(mathAngleMod180Degrees(rAngle)) < DEG_EPSILON; }
inline constexpr Metric mathDegreesToRadians (int iAngle) { return iAngle * PI / 180.0; }
inline constexpr Metric mathDegreesToRadians (Metric rDegrees) { return PI * rDegrees / 180.0; }
inline constexpr Metric mathInterpolate (Metric rFrom, Metric rTo, Metric rInterpolate) { return rFrom + (rInterpolate * (rTo - rFrom)); }
Expand Down
14 changes: 8 additions & 6 deletions Mammoth/TSUI/CArmorHUDRingSegments.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,15 @@ ALERROR CArmorHUDRingSegments::Bind (SDesignLoadCtx &Ctx)
return NOERROR;
}

void CArmorHUDRingSegments::CalcHPLabelBox (int iAngle, int iRadius, SSegment &Seg)

// CalcHPLabelBox
//
// Compose the position of the HP label.
// iAngle 0 is to the right
//
void CArmorHUDRingSegments::CalcHPLabelBox (int iAngle, int iRadius, SSegment &Seg)

{
iAngle = AngleMod(iAngle);
Metric rCenterAngle = ::mathDegreesToRadians(iAngle);

// Figure out if we're drawing the text radially or along the arc.
Expand Down Expand Up @@ -106,7 +108,7 @@ void CArmorHUDRingSegments::CalcHPLabelBox (int iAngle, int iRadius, SSegment &S
{
int iTextRadius = Seg.iArcRadius + ((Seg.iArcWidth - m_cyMaxValue) / 2) - 1;
Seg.vHPText = CVector::FromPolarInv(rCenterAngle, iTextRadius);
Seg.rHPTextRotation = rCenterAngle + (HALF_PI);
Seg.rHPTextRotation = rCenterAngle - (HALF_PI * 3);
}
}
}
Expand Down Expand Up @@ -185,11 +187,11 @@ void CArmorHUDRingSegments::DrawIntegrityBox (CG32bitImage &Dest, const SSegment
DEBUG_CATCH
}

void CArmorHUDRingSegments::DrawIntegrityBoxText (CG32bitImage &Dest, const SSegment &Seg, CG32bitPixel rgbColor) const

// DrawIntegrityBoxText
//
// Draws the armor integrity value on an arc background.
//
void CArmorHUDRingSegments::DrawIntegrityBoxText (CG32bitImage &Dest, const SSegment &Seg, CG32bitPixel rgbColor) const

{
DEBUG_TRY
Expand All @@ -202,7 +204,7 @@ void CArmorHUDRingSegments::DrawIntegrityBoxText (CG32bitImage &Dest, const SSeg
CVector vCenter(m_xCenter, m_yCenter);
CVector vText = vCenter + Seg.vHPText;

if (Seg.rHPTextRotation == 0.0)
if (mathAngleIsZero(Seg.rHPTextRotation))
MediumFont.DrawText(Dest, (int)vText.GetX(), (int)vText.GetY(), rgbColor, Seg.sHP, CG16bitFont::AlignCenter);
else
CGDraw::Text(Dest,
Expand Down