mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-26 23:08:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove sgct inclusion from SyncBuffer header and move to the source file

Browse Source 
Fix serialization of MatrixProperty
This commit is contained in:
Alexander Bock
2016-07-06 17:52:16 +02:00
parent fb39949daf
commit c9ac04d3cd
3 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,11 +25,16 @@
#ifndef SYNCBUFFER_H
#define SYNCBUFFER_H
#include <vector>
#include <ghoul/opengl/ghoul_gl.h>
#include <ghoul/misc/assert.h>
#include <sgct.h>
#include <stdint.h>
#include <vector>
namespace sgct {
template <typename T>
class SharedVector;
} // namespace sgct
namespace openspace {
@@ -40,7 +45,7 @@ public:
void encode(const std::string& s) {
const size_t size = sizeof(char) * s.size() + sizeof(int32_t);
assert(_encodeOffset + size < _n);
ghoul_assert(_encodeOffset + size < _n, "");
int32_t length = static_cast<int32_t>(s.length());
memcpy(_dataStream.data() + _encodeOffset, reinterpret_cast<const char*>(&length), sizeof(int32_t));
@@ -52,7 +57,7 @@ public:
template <typename T>
void encode(const T& v) {
const size_t size = sizeof(T);
assert(_encodeOffset + size < _n);
ghoul_assert(_encodeOffset + size < _n, "");
memcpy(_dataStream.data() + _encodeOffset, &v, size);
_encodeOffset += size;
@@ -74,7 +79,7 @@ public:
template <typename T>
T decode() {
const size_t size = sizeof(T);
assert(_decodeOffset + size < _n);
ghoul_assert(_decodeOffset + size < _n, "");
T value;
memcpy(&value, _dataStream.data() + _decodeOffset, size);
_decodeOffset += size;
@@ -88,7 +93,7 @@ public:
template <typename T>
void decode(T& value) {
const size_t size = sizeof(T);
assert(_decodeOffset + size < _n);
ghoul_assert(_decodeOffset + size < _n, "");
memcpy(&value, _dataStream.data() + _decodeOffset, size);
_decodeOffset += size;
}
@@ -102,7 +107,7 @@ private:
size_t _encodeOffset;
size_t _decodeOffset;
std::vector<char> _dataStream;
sgct::SharedVector<char> _synchronizationBuffer;
sgct::SharedVector<char>* _synchronizationBuffer;
};
} // namespace openspace