From 3d6c5084915cf48ac37e79c052a339532efaea8b Mon Sep 17 00:00:00 2001 From: Kelsi Date: Tue, 5 May 2026 05:04:14 -0700 Subject: [PATCH] refactor(editor): remove dead marker renderer, clean up stale fields - Remove markerRenderer_ initialization, shutdown, update, and clear calls from EditorViewport (markers replaced by actual M2 rendering) - Remove unused saveAdtRequested_/saveWdtRequested_ fields and their void casts (replaced by unified exportZone workflow) - Zero warnings across both wowee and wowee_editor targets --- tools/editor/editor_ui.cpp | 2 -- tools/editor/editor_ui.hpp | 2 -- tools/editor/editor_viewport.cpp | 6 +----- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/tools/editor/editor_ui.cpp b/tools/editor/editor_ui.cpp index 6c5a9ee5..c581cab4 100644 --- a/tools/editor/editor_ui.cpp +++ b/tools/editor/editor_ui.cpp @@ -79,8 +79,6 @@ void EditorUI::processActions(EditorApp& app) { loadRequested_ = false; app.loadADT(loadMapNameBuf_, loadTileX_, loadTileY_); } - (void)saveAdtRequested_; - (void)saveWdtRequested_; } void EditorUI::renderMenuBar(EditorApp& app) { diff --git a/tools/editor/editor_ui.hpp b/tools/editor/editor_ui.hpp index b97578bf..780e639d 100644 --- a/tools/editor/editor_ui.hpp +++ b/tools/editor/editor_ui.hpp @@ -54,8 +54,6 @@ private: bool loadRequested_ = false; char savePathBuf_[512] = ""; - bool saveAdtRequested_ = false; - bool saveWdtRequested_ = false; // Paint panel PaintMode paintMode_ = PaintMode::Paint; diff --git a/tools/editor/editor_viewport.cpp b/tools/editor/editor_viewport.cpp index 468af930..eca94612 100644 --- a/tools/editor/editor_viewport.cpp +++ b/tools/editor/editor_viewport.cpp @@ -46,7 +46,6 @@ bool EditorViewport::initialize(rendering::VkContext* ctx, pipeline::AssetManage } waterRenderer_.initialize(ctx, ctx->getImGuiRenderPass(), perFrameSetLayout_); - markerRenderer_.initialize(ctx, ctx->getImGuiRenderPass(), perFrameSetLayout_); gizmo_.initialize(ctx, ctx->getImGuiRenderPass(), perFrameSetLayout_); LOG_INFO("Editor viewport initialized"); @@ -59,7 +58,6 @@ void EditorViewport::shutdown() { if (brushVB_) { vmaDestroyBuffer(vkCtx_->getAllocator(), brushVB_, brushVBAlloc_); brushVB_ = VK_NULL_HANDLE; } gizmo_.shutdown(); - markerRenderer_.shutdown(); waterRenderer_.shutdown(); if (wmoRenderer_) { wmoRenderer_->shutdown(); wmoRenderer_.reset(); } @@ -84,8 +82,7 @@ void EditorViewport::updateWater(const pipeline::ADTTerrain& terrain, int tileX, waterRenderer_.update(terrain, tileX, tileY); } -void EditorViewport::updateMarkers(const std::vector& objects) { - markerRenderer_.update(objects); +void EditorViewport::updateMarkers(const std::vector& /*objects*/) { } void EditorViewport::placeM2(const std::string& path, const glm::vec3& pos, @@ -106,7 +103,6 @@ void EditorViewport::clearObjects() { if (wmoRenderer_) { wmoRenderer_->clearAll(); } - markerRenderer_.clear(); } void EditorViewport::rebuildObjects(const std::vector& objects,