Skip to content

[Textures] instrument textures module #3711

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
myk002 merged 1 commit into from
Sep 1, 2023
Merged

[Textures] instrument textures module #3711

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
10 changes: 5 additions & 5 deletions library/lua/gui.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,21 +940,21 @@ function FRAME_WINDOW(resizable)
end
return frame
end
function FRAME_PANEL(resizable)
function FRAME_PANEL()
return make_frame(textures.tp_border_panel, false)
end
function FRAME_MEDIUM(resizable)
function FRAME_MEDIUM()
return make_frame(textures.tp_border_medium, false)
end
function FRAME_BOLD(resizable)
function FRAME_BOLD()
return make_frame(textures.tp_border_bold, true)
end
function FRAME_INTERIOR(resizable)
function FRAME_INTERIOR()
local frame = make_frame(textures.tp_border_thin, false)
frame.signature_pen = false
return frame
end
function FRAME_INTERIOR_MEDIUM(resizable)
function FRAME_INTERIOR_MEDIUM()
local frame = make_frame(textures.tp_border_medium, false)
frame.signature_pen = false
return frame
Expand Down
5 changes: 5 additions & 0 deletions library/modules/Textures.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ void Textures::deleteHandle(TexposHandle handle) {
}

static void reset_texpos() {
DEBUG(textures).print("resetting texture mappings\n");
g_handle_to_texpos.clear();
}

Expand All @@ -207,6 +208,7 @@ struct tracking_stage_new_region : df::viewscreen_new_regionst {

DEFINE_VMETHOD_INTERPOSE(void, logic, ()) {
if (this->m_raw_load_stage != this->raw_load_stage) {
TRACE(textures).print("raw_load_stage %d -> %d\n", this->m_raw_load_stage, this->raw_load_stage);
this->m_raw_load_stage = this->raw_load_stage;
if (this->m_raw_load_stage == 1)
reset_texpos();
Expand All @@ -225,6 +227,7 @@ struct tracking_stage_adopt_region : df::viewscreen_adopt_regionst {

DEFINE_VMETHOD_INTERPOSE(void, logic, ()) {
if (this->m_cur_step != this->cur_step) {
TRACE(textures).print("step %d -> %d\n", this->m_cur_step, this->cur_step);
this->m_cur_step = this->cur_step;
if (this->m_cur_step == 1)
reset_texpos();
Expand All @@ -243,6 +246,7 @@ struct tracking_stage_load_region : df::viewscreen_loadgamest {

DEFINE_VMETHOD_INTERPOSE(void, logic, ()) {
if (this->m_cur_step != this->cur_step) {
TRACE(textures).print("step %d -> %d\n", this->m_cur_step, this->cur_step);
this->m_cur_step = this->cur_step;
if (this->m_cur_step == 1)
reset_texpos();
Expand All @@ -261,6 +265,7 @@ struct tracking_stage_new_arena : df::viewscreen_new_arenast {

DEFINE_VMETHOD_INTERPOSE(void, logic, ()) {
if (this->m_cur_step != this->cur_step) {
TRACE(textures).print("step %d -> %d\n", this->m_cur_step, this->cur_step);
this->m_cur_step = this->cur_step;
if (this->m_cur_step == 0)
reset_texpos();
Expand Down