From 65124012d360d4ad8b9825862b9a377387293ec2 Mon Sep 17 00:00:00 2001 From: Interfiber Date: Sat, 27 May 2023 20:18:30 -0400 Subject: [PATCH] prevent map from rendering under UI --- imgui.ini | 18 +++++++++--------- src/mapEditor.cpp | 16 +++++++++------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/imgui.ini b/imgui.ini index 5727037..f8cc83f 100644 --- a/imgui.ini +++ b/imgui.ini @@ -4,17 +4,17 @@ Size=400,400 Collapsed=0 [Window][Phoenix Map Editor] -Pos=816,436 -Size=773,184 -Collapsed=0 - -[Window][Map Editor Tools] -Pos=860,128 -Size=357,247 +Pos=60,60 +Size=521,94 Collapsed=0 [Window][Map Information Editor] -Pos=845,633 -Size=588,347 +Pos=481,255 +Size=549,264 +Collapsed=0 + +[Window][Map Editor Tools] +Pos=60,60 +Size=276,197 Collapsed=0 diff --git a/src/mapEditor.cpp b/src/mapEditor.cpp index ed7040a..b7ff349 100644 --- a/src/mapEditor.cpp +++ b/src/mapEditor.cpp @@ -220,14 +220,7 @@ void runMapEditor() { // Rendering ImGui::Render(); - SDL_RenderSetScale(state.renderer, io.DisplayFramebufferScale.x, - io.DisplayFramebufferScale.y); - SDL_SetRenderDrawColor(state.renderer, (Uint8)(clear_color.x * 255), - (Uint8)(clear_color.y * 255), - (Uint8)(clear_color.z * 255), - (Uint8)(clear_color.w * 255)); SDL_RenderClear(state.renderer); - ImGui_ImplSDLRenderer_RenderDrawData(ImGui::GetDrawData()); SDL_RenderSetScale(state.renderer, editorState.editorScale, editorState.editorScale); @@ -235,6 +228,15 @@ void runMapEditor() { PRenderMap(&editorState.currentMap, true); } + SDL_RenderSetScale(state.renderer, io.DisplayFramebufferScale.x, + io.DisplayFramebufferScale.y); + SDL_SetRenderDrawColor(state.renderer, (Uint8)(clear_color.x * 255), + (Uint8)(clear_color.y * 255), + (Uint8)(clear_color.z * 255), + (Uint8)(clear_color.w * 255)); + + ImGui_ImplSDLRenderer_RenderDrawData(ImGui::GetDrawData()); + SDL_RenderPresent(state.renderer); }