mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-20 17:51:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/resolution-independent' into feature/stereo

Browse Source
This commit is contained in:
Emil Axelsson
2018-02-16 14:24:33 +01:00
parent f129da5648 521cb0f5ae
commit 708d62d2a7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgui/imguimodule.cpp
+4 -2
View File
@@ -169,8 +169,10 @@ ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
WindowWrapper& wrapper = OsEng.windowWrapper();
bool showGui = wrapper.hasGuiWindow() ? wrapper.isGuiWindow() : true;
if (wrapper.isMaster() && showGui) {
const glm::ivec2 windowSize = wrapper.currentWindowSize();
const glm::ivec2 resolution = wrapper.currentWindowResolution();
glm::vec2 mousePosition = wrapper.mousePosition();
glm::ivec2 windowSize = wrapper.currentWindowSize();
uint32_t mouseButtons = wrapper.mouseButtons(2);
double dt = std::max(wrapper.averageDeltaTime(), 0.0);
@@ -183,7 +185,7 @@ ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
gui.startFrame(
static_cast<float>(dt),
glm::vec2(windowSize),
wrapper.dpiScaling(),
resolution / windowSize,
mousePosition,
mouseButtons
);