Skip to content

Commit 7a47cc0

Browse files
committed
fix replacement textures in briefing popup
Use the same method for texture replacement in briefing popups that is already used in the tech room. Also don't render shadows when the jump node is displayed, since it's not being lit anyway.
1 parent af4ec4f commit 7a47cc0

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

code/menuui/techmenu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ void techroom_ships_render(float frametime)
552552
closeup_pos = sip->closeup_pos;
553553
closeup_zoom = sip->closeup_zoom;
554554

555-
if (sip->replacement_textures.size() > 0) {
555+
if (!sip->replacement_textures.empty()) {
556556
render_info.set_replacement_textures(Techroom_modelnum, sip->replacement_textures);
557557
}
558558

code/missionui/missionbrief.cpp

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,23 +1123,30 @@ void brief_render_closeup(int ship_class, float frametime)
11231123
model_render_params render_info;
11241124
render_info.set_detail_level_lock(0);
11251125

1126-
if (shadow_maybe_start_frame(Shadow_disable_overrides.disable_mission_select_ships))
1126+
if (Closeup_icon->type == ICON_JUMP_NODE)
11271127
{
1128-
auto pm = model_get(Closeup_icon->modelnum);
1128+
render_info.set_color(HUD_color_red, HUD_color_green, HUD_color_blue);
1129+
render_info.set_flags(MR_NO_LIGHTING | MR_AUTOCENTER | MR_NO_POLYS | MR_SHOW_OUTLINE_HTL | MR_NO_TEXTURING);
1130+
}
1131+
else
1132+
{
1133+
if (shadow_maybe_start_frame(Shadow_disable_overrides.disable_mission_select_ships))
1134+
{
1135+
auto pm = model_get(Closeup_icon->modelnum);
11291136

1130-
gr_reset_clip();
1131-
shadows_start_render(&Eye_matrix, &Eye_position, Proj_fov, gr_screen.clip_aspect, -Closeup_cam_pos.xyz.z + pm->rad, -Closeup_cam_pos.xyz.z + pm->rad + 200.0f, -Closeup_cam_pos.xyz.z + pm->rad + 2000.0f, -Closeup_cam_pos.xyz.z + pm->rad + 10000.0f);
1132-
render_info.set_flags(MR_NO_TEXTURING | MR_NO_LIGHTING | MR_AUTOCENTER);
1137+
gr_reset_clip();
1138+
shadows_start_render(&Eye_matrix, &Eye_position, Proj_fov, gr_screen.clip_aspect, -Closeup_cam_pos.xyz.z + pm->rad, -Closeup_cam_pos.xyz.z + pm->rad + 200.0f, -Closeup_cam_pos.xyz.z + pm->rad + 2000.0f, -Closeup_cam_pos.xyz.z + pm->rad + 10000.0f);
1139+
render_info.set_flags(MR_NO_TEXTURING | MR_NO_LIGHTING | MR_AUTOCENTER);
11331140

1134-
model_render_immediate(&render_info, Closeup_icon->modelnum, Closeup_icon->model_instance_num, &Closeup_orient, &Closeup_pos);
1135-
shadows_end_render();
1136-
gr_set_clip(Closeup_region[gr_screen.res][0], Closeup_region[gr_screen.res][1], w, h, GR_RESIZE_MENU);
1137-
}
1141+
model_render_immediate(&render_info, Closeup_icon->modelnum, Closeup_icon->model_instance_num, &Closeup_orient, &Closeup_pos);
1142+
shadows_end_render();
1143+
gr_set_clip(Closeup_region[gr_screen.res][0], Closeup_region[gr_screen.res][1], w, h, GR_RESIZE_MENU);
1144+
}
1145+
1146+
auto sip = &Ship_info[ship_class];
1147+
if (!sip->replacement_textures.empty())
1148+
render_info.set_replacement_textures(Closeup_icon->modelnum, sip->replacement_textures);
11381149

1139-
if ( Closeup_icon->type == ICON_JUMP_NODE) {
1140-
render_info.set_color(HUD_color_red, HUD_color_green, HUD_color_blue);
1141-
render_info.set_flags(MR_NO_LIGHTING | MR_AUTOCENTER | MR_NO_POLYS | MR_SHOW_OUTLINE_HTL | MR_NO_TEXTURING);
1142-
} else {
11431150
render_info.set_flags(MR_AUTOCENTER);
11441151
}
11451152

0 commit comments

Comments
 (0)