mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-25 21:48:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Quick fix of issue with enabling colormap. Changed data structure in syncabledatastorage.

Browse Source
This commit is contained in:
Victor Lindquist
2022-05-25 03:01:16 -06:00
parent 83379d481c
commit 033800ff58
13 changed files with 546 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/softwareintegration/syncablefloatdatastorage.h
+15 -20
View File
@@ -29,9 +29,12 @@
#include <unordered_map>
#include <openspace/util/syncable.h>
#include <modules/softwareintegration/utils.h>
namespace openspace {
using namespace softwareintegration;
class SyncableFloatDataStorage : public Syncable {
public:
/* ====================== Types ===================== */
@@ -42,9 +45,11 @@ public:
bool dirty = true;
};
using ValueData = decltype(Value::data);
using Key = std::string;
using Storage = std::unordered_map<Key, Value>;
using SceneStorage = std::unordered_map<storage::Key, Value>;
using Identifier = std::string;
using Storage = std::unordered_map<Identifier, SceneStorage>;
using Iterator = Storage::iterator;
using SceneIterator = SceneStorage::iterator;
/* ================================================== */
/* ============== SyncEngine functions ============== */
@@ -53,33 +58,23 @@ public:
virtual void postSync(bool isMaster) override;
/* ================================================== */
const ValueData& fetch(const Key& key);
bool isDirty(const Key& key);
bool isSyncDirty(const Key& key);
void store(const Key& key, const ValueData& data);
const ValueData& fetch(const Identifier& identifier, const storage::Key key);
bool isDirty(const Identifier& identifier, const storage::Key key);
bool isSyncDirty(const Identifier& identifier, const storage::Key key);
void store(const Identifier& identifier, const storage::Key key, const ValueData& data);
private:
/* =============== Utility functions ================ */
size_t erase(const Key& key);
bool erase(const Identifier& identifier, const storage::Key key);
void insertAssign(Key key, const Value& value);
void insertAssign(const Identifier& identifier, const storage::Key key, const Value& value);
Value& at(const Key& key);
Iterator find(const Key& key);
/* ================================================== */
/* =================== Iterators ==================== */
Iterator end() noexcept;
Iterator begin() noexcept;
size_t count(const Identifier& identifier, const storage::Key key);
size_t count(const Identifier& identifier);
/* ================================================== */
std::mutex _mutex;
Storage _storage;
bool _storageDirty = true;
};
} // namespace openspace