mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06: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

16
apps/OpenSpace/main.cpp
View File

@@ -83,10 +83,6 @@ std::pair<int, int> supportedOpenGLVersion() {
void mainInitFunc() {
LTRACE("main::mainInitFunc(begin)");
// Is this node the master?
// @CLEANUP: This can be removed and replaced with a call to a windowwrapper ---abock
OsEng.setMaster(SgctEngine->isMaster());
LDEBUG("Initializing OpenSpace Engine");
// @CLEANUP: The return value should be replaced with an exception ---abock
bool success = OsEng.initialize();
@@ -210,7 +206,7 @@ void mainPostDrawFunc() {
void mainExternalControlCallback(const char* receivedChars, int size) {
LTRACE("main::mainExternalControlCallback(begin)");
if (OsEng.isMaster()) {
if (SgctEngine->isMaster()) {
OsEng.externalControlCallback(receivedChars, size, 0);
}
LTRACE("main::mainExternalControlCallback(end)");
@@ -218,7 +214,7 @@ void mainExternalControlCallback(const char* receivedChars, int size) {
void mainKeyboardCallback(int key, int, int action, int mods) {
LTRACE("main::mainKeyboardCallback(begin)");
if (OsEng.isMaster()) {
if (SgctEngine->isMaster()) {
OsEng.keyboardCallback(
openspace::Key(key),
openspace::KeyModifier(mods),
@@ -230,7 +226,7 @@ void mainKeyboardCallback(int key, int, int action, int mods) {
void mainMouseButtonCallback(int key, int action) {
LTRACE("main::mainMouseButtonCallback(begin)");
if (OsEng.isMaster()) {
if (SgctEngine->isMaster()) {
OsEng.mouseButtonCallback(
openspace::MouseButton(key),
openspace::MouseAction(action)
@@ -240,19 +236,19 @@ void mainMouseButtonCallback(int key, int action) {
}
void mainMousePosCallback(double x, double y) {
if (OsEng.isMaster()) {
if (SgctEngine->isMaster()) {
OsEng.mousePositionCallback(x, y);
}
}
void mainMouseScrollCallback(double posX, double posY) {
if (OsEng.isMaster()) {
if (SgctEngine->isMaster()) {
OsEng.mouseScrollWheelCallback(posY);
}
}
void mainCharCallback(unsigned int codepoint, int mods) {
if (OsEng.isMaster()) {
if (SgctEngine->isMaster()) {
OsEng.charCallback(codepoint, openspace::KeyModifier(mods));
}
}