From d77aa2ab61304700c1d05d7ce2aed59d1efc9c57 Mon Sep 17 00:00:00 2001 From: scawful Date: Tue, 29 Apr 2025 08:21:11 -0400 Subject: [PATCH] Remove CleanupUnusedTextures method from Editor and OverworldEditor classes; eliminate unused texture cleanup logic from EditorManager to streamline performance. --- src/app/editor/editor.h | 2 -- src/app/editor/editor_manager.cc | 9 --------- src/app/editor/overworld/overworld_editor.cc | 7 ------- src/app/editor/overworld/overworld_editor.h | 6 ------ 4 files changed, 24 deletions(-) diff --git a/src/app/editor/editor.h b/src/app/editor/editor.h index 81e87f7d..8eebbb6c 100644 --- a/src/app/editor/editor.h +++ b/src/app/editor/editor.h @@ -78,8 +78,6 @@ class Editor { virtual absl::Status Clear() { return absl::OkStatus(); } - virtual void CleanupUnusedTextures(uint64_t current_time, uint64_t timeout) { } - EditorType type() const { return type_; } void set_context(EditorContext* context) { context_ = context; } diff --git a/src/app/editor/editor_manager.cc b/src/app/editor/editor_manager.cc index 82f474b5..d1a0cac5 100644 --- a/src/app/editor/editor_manager.cc +++ b/src/app/editor/editor_manager.cc @@ -307,15 +307,6 @@ absl::Status EditorManager::Update() { ImGui::End(); } } - - static uint64_t last_cleanup_time = 0; - uint64_t current_time = SDL_GetTicks64(); - - // Clean up unused textures every 5 seconds - if (current_time - last_cleanup_time > 5000) { - current_editor_set_->CleanupUnusedTextures(current_time, 5000); - last_cleanup_time = current_time; - } } if (show_homepage_) { diff --git a/src/app/editor/overworld/overworld_editor.cc b/src/app/editor/overworld/overworld_editor.cc index a00fab36..843c5f22 100644 --- a/src/app/editor/overworld/overworld_editor.cc +++ b/src/app/editor/overworld/overworld_editor.cc @@ -1458,12 +1458,5 @@ absl::Status OverworldEditor::Clear() { return absl::OkStatus(); } -void OverworldEditor::CleanupUnusedTextures(uint64_t current_time, - uint64_t timeout) { - for (auto &bmp : maps_bmp_) { - bmp.CleanupUnusedTexture(current_time, timeout); - } -} - } // namespace editor } // namespace yaze diff --git a/src/app/editor/overworld/overworld_editor.h b/src/app/editor/overworld/overworld_editor.h index 529a9ca1..b49fd27d 100644 --- a/src/app/editor/overworld/overworld_editor.h +++ b/src/app/editor/overworld/overworld_editor.h @@ -91,8 +91,6 @@ class OverworldEditor : public Editor, public gfx::GfxContext { absl::Status Save() override; absl::Status Clear() override; - void CleanupUnusedTextures(uint64_t current_time, uint64_t timeout) override; - int jump_to_tab() { return jump_to_tab_; } int jump_to_tab_ = -1; @@ -215,12 +213,8 @@ class OverworldEditor : public Editor, public gfx::GfxContext { bool middle_mouse_dragging_ = false; bool is_dragging_entity_ = false; - std::vector selected_tile_data_; gfx::Tilemap tile16_blockset_; - std::vector> tile8_individual_data_; - std::vector tile8_individual_; - Rom* rom_; Tile16Editor tile16_editor_{&tile16_blockset_};