mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-14 07:49:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop

Browse Source
This commit is contained in:
Alexander Bock
2014-12-03 15:42:51 +01:00
parent f1659e5c8b f7b2bc12e0
commit aba4d6024d
11 changed files with 132 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/engine/openspaceengine.cpp
View File

@@ -508,14 +508,18 @@ void OpenSpaceEngine::mouseScrollWheelCallback(int pos) {
void OpenSpaceEngine::encode()
{
_renderEngine.serialize(_syncBuffer);
_syncBuffer->write();
if (_syncBuffer) {
_renderEngine.serialize(_syncBuffer);
_syncBuffer->write();
}
}
void OpenSpaceEngine::decode()
{
_syncBuffer->read();
_renderEngine.deserialize(_syncBuffer);
if (_syncBuffer) {
_syncBuffer->read();
_renderEngine.deserialize(_syncBuffer);
}
}
void OpenSpaceEngine::externalControlCallback(const char* receivedChars,