prevent map from rendering under UI
This commit is contained in:
parent
d10d2810ab
commit
65124012d3
18
imgui.ini
18
imgui.ini
|
@ -4,17 +4,17 @@ Size=400,400
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
|
|
||||||
[Window][Phoenix Map Editor]
|
[Window][Phoenix Map Editor]
|
||||||
Pos=816,436
|
Pos=60,60
|
||||||
Size=773,184
|
Size=521,94
|
||||||
Collapsed=0
|
|
||||||
|
|
||||||
[Window][Map Editor Tools]
|
|
||||||
Pos=860,128
|
|
||||||
Size=357,247
|
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
|
|
||||||
[Window][Map Information Editor]
|
[Window][Map Information Editor]
|
||||||
Pos=845,633
|
Pos=481,255
|
||||||
Size=588,347
|
Size=549,264
|
||||||
|
Collapsed=0
|
||||||
|
|
||||||
|
[Window][Map Editor Tools]
|
||||||
|
Pos=60,60
|
||||||
|
Size=276,197
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
|
|
||||||
|
|
|
@ -220,14 +220,7 @@ void runMapEditor() {
|
||||||
// Rendering
|
// Rendering
|
||||||
ImGui::Render();
|
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);
|
SDL_RenderClear(state.renderer);
|
||||||
ImGui_ImplSDLRenderer_RenderDrawData(ImGui::GetDrawData());
|
|
||||||
|
|
||||||
SDL_RenderSetScale(state.renderer, editorState.editorScale,
|
SDL_RenderSetScale(state.renderer, editorState.editorScale,
|
||||||
editorState.editorScale);
|
editorState.editorScale);
|
||||||
|
@ -235,6 +228,15 @@ void runMapEditor() {
|
||||||
PRenderMap(&editorState.currentMap, true);
|
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);
|
SDL_RenderPresent(state.renderer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue