diff --git a/config/sgct/two_nodes.xml b/config/sgct/two_nodes.xml new file mode 100644 index 0000000000..456976ebe5 --- /dev/null +++ b/config/sgct/two_nodes.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/openspace.cfg b/openspace.cfg index 9ecf2e4be4..4becaf05a8 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -10,6 +10,7 @@ return { CONFIG = "${BASE_PATH}/config" }, SGCTConfig = "${SGCT}/single.xml", - --sgctConfig = "${SGCT}/single_sbs_stereo.xml", + --SGCTConfig = "${SGCT}/two_nodes.xml", + --SGCTConfig = "${SGCT}/single_sbs_stereo.xml", Scene = "${SCENEPATH}/default.scene" } \ No newline at end of file diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 57f4476745..55e29ad495 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -397,6 +397,9 @@ void OpenSpaceEngine::mouseScrollWheelCallback(int pos) void OpenSpaceEngine::encode() { +#ifdef FLARE_ONLY + _flare->encode(); +#else std::vector dataStream(1024); size_t offset = 0; @@ -405,21 +408,20 @@ void OpenSpaceEngine::encode() _synchronizationBuffer.setVal(dataStream); sgct::SharedData::instance()->writeVector(&_synchronizationBuffer); -#ifdef FLARE_ONLY - _flare->encode(); #endif } void OpenSpaceEngine::decode() { +#ifdef FLARE_ONLY + _flare->decode(); +#else sgct::SharedData::instance()->readVector(&_synchronizationBuffer); std::vector dataStream = std::move(_synchronizationBuffer.getVal()); size_t offset = 0; // deserialize in the same order as done in serialization _renderEngine->deserialize(dataStream, offset); -#ifdef FLARE_ONLY - _flare->decode(); #endif }