mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-08 22:38:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move OpenSpaceEngine::isMaster method into WindowWrapper class

Browse Source
This commit is contained in:
Alexander Bock
2017-02-25 11:29:28 -05:00
parent 4f64cbb141
commit 6c4efc4eec
10 changed files with 99 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/onscreengui/onscreenguimodule.cpp
View File

@@ -105,7 +105,7 @@ OnScreenGUIModule::OnScreenGUIModule()
OpenSpaceEngine::CallbackOption::PostSyncPreDraw,
[](){
WindowWrapper& wrapper = OsEng.windowWrapper();
if (OsEng.isMaster() && wrapper.isRegularRendering()) {
if (wrapper.isMaster() && wrapper.isRegularRendering()) {
glm::vec2 mousePosition = wrapper.mousePosition();
//glm::ivec2 drawBufferResolution = _windowWrapper->currentDrawBufferResolution();
glm::ivec2 windowSize = wrapper.currentWindowSize();
@@ -130,7 +130,7 @@ OnScreenGUIModule::OnScreenGUIModule()
[](){
WindowWrapper& wrapper = OsEng.windowWrapper();
bool showGui = wrapper.hasGuiWindow() ? wrapper.isGuiWindow() : true;
if (OsEng.isMaster() && wrapper.isRegularRendering() && showGui) {
if (wrapper.isMaster() && wrapper.isRegularRendering() && showGui) {
gui.endFrame();
}
}