Skip to content

Fix flickering turrets in techroom #7527

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
wookieejedi merged 1 commit into from
Jun 15, 2026
+16 −8
Merged

Fix flickering turrets in techroom #7527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 2 deletions code/menuui/techmenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,8 +600,11 @@ void techroom_ships_render(float frametime)
render_info.set_detail_level_lock(0);

int model_instance = -1;
model_get_cached_ui_render_instance(Techroom_modelnum, &model_instance);
if (Tab == SHIPS_DATA_TAB) {
auto cache_result = model_get_cached_ui_render_instance(Techroom_modelnum, &model_instance);
// Only set up the instance when it was freshly created; the cached instance persists across
// frames, so re-running this every frame would re-apply initial animations on top of the
// already-animated pose and make animated submodels (e.g. turrets) flip/jitter.
if (Tab == SHIPS_DATA_TAB && cache_result == TriStateBool::TRUE_) {
model_set_up_techroom_instance(&Ship_info[Cur_entry_index], model_instance);
}

Expand Down
10 changes: 6 additions & 4 deletions code/missionui/missionscreencommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1665,8 +1665,9 @@ void draw_model_icon(int model_id, uint64_t flags, int x, int y, int w, int h, s
Glowpoint_override = true;
model_clear_instance(model_id);
int model_instance = -1;
model_get_cached_ui_render_instance(model_id, &model_instance);
if (sip != nullptr) {
auto cache_result = model_get_cached_ui_render_instance(model_id, &model_instance);
// Only set up the instance when it was freshly created; the cached instance persists across frames.
if (sip != nullptr && cache_result == TriStateBool::TRUE_) {
model_set_up_techroom_instance(sip, model_instance);
}

Expand All @@ -1688,8 +1689,9 @@ void draw_model_rotating(model_render_params *render_info, int ship_class, int m
return;

int model_instance = -1;
model_get_cached_ui_render_instance(model_id, &model_instance);
if (!(flags & MR_IS_MISSILE) && SCP_vector_inbounds(Ship_info, ship_class)) {
auto cache_result = model_get_cached_ui_render_instance(model_id, &model_instance);
// Only set up the instance when it was freshly created; the cached instance persists across frames.
if (!(flags & MR_IS_MISSILE) && SCP_vector_inbounds(Ship_info, ship_class) && cache_result == TriStateBool::TRUE_) {
model_set_up_techroom_instance(&Ship_info[ship_class], model_instance);
}

Expand Down
7 changes: 5 additions & 2 deletions code/missionui/missionweaponchoice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,8 +828,11 @@ void draw_3d_overhead_view(int model_num,

model_clear_instance(model_num);
int model_instance = -1;
model_get_cached_ui_render_instance(model_num, &model_instance);
model_set_up_techroom_instance(sip, model_instance);
auto cache_result = model_get_cached_ui_render_instance(model_num, &model_instance);
// Only set up the instance when it was freshly created; the cached instance persists across frames.
if (cache_result == TriStateBool::TRUE_) {
model_set_up_techroom_instance(sip, model_instance);
}
polymodel* pm = model_get(model_num);

if (sip->replacement_textures.size() > 0) {
Expand Down
Loading