mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-16 09:19:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged master into atm.

Browse Source
This commit is contained in:
Jonathas Costa
2017-08-16 12:00:28 -04:00
parent f95411b1cc 904ea5b447
commit 2d0da72a50
702 changed files with 6580 additions and 6798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/openspace/util/factorymanager.inl
View File

@@ -26,9 +26,9 @@ namespace openspace {
template <class T>
ghoul::TemplateFactory<T>* FactoryManager::factory() const {
for (auto& factory : _factories) {
if (factory.factory->baseClassType() == typeid(T))
return dynamic_cast<ghoul::TemplateFactory<T>*>(factory.factory.get());
for (auto& f : _factories) {
if (f.factory->baseClassType() == typeid(T))
return dynamic_cast<ghoul::TemplateFactory<T>*>(f.factory.get());
}
throw FactoryNotFoundError(typeid(T).name());

6
include/openspace/util/syncdata.h
View File

@@ -97,19 +97,19 @@ public:
}
protected:
virtual void encode(SyncBuffer* syncBuffer) {
virtual void encode(SyncBuffer* syncBuffer) override {
_mutex.lock();
syncBuffer->encode(data);
_mutex.unlock();
}
virtual void decode(SyncBuffer* syncBuffer) {
virtual void decode(SyncBuffer* syncBuffer) override {
_mutex.lock();
syncBuffer->decode(doubleBufferedData);
_mutex.unlock();
}
virtual void postsync(bool isMaster) {
virtual void postsync(bool isMaster) override {
// apply synced update
if (!isMaster) {
_mutex.lock();