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

Feature/assets (#1784)

Browse Source 
General overhaul of the Asset loading system
This commit is contained in:
Alexander Bock
2021-12-19 21:04:01 +04:00
committed by GitHub
parent f8b5d4b662
commit debcb43ade
167 changed files with 3251 additions and 4441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
modules/sync/syncmodule.cpp
View File

@@ -26,7 +26,6 @@
#include <modules/sync/syncs/httpsynchronization.h>
#include <modules/sync/syncs/urlsynchronization.h>
#include <modules/sync/tasks/syncassettask.h>
#include <openspace/documentation/documentation.h>
#include <openspace/engine/globalscallbacks.h>
#include <openspace/rendering/renderable.h>
@@ -40,6 +39,7 @@
#include <ghoul/misc/dictionary.h>
#include <ghoul/misc/memorypool.h>
#include <ghoul/misc/templatefactory.h>
#include <optional>
#include "syncmodule_lua.inl"
@@ -47,6 +47,16 @@ namespace {
constexpr const char* KeyHttpSynchronizationRepositories =
"HttpSynchronizationRepositories";
constexpr const char* KeySynchronizationRoot = "SynchronizationRoot";
struct [[codegen::Dictionary(SyncModule)]] Parameters {
// The list of all repository URLs that are used to fetch data from for
// HTTPSynchronizations
std::optional<std::vector<std::string>> httpSynchronizationRepositories;
// The folder where all of the synchronizations are stored
std::string synchronizationRoot;
};
#include "syncmodule_codegen.cpp"
} // namespace
namespace openspace {
@@ -54,28 +64,13 @@ namespace openspace {
SyncModule::SyncModule() : OpenSpaceModule(Name) {}
void SyncModule::internalInitialize(const ghoul::Dictionary& configuration) {
if (configuration.hasKey(KeyHttpSynchronizationRepositories)) {
ghoul::Dictionary dictionary = configuration.value<ghoul::Dictionary>(
KeyHttpSynchronizationRepositories
);
const Parameters p = codegen::bake<Parameters>(configuration);
for (std::string_view key : dictionary.keys()) {
_synchronizationRepositories.push_back(dictionary.value<std::string>(key));
}
if (p.httpSynchronizationRepositories.has_value()) {
_synchronizationRepositories = *p.httpSynchronizationRepositories;
}
if (configuration.hasKey(KeySynchronizationRoot)) {
_synchronizationRoot = configuration.value<std::string>(KeySynchronizationRoot);
}
else {
LWARNINGC(
"SyncModule",
"No synchronization root specified. Disabling resource synchronization"
);
//_synchronizationEnabled = false;
// TODO: Make it possible to disable synchronization manually.
// Group root and enabled into a sync config object that can be passed to syncs.
}
_synchronizationRoot = absPath(p.synchronizationRoot);
auto fSynchronization = FactoryManager::ref().factory<ResourceSynchronization>();
ghoul_assert(fSynchronization, "ResourceSynchronization factory was not created");
@@ -106,40 +101,23 @@ void SyncModule::internalInitialize(const ghoul::Dictionary& configuration) {
[this](bool, const ghoul::Dictionary& dictionary, ghoul::MemoryPoolBase* pool) {
if (pool) {
void* ptr = pool->allocate(sizeof(UrlSynchronization));
return new (ptr) UrlSynchronization(
dictionary,
_synchronizationRoot
);
return new (ptr) UrlSynchronization(dictionary, _synchronizationRoot);
}
else {
return new UrlSynchronization(
dictionary,
_synchronizationRoot
);
return new UrlSynchronization(dictionary, _synchronizationRoot);
}
}
);
auto fTask = FactoryManager::ref().factory<Task>();
ghoul_assert(fTask, "No task factory existed");
fTask->registerClass<SyncAssetTask>("SyncAssetTask");
}
std::string SyncModule::synchronizationRoot() const {
std::filesystem::path SyncModule::synchronizationRoot() const {
return _synchronizationRoot;
}
void SyncModule::addHttpSynchronizationRepository(std::string repository) {
_synchronizationRepositories.push_back(std::move(repository));
}
std::vector<std::string> SyncModule::httpSynchronizationRepositories() const {
return _synchronizationRepositories;
}
std::vector<documentation::Documentation> SyncModule::documentations() const {
return {
HttpSynchronization::Documentation()
HttpSynchronization::Documentation(),
UrlSynchronization::Documentation()
};
}