Skip to content

clip the supernova whiteout to the letterbox #7493

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

Merged
Goober5000 merged 2 commits into from
Jun 2, 2026
Merged

clip the supernova whiteout to the letterbox #7493

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31eb87b
clip the supernova whiteout to the letterbox
Goober5000 Jun 2, 2026
49d6f7a
extract dead-view letterbox helpers
Goober5000 Jun 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
33 changes: 28 additions & 5 deletions freespace2/freespace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,21 @@ void game_sunspot_process(float frametime)
}


// Top/bottom bar height for the "dead view" / supernova letterbox
static int dead_view_letterbox_yborder()
{
return gr_screen.max_h / 4;
}

// Apply the clip rect for the "dead view" / supernova letterbox interior
static void set_dead_view_letterbox_clip()
{
int yborder = dead_view_letterbox_yborder();
// Numeric constants encouraged by J "pig farmer" S, who shall remain semi-anonymous.
// J.S. I've changed my ways!! See the new "no constants" code!!!
gr_set_clip(0, yborder, gr_screen.max_w, gr_screen.max_h - yborder*2, GR_RESIZE_NONE);
}

/**
* Call once a frame to diminish the flash effect to 0.
* @param frametime Period over which to dimish at ::DIMINISH_RATE
Expand Down Expand Up @@ -904,7 +919,18 @@ static void game_flash_diminish(float frametime)
if ( b < 0 ) b = 0; else if ( b > 255 ) b = 255;

if ( (r!=0) || (g!=0) || (b!=0) ) {
// the letterbox bars are drawn earlier in the frame, but game_render_hud calls gr_reset_clip()
// before this runs, so the flash would paint over the bars unless we re-apply the letterbox clip
bool letterbox_active = (Game_mode & GM_DEAD) || (supernova_stage() >= SUPERNOVA_STAGE::HIT);
if (letterbox_active) {
set_dead_view_letterbox_clip();
}

gr_flash( r, g, b );

if (letterbox_active) {
gr_reset_clip();
}
}
}

Expand Down Expand Up @@ -2575,18 +2601,15 @@ void game_set_view_clip(float /*frametime*/)
if ((Game_mode & GM_DEAD) || (supernova_stage() >= SUPERNOVA_STAGE::HIT))
{
// Set the clip region for the letterbox "dead view"
int yborder = gr_screen.max_h/4;

if (g3_in_frame() == 0) {
int yborder = dead_view_letterbox_yborder();
// Ensure that the bars are black
gr_set_color(0,0,0);
gr_set_bitmap(0); // Valathil - Don't ask me why this has to be here but otherwise the black bars don't draw
gr_rect(0, 0, gr_screen.max_w, yborder, GR_RESIZE_NONE);
gr_rect(0, gr_screen.max_h-yborder, gr_screen.max_w, yborder, GR_RESIZE_NONE);
} else {
// Numeric constants encouraged by J "pig farmer" S, who shall remain semi-anonymous.
// J.S. I've changed my ways!! See the new "no constants" code!!!
gr_set_clip(0, yborder, gr_screen.max_w, gr_screen.max_h - yborder*2, GR_RESIZE_NONE );
set_dead_view_letterbox_clip();
}
}
else {
Expand Down
Loading