Make SyncTask work with globebrowsing scripts

Add additional error information to http request
This commit is contained in:
Alexander Bock
2017-12-24 01:45:22 +01:00
parent 079627e4c1
commit c7c4f01f26
4 changed files with 75 additions and 16 deletions

View File

@@ -24,7 +24,9 @@
#include <modules/sync/tasks/syncassettask.h>
#include <openspace/moduleregistration.h>
#include <openspace/openspace.h>
#include <openspace/documentation/core_registration.h>
#include <openspace/documentation/verifier.h>
#include <openspace/util/synchronizationwatcher.h>
#include <openspace/scripting/scriptengine.h>
@@ -45,8 +47,7 @@ namespace {
namespace openspace {
SyncAssetTask::SyncAssetTask(const ghoul::Dictionary& dictionary)
{
SyncAssetTask::SyncAssetTask(const ghoul::Dictionary& dictionary) {
openspace::documentation::testSpecificationAndThrow(
documentation(),
dictionary,
@@ -64,6 +65,17 @@ void SyncAssetTask::perform(const Task::ProgressCallback & progressCallback) {
SynchronizationWatcher watcher;
scripting::ScriptEngine scriptEngine;
registerCoreClasses(scriptEngine);
for (OpenSpaceModule* m : AllModules()) {
scriptEngine.addLibrary(m->luaLibrary());
for (scripting::LuaLibrary& l : m->luaLibraries()) {
scriptEngine.addLibrary(l);
}
}
scriptEngine.initialize();
ghoul::lua::LuaState luaState;
@@ -79,7 +91,7 @@ void SyncAssetTask::perform(const Task::ProgressCallback & progressCallback) {
std::vector<std::shared_ptr<Asset>> allAssets = loader.rootAsset()->subTreeAssets();
while (true) {
while (true) {
bool inProgress = false;
for (const std::shared_ptr<Asset>& asset : allAssets) {
Asset::State state = asset->state();