scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-07 08:15:59 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

Offscreen indicator: read the clipped vertex before freeing it and fix the min-side clamps

Browse Source 
The overflow flag and screen position were read from a temp vertex
already returned to the pool, which only worked because nothing
allocated in between. Copy them out first.

The clamps that keep the indicator away from the top and left of the
clip rectangle subtracted the clip origin instead of adding it, and
dropped it from the clamped value. Inert while the origin is zero, but
wrong for any other clip rectangle.

Co-Authored-By: Claude Fable 5.1 <[email protected]>
This commit is contained in:
Goober5000andClaude Fable 5.1 committed 2026-09-23 00:07:19 -04:00
1 parent 12323ef3f6
commit 11781a5081
1 file changed
+10 -8
Download Patch File Download Diff File Expand all files Collapse all files
code/hud/hudtarget.cpp
+10 -8
View File
@@ -7060,13 +7060,18 @@ bool HudGaugeOffscreen::calculatePosition(vertex* target_point, vec3d *tpos, vec
g3_project_vertex(eye_vertex);
// grab what we need before the temp points go back to the pool
ubyte eye_flags = eye_vertex->flags;
xpos = eye_vertex->screen.xyw.x;
ypos = eye_vertex->screen.xyw.y;
if (target_point->flags & PF_TEMP_POINT)
free_temp_point(target_point);
if (eye_vertex->flags & PF_TEMP_POINT)
free_temp_point(eye_vertex);
if (eye_vertex->flags&PF_OVERFLOW) {
if (eye_flags & PF_OVERFLOW) {
// This is unlikely to happen, but can if a clip goes through the player's eye.
gr_reset_screen_scale();
if (!in_frame)
@@ -7074,9 +7079,6 @@ bool HudGaugeOffscreen::calculatePosition(vertex* target_point, vec3d *tpos, vec
return false;
}
xpos = eye_vertex->screen.xyw.x;
ypos = eye_vertex->screen.xyw.y;
// we need it unsized here and it will be fixed when things are acutally drawn
gr_unsize_screen_posf(&xpos, &ypos);
@@ -7112,8 +7114,8 @@ bool HudGaugeOffscreen::calculatePosition(vertex* target_point, vec3d *tpos, vec
if (*dir == 0 || *dir == 1) {
xpos = i2fl((*dir == 0) ? gr_screen.clip_right_unscaled : gr_screen.clip_left_unscaled);
if ( ypos < (half_gauge_length - gr_screen.clip_top_unscaled) )
ypos = half_gauge_length;
if ( ypos < (gr_screen.clip_top_unscaled + half_gauge_length) )
ypos = gr_screen.clip_top_unscaled + half_gauge_length;
if ( ypos > (gr_screen.clip_bottom_unscaled - half_gauge_length) )
ypos = gr_screen.clip_bottom_unscaled - half_gauge_length;
@@ -7121,8 +7123,8 @@ bool HudGaugeOffscreen::calculatePosition(vertex* target_point, vec3d *tpos, vec
} else {
ypos = i2fl((*dir == 2) ? gr_screen.clip_top_unscaled : gr_screen.clip_bottom_unscaled);
if ( xpos < ( half_gauge_length - gr_screen.clip_left_unscaled) )
xpos = half_gauge_length;
if ( xpos < (gr_screen.clip_left_unscaled + half_gauge_length) )
xpos = gr_screen.clip_left_unscaled + half_gauge_length;
if ( xpos > (gr_screen.clip_right_unscaled - half_gauge_length) )
xpos = gr_screen.clip_right_unscaled - half_gauge_length;