mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-09 05:00:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rollback to Alex's original changes to _synchronizationBuffer

Browse Source 
Allocated _synchronizationBuffer in SyncBuffer initialization instead to fix.
This commit is contained in:
Matthew Territo
2016-07-07 12:00:49 -06:00
parent da203364ba
commit cc5e520be5
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/openspace/util/syncbuffer.h
View File

@@ -107,7 +107,7 @@ private:
size_t _encodeOffset;
size_t _decodeOffset;
std::vector<char> _dataStream;
sgct::SharedVector<char> _synchronizationBuffer;
sgct::SharedVector<char>* _synchronizationBuffer;
};
} // namespace openspace

9
src/util/syncbuffer.cpp
View File

@@ -34,18 +34,19 @@ SyncBuffer::SyncBuffer(size_t n)
, _decodeOffset(0)
{
_dataStream.resize(_n);
_synchronizationBuffer = new sgct::SharedVector<char>();
}
void SyncBuffer::write() {
_synchronizationBuffer.setVal(_dataStream);
sgct::SharedData::instance()->writeVector(&_synchronizationBuffer);
_synchronizationBuffer->setVal(_dataStream);
sgct::SharedData::instance()->writeVector(_synchronizationBuffer);
_encodeOffset = 0;
_decodeOffset = 0;
}
void SyncBuffer::read() {
sgct::SharedData::instance()->readVector(&_synchronizationBuffer);
_dataStream = std::move(_synchronizationBuffer.getVal());
sgct::SharedData::instance()->readVector(_synchronizationBuffer);
_dataStream = std::move(_synchronizationBuffer->getVal());
_encodeOffset = 0;
_decodeOffset = 0;
}