From 30212b6768d5aa73ec5998b7cc5efdb0251198bb Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Thu, 10 Feb 2022 15:20:21 +0100 Subject: [PATCH] Adapt to new `auto` coding style --- apps/OpenSpace/ext/sgct | 2 +- ext/ghoul | 2 +- modules/atmosphere/atmospheremodule.cpp | 4 +- modules/base/basemodule.cpp | 23 +- .../base/dashboard/dashboarditemmission.cpp | 3 +- modules/debugging/debuggingmodule.cpp | 3 +- .../digitaluniverse/digitaluniversemodule.cpp | 3 +- modules/exoplanets/exoplanetsmodule.cpp | 5 +- modules/fieldlines/fieldlinesmodule.cpp | 3 +- .../fieldlinessequencemodule.cpp | 3 +- .../util/kameleonfieldlinehelper.cpp | 6 +- modules/gaia/gaiamodule.cpp | 5 +- modules/gaia/rendering/octreemanager.cpp | 8 +- modules/galaxy/galaxymodule.cpp | 5 +- modules/globebrowsing/globebrowsingmodule.cpp | 89 ++-- .../src/tileprovider/tileprovider.cpp | 6 +- modules/imgui/src/guipropertycomponent.cpp | 2 +- modules/iswa/iswamodule.cpp | 7 +- modules/iswa/rendering/datacygnet.cpp | 5 +- modules/iswa/util/dataprocessor.cpp | 2 +- modules/iswa/util/iswamanager.cpp | 5 +- modules/iswa/util/iswamanager_lua.inl | 14 +- modules/kameleon/src/kameleonhelper.cpp | 2 +- .../kameleonvolume/kameleonvolumemodule.cpp | 5 +- .../kameleonvolume/kameleonvolumereader.cpp | 3 +- .../multiresvolume/multiresvolumemodule.cpp | 3 +- modules/server/servermodule.cpp | 2 +- modules/server/src/jsonconverters.cpp | 5 - modules/server/src/serverinterface.cpp | 2 +- .../server/src/topics/authorizationtopic.cpp | 8 +- modules/space/rendering/planetgeometry.cpp | 3 +- modules/space/spacemodule.cpp | 16 +- .../space/translation/horizonstranslation.cpp | 7 +- .../spacecraftinstrumentsmodule.cpp | 8 +- modules/spout/spoutmodule.cpp | 6 +- modules/sync/syncmodule.cpp | 3 +- modules/sync/syncs/httpsynchronization.cpp | 11 +- modules/sync/syncs/urlsynchronization.cpp | 11 +- modules/touch/src/win32_touch.cpp | 8 +- modules/toyvolume/toyvolumemodule.cpp | 3 +- modules/vislab/vislabmodule.cpp | 3 +- modules/volume/rawvolumereader.inl | 4 +- modules/volume/volumemodule.cpp | 5 +- modules/webbrowser/webbrowsermodule.cpp | 3 +- src/engine/downloadmanager.cpp | 4 +- src/interaction/sessionrecording.cpp | 2 +- src/network/parallelpeer.cpp | 2 +- src/network/parallelserver.cpp | 2 +- src/rendering/dashboarditem.cpp | 3 +- src/rendering/renderable.cpp | 2 +- src/rendering/renderengine.cpp | 2 +- src/scene/assetmanager.cpp | 5 +- src/scene/lightsource.cpp | 3 +- src/scene/scale.cpp | 3 +- src/scene/timeframe.cpp | 7 +- src/util/resourcesynchronization.cpp | 3 +- src/util/task.cpp | 3 +- tests/test_scriptscheduler.cpp | 483 +++++++++--------- 58 files changed, 446 insertions(+), 404 deletions(-) diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index 15c2a977e1..20e67ebb4f 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit 15c2a977e16350f9c98a4ef74d6b35a43d35b0bb +Subproject commit 20e67ebb4f0f2544b1703f2c85e26be4b4cfb051 diff --git a/ext/ghoul b/ext/ghoul index 6d3cf35bcb..b4e0bbd108 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 6d3cf35bcb1ab03da3d4b2577156441b914c5547 +Subproject commit b4e0bbd108c1189173af8cad53c2fbc680a0a976 diff --git a/modules/atmosphere/atmospheremodule.cpp b/modules/atmosphere/atmospheremodule.cpp index c98166061f..2d7b08c8c6 100644 --- a/modules/atmosphere/atmospheremodule.cpp +++ b/modules/atmosphere/atmospheremodule.cpp @@ -36,8 +36,10 @@ namespace openspace { AtmosphereModule::AtmosphereModule() : OpenSpaceModule(Name) {} void AtmosphereModule::internalInitialize(const ghoul::Dictionary&) { - auto fRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRenderable = + FactoryManager::ref().factory(); ghoul_assert(fRenderable, "No renderable factory existed"); + fRenderable->registerClass("RenderableAtmosphere"); } diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp index 00a1b14ec8..0833f68966 100644 --- a/modules/base/basemodule.cpp +++ b/modules/base/basemodule.cpp @@ -93,7 +93,8 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) { "ScreenSpaceRenderable" ); - auto fSsRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fSsRenderable = + FactoryManager::ref().factory(); ghoul_assert(fSsRenderable, "ScreenSpaceRenderable factory was not created"); fSsRenderable->registerClass("ScreenSpaceDashboard"); @@ -101,7 +102,8 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) { fSsRenderable->registerClass("ScreenSpaceImageOnline"); fSsRenderable->registerClass("ScreenSpaceFramebuffer"); - auto fDashboard = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fDashboard = + FactoryManager::ref().factory(); ghoul_assert(fDashboard, "Dashboard factory was not created"); fDashboard->registerClass("DashboardItemAngle"); @@ -122,7 +124,8 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) { fDashboard->registerClass("DashboardItemText"); fDashboard->registerClass("DashboardItemVelocity"); - auto fRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRenderable = + FactoryManager::ref().factory(); ghoul_assert(fRenderable, "Renderable factory was not created"); fRenderable->registerClass("RenderableBoxGrid"); @@ -147,14 +150,16 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) { fRenderable->registerClass("RenderableTrailOrbit"); fRenderable->registerClass("RenderableTrailTrajectory"); - auto fTranslation = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fTranslation = + FactoryManager::ref().factory(); ghoul_assert(fTranslation, "Ephemeris factory was not created"); fTranslation->registerClass("TimelineTranslation"); fTranslation->registerClass("LuaTranslation"); fTranslation->registerClass("StaticTranslation"); - auto fRotation = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRotation = + FactoryManager::ref().factory(); ghoul_assert(fRotation, "Rotation factory was not created"); fRotation->registerClass("ConstantRotation"); @@ -164,7 +169,7 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) { fRotation->registerClass("TimelineRotation"); - auto fScale = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fScale = FactoryManager::ref().factory(); ghoul_assert(fScale, "Scale factory was not created"); fScale->registerClass("LuaScale"); @@ -172,13 +177,15 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) { fScale->registerClass("StaticScale"); fScale->registerClass("TimeDependentScale"); - auto fTimeFrame = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fTimeFrame = + FactoryManager::ref().factory(); ghoul_assert(fTimeFrame, "Scale factory was not created"); fTimeFrame->registerClass("TimeFrameInterval"); fTimeFrame->registerClass("TimeFrameUnion"); - auto fLightSource = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fLightSource = + FactoryManager::ref().factory(); ghoul_assert(fLightSource, "Light Source factory was not created"); fLightSource->registerClass("CameraLightSource"); diff --git a/modules/base/dashboard/dashboarditemmission.cpp b/modules/base/dashboard/dashboarditemmission.cpp index 110997a26b..6785c778ea 100644 --- a/modules/base/dashboard/dashboarditemmission.cpp +++ b/modules/base/dashboard/dashboarditemmission.cpp @@ -92,8 +92,7 @@ void DashboardItemMission::render(glm::vec2& penPosition) { ghoul::fontrendering::CrDirection::Down ); - auto phaseTrace = mission.phaseTrace(currentTime); - + MissionPhase::Trace phaseTrace = mission.phaseTrace(currentTime); if (!phaseTrace.empty()) { const MissionPhase& phase = phaseTrace.back().get(); const std::string title = "Current Mission Phase: " + phase.name(); diff --git a/modules/debugging/debuggingmodule.cpp b/modules/debugging/debuggingmodule.cpp index 3f10f0f015..68a8a82a78 100644 --- a/modules/debugging/debuggingmodule.cpp +++ b/modules/debugging/debuggingmodule.cpp @@ -39,7 +39,8 @@ namespace openspace { DebuggingModule::DebuggingModule() : OpenSpaceModule(Name) {} void DebuggingModule::internalInitialize(const ghoul::Dictionary&) { - auto fRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRenderable = + FactoryManager::ref().factory(); ghoul_assert(fRenderable, "No renderable factory existed"); fRenderable->registerClass("RenderableDebugPlane"); diff --git a/modules/digitaluniverse/digitaluniversemodule.cpp b/modules/digitaluniverse/digitaluniversemodule.cpp index 40561d7572..3a3ad8bd64 100644 --- a/modules/digitaluniverse/digitaluniversemodule.cpp +++ b/modules/digitaluniverse/digitaluniversemodule.cpp @@ -44,7 +44,8 @@ DigitalUniverseModule::DigitalUniverseModule() {} void DigitalUniverseModule::internalInitialize(const ghoul::Dictionary&) { - auto fRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRenderable = + FactoryManager::ref().factory(); ghoul_assert(fRenderable, "Renderable factory was not created"); fRenderable->registerClass("RenderablePoints"); diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp index 15c4612af6..4b0a4191f2 100644 --- a/modules/exoplanets/exoplanetsmodule.cpp +++ b/modules/exoplanets/exoplanetsmodule.cpp @@ -328,8 +328,9 @@ void ExoplanetsModule::internalInitialize(const ghoul::Dictionary& dict) { _habitableZoneOpacity = p.habitableZoneOpacity.value_or(_habitableZoneOpacity); - auto fTask = FactoryManager::ref().factory(); - auto fRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fTask = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRenderable = + FactoryManager::ref().factory(); ghoul_assert(fTask, "No task factory existed"); fTask->registerClass("ExoplanetsDataPreparationTask"); fRenderable->registerClass("RenderableOrbitDisc"); diff --git a/modules/fieldlines/fieldlinesmodule.cpp b/modules/fieldlines/fieldlinesmodule.cpp index c940f45f8a..f72a1b3a92 100644 --- a/modules/fieldlines/fieldlinesmodule.cpp +++ b/modules/fieldlines/fieldlinesmodule.cpp @@ -35,7 +35,8 @@ namespace openspace { FieldlinesModule::FieldlinesModule() : OpenSpaceModule(Name) {} void FieldlinesModule::internalInitialize(const ghoul::Dictionary&) { - auto fRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRenderable = + FactoryManager::ref().factory(); ghoul_assert(fRenderable, "No renderable factory existed"); fRenderable->registerClass("RenderableFieldlines"); diff --git a/modules/fieldlinessequence/fieldlinessequencemodule.cpp b/modules/fieldlinessequence/fieldlinessequencemodule.cpp index b832c33571..c8e3fda02d 100644 --- a/modules/fieldlinessequence/fieldlinessequencemodule.cpp +++ b/modules/fieldlinessequence/fieldlinessequencemodule.cpp @@ -60,7 +60,8 @@ FieldlinesSequenceModule::FieldlinesSequenceModule() : OpenSpaceModule(Name) { } void FieldlinesSequenceModule::internalInitialize(const ghoul::Dictionary&) { - auto factory = FactoryManager::ref().factory(); + ghoul::TemplateFactory* factory = + FactoryManager::ref().factory(); ghoul_assert(factory, "No renderable factory existed"); factory->registerClass("RenderableFieldlinesSequence"); diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp index 4aecc923f2..498fcc2a18 100644 --- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp +++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp @@ -181,8 +181,7 @@ bool addLinesToState(ccmc::Kameleon* kameleon, const std::vector& see // We have to create a new tracer (or actually a new interpolator) for each // // new line, otherwise some issues occur // //--------------------------------------------------------------------------// - std::unique_ptr interpolator = - std::make_unique(kameleon->model); + auto interpolator = std::make_unique(kameleon->model); ccmc::Tracer tracer(kameleon, interpolator.get()); tracer.setInnerBoundary(innerBoundaryLimit); // TODO specify in Lua? ccmc::Fieldline ccmcFieldline = tracer.bidirectionalTrace( @@ -235,8 +234,7 @@ void addExtraQuantities(ccmc::Kameleon* kameleon, const size_t nXtraScalars = extraScalarVars.size(); const size_t nXtraMagnitudes = extraMagVars.size() / 3; - std::unique_ptr interpolator = - std::make_unique(kameleon->model); + auto interpolator = std::make_unique(kameleon->model); // ------ Extract all the extraQuantities from kameleon and store in state! ------ // for (const glm::vec3& p : state.vertexPositions()) { diff --git a/modules/gaia/gaiamodule.cpp b/modules/gaia/gaiamodule.cpp index b330832b22..132b1f4d76 100644 --- a/modules/gaia/gaiamodule.cpp +++ b/modules/gaia/gaiamodule.cpp @@ -40,11 +40,12 @@ namespace openspace { GaiaModule::GaiaModule() : OpenSpaceModule(Name) {} void GaiaModule::internalInitialize(const ghoul::Dictionary&) { - auto fRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRenderable = + FactoryManager::ref().factory(); ghoul_assert(fRenderable, "No renderable factory existed"); fRenderable->registerClass("RenderableGaiaStars"); - auto fTask = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fTask = FactoryManager::ref().factory(); ghoul_assert(fRenderable, "No task factory existed"); fTask->registerClass("ReadFitsTask"); fTask->registerClass("ReadSpeckTask"); diff --git a/modules/gaia/rendering/octreemanager.cpp b/modules/gaia/rendering/octreemanager.cpp index 108def7500..0ecefcb82c 100644 --- a/modules/gaia/rendering/octreemanager.cpp +++ b/modules/gaia/rendering/octreemanager.cpp @@ -134,7 +134,7 @@ void OctreeManager::sliceLodData(size_t branchIndex) { } void OctreeManager::printStarsPerNode() const { - auto accumulatedString = std::string(); + std::string accumulatedString; for (int i = 0; i < 8; ++i) { std::string prefix = "{" + std::to_string(i); @@ -297,7 +297,7 @@ void OctreeManager::findAndFetchNeighborNode(unsigned long long firstParentId, i int y, int z, int additionalLevelsToFetch) { unsigned long long parentId = firstParentId; - auto indexStack = std::stack(); + std::stack indexStack; // Fetch first layer children if we're already at root. if (parentId == 8) { @@ -398,7 +398,7 @@ std::map> OctreeManager::traverseData(const glm::dmat4& gaia::RenderOption option, float lodPixelThreshold) { - auto renderData = std::map>(); + std::map> renderData; bool innerRebuild = false; _minTotalPixelsLod = lodPixelThreshold; @@ -1264,7 +1264,7 @@ std::vector OctreeManager::getNodeData(const OctreeNode& node, } // If we're not in a leaf, get data from all children recursively. - auto nodeData = std::vector(); + std::vector nodeData; for (size_t i = 0; i < 8; ++i) { std::vector tmpData = getNodeData(*node.Children[i], option); nodeData.insert(nodeData.end(), tmpData.begin(), tmpData.end()); diff --git a/modules/galaxy/galaxymodule.cpp b/modules/galaxy/galaxymodule.cpp index f2917b8be5..201cc2571f 100644 --- a/modules/galaxy/galaxymodule.cpp +++ b/modules/galaxy/galaxymodule.cpp @@ -38,11 +38,12 @@ namespace openspace { GalaxyModule::GalaxyModule() : OpenSpaceModule(Name) {} void GalaxyModule::internalInitialize(const ghoul::Dictionary&) { - auto fRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRenderable = + FactoryManager::ref().factory(); ghoul_assert(fRenderable, "No renderable factory existed"); fRenderable->registerClass("RenderableGalaxy"); - auto fTask = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fTask = FactoryManager::ref().factory(); ghoul_assert(fRenderable, "No task factory existed"); fTask->registerClass("MilkywayConversionTask"); fTask->registerClass("MilkywayPointsConversionTask"); diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp index 664951d708..65c8d87b70 100644 --- a/modules/globebrowsing/globebrowsingmodule.cpp +++ b/modules/globebrowsing/globebrowsingmodule.cpp @@ -274,65 +274,60 @@ void GlobeBrowsingModule::internalInitialize(const ghoul::Dictionary& dict) { GdalWrapper::destroy(); }); - auto fRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRenderable = + FactoryManager::ref().factory(); ghoul_assert(fRenderable, "Renderable factory was not created"); fRenderable->registerClass("RenderableGlobe"); - auto fTranslation = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fTranslation = + FactoryManager::ref().factory(); ghoul_assert(fTranslation, "Translation factory was not created"); fTranslation->registerClass("GlobeTranslation"); - auto fRotation = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRotation = + FactoryManager::ref().factory(); ghoul_assert(fRotation, "Rotation factory was not created"); fRotation->registerClass("GlobeRotation"); - auto fTileProvider = std::make_unique>(); + FactoryManager::ref().addFactory( + std::make_unique>(), + _factoryName + ); + + ghoul::TemplateFactory* fTileProvider = + FactoryManager::ref().factory(); ghoul_assert(fTileProvider, "TileProvider factory was not created"); - fTileProvider->registerClass( - layergroupid::LAYER_TYPE_NAMES[static_cast( - layergroupid::TypeID::DefaultTileLayer - )] - ); - fTileProvider->registerClass( - layergroupid::LAYER_TYPE_NAMES[static_cast( - layergroupid::TypeID::SingleImageTileLayer - )] - ); - fTileProvider->registerClass( - layergroupid::LAYER_TYPE_NAMES[static_cast( - layergroupid::TypeID::ImageSequenceTileLayer - )] - ); - fTileProvider->registerClass( - layergroupid::LAYER_TYPE_NAMES[static_cast( - layergroupid::TypeID::TemporalTileLayer - )] - ); - fTileProvider->registerClass( - layergroupid::LAYER_TYPE_NAMES[static_cast( - layergroupid::TypeID::TileIndexTileLayer - )] - ); - fTileProvider->registerClass( - layergroupid::LAYER_TYPE_NAMES[static_cast( - layergroupid::TypeID::SizeReferenceTileLayer - )] - ); - fTileProvider->registerClass( - layergroupid::LAYER_TYPE_NAMES[static_cast( - layergroupid::TypeID::ByLevelTileLayer - )] - ); - fTileProvider->registerClass( - layergroupid::LAYER_TYPE_NAMES[static_cast( - layergroupid::TypeID::ByIndexTileLayer - )] - ); + { + using namespace layergroupid; + fTileProvider->registerClass( + LAYER_TYPE_NAMES[static_cast(TypeID::DefaultTileLayer)] + ); + fTileProvider->registerClass( + LAYER_TYPE_NAMES[static_cast(TypeID::SingleImageTileLayer)] + ); + fTileProvider->registerClass( + LAYER_TYPE_NAMES[static_cast(TypeID::ImageSequenceTileLayer)] + ); + fTileProvider->registerClass( + LAYER_TYPE_NAMES[static_cast(TypeID::TemporalTileLayer)] + ); + fTileProvider->registerClass( + LAYER_TYPE_NAMES[static_cast(TypeID::TileIndexTileLayer)] + ); + fTileProvider->registerClass( + LAYER_TYPE_NAMES[static_cast(TypeID::SizeReferenceTileLayer)] + ); + fTileProvider->registerClass( + LAYER_TYPE_NAMES[static_cast(TypeID::ByLevelTileLayer)] + ); + fTileProvider->registerClass( + LAYER_TYPE_NAMES[static_cast(TypeID::ByIndexTileLayer)] + ); + } - FactoryManager::ref().addFactory(std::move(fTileProvider), _factoryName); - - auto fDashboard = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fDashboard = + FactoryManager::ref().factory(); ghoul_assert(fDashboard, "Dashboard factory was not created"); fDashboard->registerClass("DashboardItemGlobeLocation"); diff --git a/modules/globebrowsing/src/tileprovider/tileprovider.cpp b/modules/globebrowsing/src/tileprovider/tileprovider.cpp index cc7ea99e24..a0326513ef 100644 --- a/modules/globebrowsing/src/tileprovider/tileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider/tileprovider.cpp @@ -78,7 +78,11 @@ std::unique_ptr TileProvider::createFromDictionary( ZoneScoped const char* type = layergroupid::LAYER_TYPE_NAMES[static_cast(layerTypeID)]; - auto factory = FactoryManager::ref().factory(); + + ghoul::TemplateFactory* factory = + FactoryManager::ref().factory(); + ghoul_assert(factory, "TileProvider factory not created"); + TileProvider* result = factory->create(type, dictionary); return std::unique_ptr(result); } diff --git a/modules/imgui/src/guipropertycomponent.cpp b/modules/imgui/src/guipropertycomponent.cpp index f43ea7fb5b..3cb6a13843 100644 --- a/modules/imgui/src/guipropertycomponent.cpp +++ b/modules/imgui/src/guipropertycomponent.cpp @@ -131,7 +131,7 @@ namespace { } else { // We don't have a child, so we must generate it - std::unique_ptr newNode = std::make_unique(*path.begin()); + auto newNode = std::make_unique(*path.begin()); n = newNode.get(); node.children.push_back(std::move(newNode)); } diff --git a/modules/iswa/iswamodule.cpp b/modules/iswa/iswamodule.cpp index 1a9becde4d..c99ecdaf6b 100644 --- a/modules/iswa/iswamodule.cpp +++ b/modules/iswa/iswamodule.cpp @@ -50,8 +50,8 @@ IswaModule::IswaModule() : OpenSpaceModule(Name) { } void IswaModule::internalInitialize(const ghoul::Dictionary&) { - - auto fRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRenderable = + FactoryManager::ref().factory(); ghoul_assert(fRenderable, "No renderable factory existed"); fRenderable->registerClass("TexturePlane"); @@ -59,7 +59,8 @@ void IswaModule::internalInitialize(const ghoul::Dictionary&) { fRenderable->registerClass("KameleonPlane"); fRenderable->registerClass("DataSphere"); - auto fScreenSpaceRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fScreenSpaceRenderable = + FactoryManager::ref().factory(); ghoul_assert(fScreenSpaceRenderable, "No fScreenSpaceRenderable factory existed"); fScreenSpaceRenderable->registerClass("ScreenSpaceCygnet"); diff --git a/modules/iswa/rendering/datacygnet.cpp b/modules/iswa/rendering/datacygnet.cpp index f69e37cd80..7d49a82edf 100644 --- a/modules/iswa/rendering/datacygnet.cpp +++ b/modules/iswa/rendering/datacygnet.cpp @@ -132,8 +132,7 @@ bool DataCygnet::updateTexture() { } if (!_textures[option]) { - using namespace ghoul::opengl; - std::unique_ptr texture = std::make_unique( + auto texture = std::make_unique( values, _textureDimensions, GL_TEXTURE_2D, @@ -146,7 +145,7 @@ bool DataCygnet::updateTexture() { if (texture) { texture->uploadTexture(); - texture->setFilter(Texture::FilterMode::LinearMipMap); + texture->setFilter(ghoul::opengl::Texture::FilterMode::LinearMipMap); _textures[option] = std::move(texture); } } diff --git a/modules/iswa/util/dataprocessor.cpp b/modules/iswa/util/dataprocessor.cpp index 5777a00d98..d7bfd22c57 100644 --- a/modules/iswa/util/dataprocessor.cpp +++ b/modules/iswa/util/dataprocessor.cpp @@ -232,7 +232,7 @@ void DataProcessor::add(const std::vector>& optionValues, _histNormValues ); //unnormalize histMin, histMax - std::unique_ptr newHist = std::make_unique( + auto newHist = std::make_unique( std::min(min, normalizeWithStandardScore( unNormHistMin, mean, diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp index 6d45865bdf..6710de7048 100644 --- a/modules/iswa/util/iswamanager.cpp +++ b/modules/iswa/util/iswamanager.cpp @@ -336,8 +336,7 @@ std::map>& IswaManager::cdfInformation() { } std::shared_ptr IswaManager::downloadMetadata(int id) { - std::shared_ptr metaFuture = std::make_shared(); - + auto metaFuture = std::make_shared(); metaFuture->id = id; global::downloadManager->fetchFile( _baseUrl + std::to_string(-id), @@ -672,7 +671,7 @@ void IswaManager::fillCygnetInfo(std::string jsonString) { // ,"listOfStaleCygnets", "listOfInactiveCygnets", }; - for (auto list : lists) { + for (const std::string& list : lists) { json jsonList = j[list]; for (size_t i = 0; i < jsonList.size(); ++i) { json jCygnet = jsonList.at(i); diff --git a/modules/iswa/util/iswamanager_lua.inl b/modules/iswa/util/iswamanager_lua.inl index 637c70bb69..93d5465c98 100644 --- a/modules/iswa/util/iswamanager_lua.inl +++ b/modules/iswa/util/iswamanager_lua.inl @@ -74,13 +74,14 @@ int iswa_addScreenSpaceCygnet(lua_State* L) { int id = static_cast(d.value("CygnetId")); - auto cygnetInformation = IswaManager::ref().cygnetInformation(); + std::map> cygnetInformation = + IswaManager::ref().cygnetInformation(); if (cygnetInformation.find(id) == cygnetInformation.end()) { LWARNING("Could not find Cygnet with id = " + std::to_string(id)); return 0; } - auto info = cygnetInformation[id]; + std::shared_ptr info = cygnetInformation[id]; std::string name = info->name; int updateInterval = info->updateInterval; info->selected = true; @@ -140,13 +141,14 @@ int iswa_removeScrenSpaceCygnet(lua_State* L) { int id = static_cast(lua_tonumber(L, 1)); - auto cygnetInformation = IswaManager::ref().cygnetInformation(); + std::map> cygnetInformation = + IswaManager::ref().cygnetInformation(); if (cygnetInformation.find(id) == cygnetInformation.end()) { LWARNING("Could not find Cygnet with id = " + std::to_string(id)); return 0; } - auto info = cygnetInformation[id]; + std::shared_ptr info = cygnetInformation[id]; info->selected = false; std::string script = @@ -164,7 +166,8 @@ int iswa_removeGroup(lua_State* L) { std::string name = luaL_checkstring(L, -1); // IswaManager::ref().unregisterGroup(id); - auto groups = IswaManager::ref().groups(); + std::map> groups = + IswaManager::ref().groups(); if (groups.find(name) != groups.end()) { groups[name]->clearGroup(); } @@ -183,7 +186,6 @@ int iswa_addKameleonPlanes(lua_State* L) { std::string group = luaL_checkstring(L, 1); int pos = static_cast(lua_tonumber(L, 2)); IswaManager::ref().addKameleonCdf(group, pos); - // auto cdfInfo = return 0; } diff --git a/modules/kameleon/src/kameleonhelper.cpp b/modules/kameleon/src/kameleonhelper.cpp index a025bffa85..ac50c9be51 100644 --- a/modules/kameleon/src/kameleonhelper.cpp +++ b/modules/kameleon/src/kameleonhelper.cpp @@ -48,7 +48,7 @@ namespace { namespace openspace::kameleonHelper { std::unique_ptr createKameleonObject(const std::string& cdfFilePath) { - std::unique_ptr kameleon = std::make_unique(); + auto kameleon = std::make_unique(); LDEBUG(fmt::format("\tOpening the cdf file: {}", cdfFilePath)); long kamStatus = kameleon->open(cdfFilePath); diff --git a/modules/kameleonvolume/kameleonvolumemodule.cpp b/modules/kameleonvolume/kameleonvolumemodule.cpp index d0a1ff7276..9606e08d0f 100644 --- a/modules/kameleonvolume/kameleonvolumemodule.cpp +++ b/modules/kameleonvolume/kameleonvolumemodule.cpp @@ -40,11 +40,12 @@ KameleonVolumeModule::KameleonVolumeModule() : OpenSpaceModule(Name) {} void KameleonVolumeModule::internalInitialize(const ghoul::Dictionary&) { using namespace kameleonvolume; - auto fRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRenderable = + FactoryManager::ref().factory(); ghoul_assert(fRenderable, "No renderable factory existed"); fRenderable->registerClass("RenderableKameleonVolume"); - auto fTask = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fTask = FactoryManager::ref().factory(); ghoul_assert(fTask, "No task factory existed"); fTask->registerClass("KameleonMetadataToJsonTask"); fTask->registerClass("KameleonDocumentationTask"); diff --git a/modules/kameleonvolume/kameleonvolumereader.cpp b/modules/kameleonvolume/kameleonvolumereader.cpp index be68cf80eb..b150627979 100644 --- a/modules/kameleonvolume/kameleonvolumereader.cpp +++ b/modules/kameleonvolume/kameleonvolumereader.cpp @@ -122,8 +122,7 @@ std::unique_ptr> KameleonVolumeReader::readFloatVolume( minValue = std::numeric_limits::max(); maxValue = -std::numeric_limits::max(); - std::unique_ptr> volume = - std::make_unique>(dimensions); + auto volume = std::make_unique>(dimensions); const glm::vec3 dims = volume->dimensions(); const glm::vec3 diff = upperBound - lowerBound; diff --git a/modules/multiresvolume/multiresvolumemodule.cpp b/modules/multiresvolume/multiresvolumemodule.cpp index 9d844c227a..3622d70ad7 100644 --- a/modules/multiresvolume/multiresvolumemodule.cpp +++ b/modules/multiresvolume/multiresvolumemodule.cpp @@ -35,7 +35,8 @@ namespace openspace { MultiresVolumeModule::MultiresVolumeModule() : OpenSpaceModule(Name) {} void MultiresVolumeModule::internalInitialize(const ghoul::Dictionary&) { - auto fRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRenderable = + FactoryManager::ref().factory(); ghoul_assert(fRenderable, "No renderable factory existed"); fRenderable->registerClass("RenderableMultiresVolume"); diff --git a/modules/server/servermodule.cpp b/modules/server/servermodule.cpp index ffc3dc42da..27346754c0 100644 --- a/modules/server/servermodule.cpp +++ b/modules/server/servermodule.cpp @@ -137,7 +137,7 @@ void ServerModule::preSync() { continue; } socket->startStreams(); - std::shared_ptr connection = std::make_shared( + auto connection = std::make_shared( std::move(socket), address, false, diff --git a/modules/server/src/jsonconverters.cpp b/modules/server/src/jsonconverters.cpp index bdb4d4fcc9..248968d834 100644 --- a/modules/server/src/jsonconverters.cpp +++ b/modules/server/src/jsonconverters.cpp @@ -130,11 +130,6 @@ void to_json(json& j, const SceneGraphNode& n) { { "subowners", n.propertySubOwners() } }; -/* - auto renderable = n.renderable(); - if (renderable != nullptr) { - j["renderable"] = renderable; - }*/ SceneGraphNode* parent = n.parent(); if (parent) { diff --git a/modules/server/src/serverinterface.cpp b/modules/server/src/serverinterface.cpp index 87f0b90595..da924b5413 100644 --- a/modules/server/src/serverinterface.cpp +++ b/modules/server/src/serverinterface.cpp @@ -94,7 +94,7 @@ std::unique_ptr ServerInterface::createFromDictionary( const ghoul::Dictionary& config) { // TODO: Use documentation to verify dictionary - std::unique_ptr si = std::make_unique(config); + auto si = std::make_unique(config); return si; } diff --git a/modules/server/src/topics/authorizationtopic.cpp b/modules/server/src/topics/authorizationtopic.cpp index 647a12ea9a..c1011519ec 100644 --- a/modules/server/src/topics/authorizationtopic.cpp +++ b/modules/server/src/topics/authorizationtopic.cpp @@ -54,7 +54,7 @@ void AuthorizationTopic::handleJson(const nlohmann::json& json) { } else { try { - auto providedKey = json.at("key").get(); + std::string providedKey = json.at("key").get(); if (authorize(providedKey)) { _connection->setAuthorized(true); _connection->sendJson(wrappedPayload({ KeyStatus, Authorized })); @@ -63,9 +63,11 @@ void AuthorizationTopic::handleJson(const nlohmann::json& json) { else { _connection->sendJson(wrappedPayload({ KeyStatus, IncorrectKey })); } - } catch (const std::out_of_range&) { + } + catch (const std::out_of_range&) { _connection->sendJson(wrappedPayload({ KeyStatus, BadRequest })); - } catch (const std::domain_error&) { + } + catch (const std::domain_error&) { _connection->sendJson(wrappedPayload({ KeyStatus, BadRequest })); } } diff --git a/modules/space/rendering/planetgeometry.cpp b/modules/space/rendering/planetgeometry.cpp index 5d7e8d46de..c0b3538303 100644 --- a/modules/space/rendering/planetgeometry.cpp +++ b/modules/space/rendering/planetgeometry.cpp @@ -48,7 +48,8 @@ std::unique_ptr PlanetGeometry::createFromDictionary( { const Parameters p = codegen::bake(dictionary); - auto factory = FactoryManager::ref().factory(); + ghoul::TemplateFactory* factory = + FactoryManager::ref().factory(); PlanetGeometry* result = factory->create(p.type, dictionary); return std::unique_ptr(result); diff --git a/modules/space/spacemodule.cpp b/modules/space/spacemodule.cpp index 062a9623eb..db9eae9b7f 100644 --- a/modules/space/spacemodule.cpp +++ b/modules/space/spacemodule.cpp @@ -78,7 +78,8 @@ void SpaceModule::internalInitialize(const ghoul::Dictionary& dictionary) { "PlanetGeometry" ); - auto fRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRenderable = + FactoryManager::ref().factory(); ghoul_assert(fRenderable, "Renderable factory was not created"); fRenderable->registerClass( @@ -92,7 +93,8 @@ void SpaceModule::internalInitialize(const ghoul::Dictionary& dictionary) { fRenderable->registerClass("RenderableStars"); fRenderable->registerClass("RenderableTravelSpeed"); - auto fTranslation = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fTranslation = + FactoryManager::ref().factory(); ghoul_assert(fTranslation, "Ephemeris factory was not created"); fTranslation->registerClass("KeplerTranslation"); @@ -100,16 +102,14 @@ void SpaceModule::internalInitialize(const ghoul::Dictionary& dictionary) { fTranslation->registerClass("TLETranslation"); fTranslation->registerClass("HorizonsTranslation"); - /*auto fTasks = FactoryManager::ref().factory(); - ghoul_assert(fTasks, "No task factory existed"); - fTasks->registerClass("GenerateDebrisVolumeTask");*/ - - auto fRotation = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRotation = + FactoryManager::ref().factory(); ghoul_assert(fRotation, "Rotation factory was not created"); fRotation->registerClass("SpiceRotation"); - auto fGeometry = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fGeometry = + FactoryManager::ref().factory(); ghoul_assert(fGeometry, "Planet geometry factory was not created"); fGeometry->registerClass("SimpleSphere"); diff --git a/modules/space/translation/horizonstranslation.cpp b/modules/space/translation/horizonstranslation.cpp index 5820983269..6c08e8ffcc 100644 --- a/modules/space/translation/horizonstranslation.cpp +++ b/modules/space/translation/horizonstranslation.cpp @@ -89,8 +89,11 @@ HorizonsTranslation::HorizonsTranslation(const ghoul::Dictionary& dictionary) glm::dvec3 HorizonsTranslation::position(const UpdateData& data) const { glm::dvec3 interpolatedPos = glm::dvec3(0.0); - auto lastBefore = _timeline.lastKeyframeBefore(data.time.j2000Seconds(), true); - auto firstAfter = _timeline.firstKeyframeAfter(data.time.j2000Seconds(), false); + const Keyframe* lastBefore = + _timeline.lastKeyframeBefore(data.time.j2000Seconds(), true); + const Keyframe* firstAfter = + _timeline.firstKeyframeAfter(data.time.j2000Seconds(), false); + if (lastBefore && firstAfter) { // We're inbetween first and last value. double timelineDiff = firstAfter->timestamp - lastBefore->timestamp; diff --git a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp index 874b33dfbf..4081874cdf 100644 --- a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp +++ b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp @@ -53,12 +53,14 @@ void SpacecraftInstrumentsModule::internalInitialize(const ghoul::Dictionary&) { "Decoder" ); - auto fDashboard = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fDashboard = + FactoryManager::ref().factory(); ghoul_assert(fDashboard, "Dashboard factory was not created"); fDashboard->registerClass("DashboardItemInstruments"); - auto fRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRenderable = + FactoryManager::ref().factory(); ghoul_assert(fRenderable, "No renderable factory existed"); fRenderable->registerClass("RenderableCrawlingLine"); @@ -68,7 +70,7 @@ void SpacecraftInstrumentsModule::internalInitialize(const ghoul::Dictionary&) { fRenderable->registerClass("RenderablePlanetProjection"); fRenderable->registerClass("RenderableShadowCylinder"); - auto fDecoder = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fDecoder = FactoryManager::ref().factory(); fDecoder->registerClass("Instrument"); fDecoder->registerClass("Target"); } diff --git a/modules/spout/spoutmodule.cpp b/modules/spout/spoutmodule.cpp index fa66c00af0..69d37205d9 100644 --- a/modules/spout/spoutmodule.cpp +++ b/modules/spout/spoutmodule.cpp @@ -37,11 +37,13 @@ SpoutModule::SpoutModule() : OpenSpaceModule(Name) {} void SpoutModule::internalInitialize(const ghoul::Dictionary&) { #ifdef WIN32 - auto fSsRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fSsRenderable = + FactoryManager::ref().factory(); ghoul_assert(fSsRenderable, "ScreenSpaceRenderable factory was not created"); fSsRenderable->registerClass("ScreenSpaceSpout"); - auto fRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRenderable = + FactoryManager::ref().factory(); ghoul_assert(fRenderable, "Renderable factory was not created"); fRenderable->registerClass("RenderablePlaneSpout"); #endif // WIN32 diff --git a/modules/sync/syncmodule.cpp b/modules/sync/syncmodule.cpp index 2213d2d658..f73c96dc59 100644 --- a/modules/sync/syncmodule.cpp +++ b/modules/sync/syncmodule.cpp @@ -72,7 +72,8 @@ void SyncModule::internalInitialize(const ghoul::Dictionary& configuration) { _synchronizationRoot = absPath(p.synchronizationRoot); - auto fSynchronization = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fSynchronization = + FactoryManager::ref().factory(); ghoul_assert(fSynchronization, "ResourceSynchronization factory was not created"); fSynchronization->registerClass( diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp index 5e8e91ae54..ded9c93f63 100644 --- a/modules/sync/syncs/httpsynchronization.cpp +++ b/modules/sync/syncs/httpsynchronization.cpp @@ -170,12 +170,11 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) { continue; } - std::unique_ptr download = - std::make_unique( - line, - destination, - HttpFileDownload::Overwrite::Yes - ); + auto download = std::make_unique( + line, + destination, + HttpFileDownload::Overwrite::Yes + ); HttpFileDownload* dl = download.get(); downloads.push_back(std::move(download)); diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp index 638241ac99..c611589d65 100644 --- a/modules/sync/syncs/urlsynchronization.cpp +++ b/modules/sync/syncs/urlsynchronization.cpp @@ -156,12 +156,11 @@ void UrlSynchronization::start() { } std::filesystem::path destination = directory() / (_filename + TempSuffix); - std::unique_ptr download = - std::make_unique( - url, - destination, - HttpFileDownload::Overwrite::Yes - ); + auto download = std::make_unique( + url, + destination, + HttpFileDownload::Overwrite::Yes + ); HttpFileDownload* dl = download.get(); downloads.push_back(std::move(download)); diff --git a/modules/touch/src/win32_touch.cpp b/modules/touch/src/win32_touch.cpp index d00b102dfa..b965a1bb37 100644 --- a/modules/touch/src/win32_touch.cpp +++ b/modules/touch/src/win32_touch.cpp @@ -119,18 +119,14 @@ LRESULT CALLBACK HookCallback(int nCode, WPARAM wParam, LPARAM lParam) { if (info.pointerFlags & POINTER_FLAG_DOWN) { #ifdef ENABLE_DIRECTMSG - std::unique_ptr points = - std::make_unique(touchInput); + auto points = std::make_unique(touchInput); gTouchInputsMap.emplace(info.pointerId, std::move(points)); global::openSpaceEngine->touchDetectionCallback(touchInput); #endif #ifdef ENABLE_TUIOMESSAGES // Handle new touchpoint gTuioServer->initFrame(TUIO::TuioTime::getSessionTime()); - gCursorMap[info.pointerId] = gTuioServer->addTuioCursor( - xPos, - yPos - ); + gCursorMap[info.pointerId] = gTuioServer->addTuioCursor(xPos, yPos); gTuioServer->commitFrame(); #endif } diff --git a/modules/toyvolume/toyvolumemodule.cpp b/modules/toyvolume/toyvolumemodule.cpp index 32f11b661a..44ab1dae8b 100644 --- a/modules/toyvolume/toyvolumemodule.cpp +++ b/modules/toyvolume/toyvolumemodule.cpp @@ -34,7 +34,8 @@ namespace openspace { ToyVolumeModule::ToyVolumeModule() : OpenSpaceModule(Name) {} void ToyVolumeModule::internalInitialize(const ghoul::Dictionary&) { - auto fRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fRenderable = + FactoryManager::ref().factory(); ghoul_assert(fRenderable, "No renderable factory existed"); fRenderable->registerClass("RenderableToyVolume"); } diff --git a/modules/vislab/vislabmodule.cpp b/modules/vislab/vislabmodule.cpp index 399923f651..4cf2fdec4f 100644 --- a/modules/vislab/vislabmodule.cpp +++ b/modules/vislab/vislabmodule.cpp @@ -35,7 +35,8 @@ namespace openspace { VisLabModule::VisLabModule() : OpenSpaceModule(Name) {} void VisLabModule::internalInitialize(const ghoul::Dictionary&) { - auto renderableFactory = FactoryManager::ref().factory(); + ghoul::TemplateFactory* renderableFactory = + FactoryManager::ref().factory(); ghoul_assert(renderableFactory, "No renderable factory existed"); renderableFactory->registerClass("RenderableDistanceLabel"); diff --git a/modules/volume/rawvolumereader.inl b/modules/volume/rawvolumereader.inl index 4963ff95d2..72e55fef56 100644 --- a/modules/volume/rawvolumereader.inl +++ b/modules/volume/rawvolumereader.inl @@ -80,9 +80,7 @@ glm::uvec3 RawVolumeReader::indexToCoords(size_t linear) const { template std::unique_ptr> RawVolumeReader::read(bool invertZ) { glm::uvec3 dims = dimensions(); - std::unique_ptr> volume = std::make_unique>( - dims - ); + auto volume = std::make_unique>(dims); std::ifstream file(_path, std::ios::binary); char* buffer = reinterpret_cast(volume->data()); diff --git a/modules/volume/volumemodule.cpp b/modules/volume/volumemodule.cpp index 7900e671c8..ed5ff0ae2a 100644 --- a/modules/volume/volumemodule.cpp +++ b/modules/volume/volumemodule.cpp @@ -40,11 +40,12 @@ using namespace volume; VolumeModule::VolumeModule() : OpenSpaceModule(Name) {} void VolumeModule::internalInitialize(const ghoul::Dictionary&) { - auto rFactory = FactoryManager::ref().factory(); + ghoul::TemplateFactory* rFactory = + FactoryManager::ref().factory(); ghoul_assert(rFactory, "No renderable factory existed"); rFactory->registerClass("RenderableTimeVaryingVolume"); - auto tFactory = FactoryManager::ref().factory(); + ghoul::TemplateFactory* tFactory = FactoryManager::ref().factory(); ghoul_assert(tFactory, "No task factory existed"); tFactory->registerClass("GenerateRawVolumeTask"); } diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp index 53af88ffa4..7a1ccb5769 100644 --- a/modules/webbrowser/webbrowsermodule.cpp +++ b/modules/webbrowser/webbrowsermodule.cpp @@ -163,7 +163,8 @@ void WebBrowserModule::internalInitialize(const ghoul::Dictionary& dictionary) { _eventHandler->initialize(); // register ScreenSpaceBrowser - auto fScreenSpaceRenderable = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fScreenSpaceRenderable = + FactoryManager::ref().factory(); ghoul_assert(fScreenSpaceRenderable, "ScreenSpaceRenderable factory was not created"); fScreenSpaceRenderable->registerClass("ScreenSpaceBrowser"); } diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp index de4754a44c..cba5406d7d 100644 --- a/src/engine/downloadmanager.cpp +++ b/src/engine/downloadmanager.cpp @@ -133,9 +133,7 @@ std::shared_ptr DownloadManager::downloadFile( return nullptr; } - std::shared_ptr future = std::make_shared( - file.filename().string() - ); + auto future = std::make_shared(file.filename().string()); errno = 0; #ifdef WIN32 FILE* fp; diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp index abe3f3b527..4b4d8e9b5d 100644 --- a/src/interaction/sessionrecording.cpp +++ b/src/interaction/sessionrecording.cpp @@ -99,7 +99,7 @@ SessionRecording::SessionRecording(bool isGlobal) , _ignoreRecordedScale(IgnoreRecordedScaleInfo, false) { if (isGlobal) { - auto fTask = FactoryManager::ref().factory(); + ghoul::TemplateFactory* fTask = FactoryManager::ref().factory(); ghoul_assert(fTask, "No task factory existed"); fTask->registerClass("ConvertRecFormatTask"); fTask->registerClass("ConvertRecFileVersionTask"); diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp index 008162661a..26f5cb8ac2 100644 --- a/src/network/parallelpeer.cpp +++ b/src/network/parallelpeer.cpp @@ -138,7 +138,7 @@ void ParallelPeer::connect() { setStatus(ParallelConnection::Status::Connecting); - std::unique_ptr socket = std::make_unique( + auto socket = std::make_unique( _address, atoi(_port.value().c_str()) ); diff --git a/src/network/parallelserver.cpp b/src/network/parallelserver.cpp index 0288a5238e..c01521f617 100644 --- a/src/network/parallelserver.cpp +++ b/src/network/parallelserver.cpp @@ -71,7 +71,7 @@ void ParallelServer::handleNewPeers() { s->startStreams(); const size_t id = _nextConnectionId++; - std::shared_ptr p = std::make_shared(Peer{ + auto p = std::make_shared(Peer{ id, "", ParallelConnection(std::move(s)), diff --git a/src/rendering/dashboarditem.cpp b/src/rendering/dashboarditem.cpp index 17dffe5d5d..18462578e4 100644 --- a/src/rendering/dashboarditem.cpp +++ b/src/rendering/dashboarditem.cpp @@ -73,7 +73,8 @@ documentation::Documentation DashboardItem::Documentation() { std::unique_ptr DashboardItem::createFromDictionary( ghoul::Dictionary dictionary) { - auto factory = FactoryManager::ref().factory(); + ghoul::TemplateFactory* factory = + FactoryManager::ref().factory(); ghoul_assert(factory, "DashboardItem factory did not exist"); const std::string& dashboardType = dictionary.value(KeyType); diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp index 868f7a0df2..4009468dcc 100644 --- a/src/rendering/renderable.cpp +++ b/src/rendering/renderable.cpp @@ -92,7 +92,7 @@ ghoul::mm_unique_ptr Renderable::createFromDictionary( documentation::testSpecificationAndThrow(Documentation(), dictionary, "Renderable"); std::string renderableType = dictionary.value(KeyType); - auto factory = FactoryManager::ref().factory(); + ghoul::TemplateFactory* factory = FactoryManager::ref().factory(); ghoul_assert(factory, "Renderable factory did not exist"); Renderable* result = factory->create( renderableType, diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index b47d350375..eca3ae0ef5 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -512,7 +512,7 @@ void RenderEngine::initializeGL() { { ZoneScopedN("Log") LINFO("Initializing Log"); - std::unique_ptr log = std::make_unique(ScreenLogTimeToLive); + auto log = std::make_unique(ScreenLogTimeToLive); _log = log.get(); ghoul::logging::LogManager::ref().addLog(std::move(log)); } diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp index e58f1a2af8..a78cf2f823 100644 --- a/src/scene/assetmanager.cpp +++ b/src/scene/assetmanager.cpp @@ -480,7 +480,7 @@ void AssetManager::setUpAssetLuaTable(Asset* asset) { std::unique_ptr s = ResourceSynchronization::createFromDictionary(d); - std::unique_ptr si = std::make_unique(); + auto si = std::make_unique(); si->synchronization = std::move(s); si->assets.push_back(asset); syncItem = si.get(); @@ -746,9 +746,8 @@ Asset* AssetManager::retrieveAsset(const std::filesystem::path& path) { if (!std::filesystem::is_regular_file(path)) { throw ghoul::RuntimeError(fmt::format("Could not find asset file {}", path)); } - std::unique_ptr asset = std::make_unique(*this, path); + auto asset = std::make_unique(*this, path); Asset* res = asset.get(); - setUpAssetLuaTable(res); _assets.push_back(std::move(asset)); return res; diff --git a/src/scene/lightsource.cpp b/src/scene/lightsource.cpp index d3603f65c1..15fd41a0af 100644 --- a/src/scene/lightsource.cpp +++ b/src/scene/lightsource.cpp @@ -71,7 +71,8 @@ std::unique_ptr LightSource::createFromDictionary( { const Parameters p = codegen::bake(dictionary); - auto factory = FactoryManager::ref().factory(); + ghoul::TemplateFactory* factory = + FactoryManager::ref().factory(); LightSource* source = factory->create(p.type, dictionary); source->setIdentifier(p.identifier); diff --git a/src/scene/scale.cpp b/src/scene/scale.cpp index d1c9fb4d6c..16286f82cd 100644 --- a/src/scene/scale.cpp +++ b/src/scene/scale.cpp @@ -55,8 +55,7 @@ ghoul::mm_unique_ptr Scale::createFromDictionary( { const Parameters p = codegen::bake(dictionary); - auto factory = FactoryManager::ref().factory(); - Scale* result = factory->create( + Scale* result = FactoryManager::ref().factory()->create( p.type, dictionary, &global::memoryManager->PersistentMemory diff --git a/src/scene/timeframe.cpp b/src/scene/timeframe.cpp index 7d6d1005c7..031694ba6c 100644 --- a/src/scene/timeframe.cpp +++ b/src/scene/timeframe.cpp @@ -51,12 +51,11 @@ documentation::Documentation TimeFrame::Documentation() { } ghoul::mm_unique_ptr TimeFrame::createFromDictionary( - const ghoul::Dictionary& dictionary) + const ghoul::Dictionary& dict) { - const Parameters p = codegen::bake(dictionary); + const Parameters p = codegen::bake(dict); - auto factory = FactoryManager::ref().factory(); - TimeFrame* result = factory->create(p.type, dictionary); + TimeFrame* result = FactoryManager::ref().factory()->create(p.type, dict); result->setIdentifier("TimeFrame"); return ghoul::mm_unique_ptr(result); } diff --git a/src/util/resourcesynchronization.cpp b/src/util/resourcesynchronization.cpp index b92ec9a241..ca5b148dcd 100644 --- a/src/util/resourcesynchronization.cpp +++ b/src/util/resourcesynchronization.cpp @@ -60,7 +60,8 @@ std::unique_ptr ResourceSynchronization::createFromDict { const Parameters p = codegen::bake(dictionary); - auto factory = FactoryManager::ref().factory(); + ghoul::TemplateFactory* factory = + FactoryManager::ref().factory(); ghoul_assert(factory, "ResourceSynchronization factory did not exist"); ResourceSynchronization* sync = factory->create(p.type, dictionary); sync->_name = p.name; diff --git a/src/util/task.cpp b/src/util/task.cpp index f0abf0fd1b..26918b0aff 100644 --- a/src/util/task.cpp +++ b/src/util/task.cpp @@ -49,9 +49,10 @@ documentation::Documentation Task::documentation() { std::unique_ptr Task::createFromDictionary(const ghoul::Dictionary& dictionary) { const Parameters p = codegen::bake(dictionary); - auto factory = FactoryManager::ref().factory(); + ghoul::TemplateFactory* factory = FactoryManager::ref().factory(); Task* task = factory->create(p.type, dictionary); return std::unique_ptr(task); } } // namespace openspace +\ diff --git a/tests/test_scriptscheduler.cpp b/tests/test_scriptscheduler.cpp index c8639df617..d602ac6860 100644 --- a/tests/test_scriptscheduler.cpp +++ b/tests/test_scriptscheduler.cpp @@ -32,143 +32,149 @@ #include TEST_CASE("ScriptScheduler: Simple Forward", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( + using namespace openspace; + using namespace openspace::scripting; + + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() ); - using namespace openspace::scripting; ScriptScheduler scheduler; std::vector scripts; { ScriptScheduler::ScheduledScript script; - script.time = openspace::Time::convertTime("2000 JAN 03"); + script.time = Time::convertTime("2000 JAN 03"); script.forwardScript = "ForwardScript1"; script.backwardScript = "BackwardScript1"; scripts.push_back(script); } - scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01")); + scheduler.progressTo(Time::convertTime("2000 JAN 01")); scheduler.loadScripts(scripts); - auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 02")); + std::vector res = scheduler.progressTo(Time::convertTime("2000 JAN 02")); CHECK(res.empty()); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 03")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 03")); REQUIRE(res.size() == 1); CHECK(res[0] == "ForwardScript1"); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE("ScriptScheduler: Multiple Forward Single Jump", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( + using namespace openspace; + using namespace openspace::scripting; + + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() ); - using namespace openspace::scripting; - std::vector scripts; { ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03"); + script1.time = Time::convertTime("2000 JAN 03"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; scripts.push_back(script1); ScriptScheduler::ScheduledScript script2; - script2.time = openspace::Time::convertTime("2000 JAN 05"); + script2.time = Time::convertTime("2000 JAN 05"); script2.forwardScript = "ForwardScript2"; script2.backwardScript = "BackwardScript2"; scripts.push_back(script2); } ScriptScheduler scheduler; - scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01")); + scheduler.progressTo(Time::convertTime("2000 JAN 01")); scheduler.loadScripts(scripts); - auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 02")); + std::vector res = scheduler.progressTo(Time::convertTime("2000 JAN 02")); CHECK(res.empty()); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 04")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 04")); REQUIRE(res.size() == 1); CHECK(res[0] == "ForwardScript1"); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 06")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 06")); REQUIRE(res.size() == 1); CHECK(res[0] == "ForwardScript2"); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE("ScriptScheduler: Multiple Forward Ordering", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( + using namespace openspace; + using namespace openspace::scripting; + using namespace std::string_literals; + + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() ); - using namespace openspace::scripting; - using namespace std::string_literals; std::vector scripts; { ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03"); + script1.time = Time::convertTime("2000 JAN 03"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; scripts.push_back(script1); ScriptScheduler::ScheduledScript script2; - script2.time = openspace::Time::convertTime("2000 JAN 05"); + script2.time = Time::convertTime("2000 JAN 05"); script2.forwardScript = "ForwardScript2"; script2.backwardScript = "BackwardScript2"; scripts.push_back(script2); } ScriptScheduler scheduler; - scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01")); + scheduler.progressTo(Time::convertTime("2000 JAN 01")); scheduler.loadScripts(scripts); - auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 02")); + std::vector res = scheduler.progressTo(Time::convertTime("2000 JAN 02")); CHECK(res.empty()); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 06")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 06")); REQUIRE(res.size() == 2); CHECK(res[0] == "ForwardScript1"); CHECK(res[1] == "ForwardScript2"); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE("ScriptScheduler: Simple Backward", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( - absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() - ); - + using namespace openspace; using namespace openspace::scripting; using namespace std::string_literals; + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( + absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() + ); + std::vector scripts; { ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03"); + script1.time = Time::convertTime("2000 JAN 03"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; scripts.push_back(script1); } ScriptScheduler scheduler; - scheduler.progressTo(openspace::Time::convertTime("2000 JAN 05")); + scheduler.progressTo(Time::convertTime("2000 JAN 05")); scheduler.loadScripts(scripts); - auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 04")); + std::vector res = scheduler.progressTo(Time::convertTime("2000 JAN 04")); CHECK(res.empty()); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 02")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 02")); REQUIRE(res.size() == 1); CHECK(res[0] == "BackwardScript1"); @@ -176,94 +182,98 @@ TEST_CASE("ScriptScheduler: Simple Backward", "[scriptscheduler]") { } TEST_CASE("ScriptScheduler: Multiple Backward Single Jump", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( + using namespace openspace; + using namespace openspace::scripting; + using namespace std::string_literals; + + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() ); - using namespace openspace::scripting; - using namespace std::string_literals; std::vector scripts; { ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03"); + script1.time = Time::convertTime("2000 JAN 03"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; scripts.push_back(script1); ScriptScheduler::ScheduledScript script2; - script2.time = openspace::Time::convertTime("2000 JAN 05"); + script2.time = Time::convertTime("2000 JAN 05"); script2.forwardScript = "ForwardScript2"; script2.backwardScript = "BackwardScript2"; scripts.push_back(script2); } ScriptScheduler scheduler; - scheduler.progressTo(openspace::Time::convertTime("2000 JAN 07")); + scheduler.progressTo(Time::convertTime("2000 JAN 07")); scheduler.loadScripts(scripts); - auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 06")); + std::vector res = scheduler.progressTo(Time::convertTime("2000 JAN 06")); CHECK(res.empty()); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 04")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 04")); REQUIRE(res.size() == 1); CHECK(res[0] == "BackwardScript2"); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 01")); REQUIRE(res.size() == 1); CHECK(res[0] == "BackwardScript1"); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE("ScriptScheduler: Multiple Backward Ordering", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( - absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() - ); - + using namespace openspace; using namespace openspace::scripting; using namespace std::string_literals; + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( + absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() + ); + std::vector scripts; { ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03"); + script1.time = Time::convertTime("2000 JAN 03"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; scripts.push_back(script1); ScriptScheduler::ScheduledScript script2; - script2.time = openspace::Time::convertTime("2000 JAN 05"); + script2.time = Time::convertTime("2000 JAN 05"); script2.forwardScript = "ForwardScript2"; script2.backwardScript = "BackwardScript2"; scripts.push_back(script2); } ScriptScheduler scheduler; - scheduler.progressTo(openspace::Time::convertTime("2000 JAN 07")); + scheduler.progressTo(Time::convertTime("2000 JAN 07")); scheduler.loadScripts(scripts); - auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 06")); + std::vector res = scheduler.progressTo(Time::convertTime("2000 JAN 06")); CHECK(res.empty()); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 01")); REQUIRE(res.size() == 2); CHECK(res[0] == "BackwardScript2"); CHECK(res[1] == "BackwardScript1"); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE("ScriptScheduler: Empty", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( + using namespace openspace; + using namespace openspace::scripting; + + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() ); - using namespace openspace::scripting; - static const std::vector TestTimes = { 0.0, 1.0, -1.0, std::numeric_limits::min(), -std::numeric_limits::max(), std::numeric_limits::max() @@ -272,114 +282,117 @@ TEST_CASE("ScriptScheduler: Empty", "[scriptscheduler]") { // First test if a new ScriptScheduler will return an empty list for (double t : TestTimes) { ScriptScheduler scheduler; - auto res = scheduler.progressTo(t); + std::vector res = scheduler.progressTo(t); CHECK(res.empty()); } // Then test the same thing but keeping the same ScriptScheduler ScriptScheduler scheduler; for (double t : TestTimes) { - auto res = scheduler.progressTo(t); + std::vector res = scheduler.progressTo(t); CHECK(res.empty()); } - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE("ScriptScheduler: Forward Backwards", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( - absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() - ); - + using namespace openspace; using namespace openspace::scripting; using namespace std::string_literals; + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( + absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() + ); + std::vector scripts; { ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03"); + script1.time = Time::convertTime("2000 JAN 03"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; scripts.push_back(script1); ScriptScheduler::ScheduledScript script2; - script2.time = openspace::Time::convertTime("2000 JAN 05"); + script2.time = Time::convertTime("2000 JAN 05"); script2.forwardScript = "ForwardScript2"; script2.backwardScript = "BackwardScript2"; scripts.push_back(script2); } ScriptScheduler scheduler; - scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01")); + scheduler.progressTo(Time::convertTime("2000 JAN 01")); scheduler.loadScripts(scripts); - auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 04")); + std::vector res = scheduler.progressTo(Time::convertTime("2000 JAN 04")); REQUIRE(res.size() == 1); CHECK(res[0] == "ForwardScript1"); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 01")); REQUIRE(res.size() == 1); CHECK(res[0] == "BackwardScript1"); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 07")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 07")); REQUIRE(res.size() == 2); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 04")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 04")); REQUIRE(res.size() == 1); CHECK(res[0] == "BackwardScript2"); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE("ScriptScheduler: Rewind", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( - absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() - ); - + using namespace openspace; using namespace openspace::scripting; using namespace std::string_literals; + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( + absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() + ); + std::vector scripts; { ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03"); + script1.time = Time::convertTime("2000 JAN 03"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; scripts.push_back(script1); ScriptScheduler::ScheduledScript script2; - script2.time = openspace::Time::convertTime("2000 JAN 05"); + script2.time = Time::convertTime("2000 JAN 05"); script2.forwardScript = "ForwardScript2"; script2.backwardScript = "BackwardScript2"; scripts.push_back(script2); } ScriptScheduler scheduler; - scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01")); + scheduler.progressTo(Time::convertTime("2000 JAN 01")); scheduler.loadScripts(scripts); - auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 07")); + std::vector res = scheduler.progressTo(Time::convertTime("2000 JAN 07")); REQUIRE(res.size() == 2); scheduler.rewind(); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 04")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 04")); REQUIRE(res.size() == 1); CHECK(res[0] == "ForwardScript1"); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE("ScriptScheduler: CurrentTime", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( + using namespace openspace; + using namespace openspace::scripting; + + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() ); - using namespace openspace::scripting; - static const std::vector TestValues = { 0.0, 1.0, 42.0, std::numeric_limits::min(), -std::numeric_limits::max(), std::numeric_limits::max() @@ -391,34 +404,35 @@ TEST_CASE("ScriptScheduler: CurrentTime", "[scriptscheduler]") { CHECK(t == scheduler.currentTime()); } - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE("ScriptScheduler: All Scripts", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( - absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() - ); - + using namespace openspace; using namespace openspace::scripting; using namespace std::string_literals; + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( + absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() + ); + std::vector scripts; { ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03"); + script1.time = Time::convertTime("2000 JAN 03"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; scripts.push_back(script1); ScriptScheduler::ScheduledScript script2; - script2.time = openspace::Time::convertTime("2000 JAN 05"); + script2.time = Time::convertTime("2000 JAN 05"); script2.forwardScript = "ForwardScript2"; script2.backwardScript = "BackwardScript2"; scripts.push_back(script2); ScriptScheduler::ScheduledScript script3; - script3.time = openspace::Time::convertTime("2000 JAN 10"); + script3.time = Time::convertTime("2000 JAN 10"); script3.forwardScript = "ForwardScript3"; script3.backwardScript = "BackwardScript3"; scripts.push_back(script3); @@ -427,28 +441,29 @@ TEST_CASE("ScriptScheduler: All Scripts", "[scriptscheduler]") { ScriptScheduler scheduler; scheduler.loadScripts(scripts); - auto allScripts = scheduler.allScripts(); + std::vector allScripts = scheduler.allScripts(); REQUIRE(allScripts.size() == 3); CHECK(allScripts[0].time < allScripts[1].time); CHECK(allScripts[1].time < allScripts[2].time); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE("ScriptScheduler: Jump Equal", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( - absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() - ); - + using namespace openspace; using namespace openspace::scripting; using namespace std::string_literals; + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( + absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() + ); + std::vector scripts; { ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03 12:00:00"); + script1.time = Time::convertTime("2000 JAN 03 12:00:00"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; scripts.push_back(script1); @@ -457,36 +472,38 @@ TEST_CASE("ScriptScheduler: Jump Equal", "[scriptscheduler]") { ScriptScheduler scheduler; scheduler.loadScripts(scripts); - auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 03 11:00:00")); + std::vector res = + scheduler.progressTo(Time::convertTime("2000 JAN 03 11:00:00")); CHECK(res.empty()); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 03 12:00:00")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 03 12:00:00")); REQUIRE(res.size() == 1); CHECK(res[0] == "ForwardScript1"); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 03 12:01:00")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 03 12:01:00")); REQUIRE(res.empty()); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 03 12:00:00")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 03 12:00:00")); REQUIRE(res.size() == 1); CHECK(res[0] == "BackwardScript1"); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE("ScriptScheduler: Same Time", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( - absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() - ); - + using namespace openspace; using namespace openspace::scripting; using namespace std::string_literals; + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( + absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() + ); + std::vector scripts; { ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03 12:00:00"); + script1.time = Time::convertTime("2000 JAN 03 12:00:00"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; scripts.push_back(script1); @@ -495,29 +512,31 @@ TEST_CASE("ScriptScheduler: Same Time", "[scriptscheduler]") { ScriptScheduler scheduler; scheduler.loadScripts(scripts); - auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 03 12:00:00")); + std::vector res = + scheduler.progressTo(Time::convertTime("2000 JAN 03 12:00:00")); REQUIRE(res.size() == 1); CHECK(res[0] == "ForwardScript1"); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 03 12:00:00")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 03 12:00:00")); CHECK(res.empty()); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE("ScriptScheduler: Multi Inner Jump", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( - absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() - ); - + using namespace openspace; using namespace openspace::scripting; using namespace std::string_literals; + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( + absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() + ); + std::vector scripts; { ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03 12:00:00"); + script1.time = Time::convertTime("2000 JAN 03 12:00:00"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; scripts.push_back(script1); @@ -526,280 +545,287 @@ TEST_CASE("ScriptScheduler: Multi Inner Jump", "[scriptscheduler]") { ScriptScheduler scheduler; scheduler.loadScripts(scripts); - auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 03 10:00:00")); + std::vector res = + scheduler.progressTo(Time::convertTime("2000 JAN 03 10:00:00")); CHECK(res.empty()); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 03 11:00:00")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 03 11:00:00")); CHECK(res.empty()); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 03 13:00:00")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 03 13:00:00")); REQUIRE(res.size() == 1); CHECK(res[0] == "ForwardScript1"); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 03 12:30:00")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 03 12:30:00")); CHECK(res.empty()); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE( "ScriptScheduler: Multiple Forward Single Jump Multiple Load", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( - absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() - ); - + using namespace openspace; using namespace openspace::scripting; using namespace std::string_literals; + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( + absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() + ); + ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03"); + script1.time = Time::convertTime("2000 JAN 03"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; ScriptScheduler::ScheduledScript script2; - script2.time = openspace::Time::convertTime("2000 JAN 05"); + script2.time = Time::convertTime("2000 JAN 05"); script2.forwardScript = "ForwardScript2"; script2.backwardScript = "BackwardScript2"; ScriptScheduler scheduler; - scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01")); + scheduler.progressTo(Time::convertTime("2000 JAN 01")); scheduler.loadScripts({ script1 }); scheduler.loadScripts({ script2 }); - auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 02")); + std::vector res = scheduler.progressTo(Time::convertTime("2000 JAN 02")); CHECK(res.empty()); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 04")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 04")); REQUIRE(res.size() == 1); CHECK(res[0] == "ForwardScript1"); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 06")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 06")); REQUIRE(res.size() == 1); CHECK(res[0] == "ForwardScript2"); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE("ScriptScheduler: Multiple Forward Ordering Multiple Load" "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( - absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() - ); - + using namespace openspace; using namespace openspace::scripting; using namespace std::string_literals; + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( + absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() + ); + ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03"); + script1.time = Time::convertTime("2000 JAN 03"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; ScriptScheduler::ScheduledScript script2; - script2.time = openspace::Time::convertTime("2000 JAN 05"); + script2.time = Time::convertTime("2000 JAN 05"); script2.forwardScript = "ForwardScript2"; script2.backwardScript = "BackwardScript2"; ScriptScheduler scheduler; - scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01")); + scheduler.progressTo(Time::convertTime("2000 JAN 01")); scheduler.loadScripts({ script1 }); scheduler.loadScripts({ script2 }); - auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 02")); + std::vector res = scheduler.progressTo(Time::convertTime("2000 JAN 02")); CHECK(res.empty()); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 06")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 06")); REQUIRE(res.size() == 2); CHECK(res[0] == "ForwardScript1"); CHECK(res[1] == "ForwardScript2"); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE( "ScriptScheduler: Multiple Backward Single Jump Multiple Load", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( - absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() - ); - + using namespace openspace; using namespace openspace::scripting; using namespace std::string_literals; + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( + absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() + ); + ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03"); + script1.time = Time::convertTime("2000 JAN 03"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; ScriptScheduler::ScheduledScript script2; - script2.time = openspace::Time::convertTime("2000 JAN 05"); + script2.time = Time::convertTime("2000 JAN 05"); script2.forwardScript = "ForwardScript2"; script2.backwardScript = "BackwardScript2"; ScriptScheduler scheduler; - scheduler.progressTo(openspace::Time::convertTime("2000 JAN 07")); + scheduler.progressTo(Time::convertTime("2000 JAN 07")); scheduler.loadScripts({ script1 }); scheduler.loadScripts({ script2 }); - auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 06")); + std::vector res = scheduler.progressTo(Time::convertTime("2000 JAN 06")); CHECK(res.empty()); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 04")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 04")); REQUIRE(res.size() == 1); CHECK(res[0] == "BackwardScript2"); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 01")); REQUIRE(res.size() == 1); CHECK(res[0] == "BackwardScript1"); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE( "ScriptScheduler: Multiple Backward Ordering Multiple Load", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( - absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() - ); - + using namespace openspace; using namespace openspace::scripting; using namespace std::string_literals; + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( + absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() + ); + ScriptScheduler scheduler; ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03"); + script1.time = Time::convertTime("2000 JAN 03"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; ScriptScheduler::ScheduledScript script2; - script2.time = openspace::Time::convertTime("2000 JAN 05"); + script2.time = Time::convertTime("2000 JAN 05"); script2.forwardScript = "ForwardScript2"; script2.backwardScript = "BackwardScript2"; - scheduler.progressTo(openspace::Time::convertTime("2000 JAN 07")); + scheduler.progressTo(Time::convertTime("2000 JAN 07")); scheduler.loadScripts({ script1 }); scheduler.loadScripts({ script2 }); - std::vector res = - scheduler.progressTo(openspace::Time::convertTime("2000 JAN 06")); + std::vector res = scheduler.progressTo(Time::convertTime("2000 JAN 06")); CHECK(res.empty()); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 01")); REQUIRE(res.size() == 2); CHECK(res[0] == "BackwardScript2"); CHECK(res[1] == "BackwardScript1"); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE("ScriptScheduler: Forward Backwards Multiple Load", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( - absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() - ); - + using namespace openspace; using namespace openspace::scripting; using namespace std::string_literals; + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( + absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() + ); + ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03"); + script1.time = Time::convertTime("2000 JAN 03"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; ScriptScheduler::ScheduledScript script2; - script2.time = openspace::Time::convertTime("2000 JAN 05"); + script2.time = Time::convertTime("2000 JAN 05"); script2.forwardScript = "ForwardScript2"; script2.backwardScript = "BackwardScript2"; ScriptScheduler scheduler; - scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01")); + scheduler.progressTo(Time::convertTime("2000 JAN 01")); scheduler.loadScripts({ script1 }); scheduler.loadScripts({ script2 }); - auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 04")); + std::vector res = scheduler.progressTo(Time::convertTime("2000 JAN 04")); REQUIRE(res.size() == 1); CHECK(res[0] == "ForwardScript1"); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 01")); REQUIRE(res.size() == 1); CHECK(res[0] == "BackwardScript1"); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 07")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 07")); REQUIRE(res.size() == 2); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 04")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 04")); REQUIRE(res.size() == 1); CHECK(res[0] == "BackwardScript2"); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE("ScriptScheduler: Rewind Multiple Load", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( - absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() - ); - + using namespace openspace; using namespace openspace::scripting; using namespace std::string_literals; + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( + absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() + ); + ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03"); + script1.time = Time::convertTime("2000 JAN 03"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; ScriptScheduler::ScheduledScript script2; - script2.time = openspace::Time::convertTime("2000 JAN 05"); + script2.time = Time::convertTime("2000 JAN 05"); script2.forwardScript = "ForwardScript2"; script2.backwardScript = "BackwardScript2"; ScriptScheduler scheduler; - scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01")); + scheduler.progressTo(Time::convertTime("2000 JAN 01")); scheduler.loadScripts({ script1 }); scheduler.loadScripts({ script2 }); - auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 07")); + std::vector res = scheduler.progressTo(Time::convertTime("2000 JAN 07")); REQUIRE(res.size() == 2); scheduler.rewind(); - res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 04")); + res = scheduler.progressTo(Time::convertTime("2000 JAN 04")); REQUIRE(res.size() == 1); CHECK(res[0] == "ForwardScript1"); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE("ScriptScheduler: All Scripts Multiple Load", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( - absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() - ); - + using namespace openspace; using namespace openspace::scripting; using namespace std::string_literals; + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( + absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() + ); + ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03"); + script1.time = Time::convertTime("2000 JAN 03"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; ScriptScheduler::ScheduledScript script2; - script2.time = openspace::Time::convertTime("2000 JAN 05"); + script2.time = Time::convertTime("2000 JAN 05"); script2.forwardScript = "ForwardScript2"; script2.backwardScript = "BackwardScript2"; ScriptScheduler::ScheduledScript script3; - script3.time = openspace::Time::convertTime("2000 JAN 10"); + script3.time = Time::convertTime("2000 JAN 10"); script3.forwardScript = "ForwardScript3"; script3.backwardScript = "BackwardScript3"; @@ -808,36 +834,37 @@ TEST_CASE("ScriptScheduler: All Scripts Multiple Load", "[scriptscheduler]") { scheduler.loadScripts({ script2 }); scheduler.loadScripts({ script3 }); - auto allScripts = scheduler.allScripts(); + std::vector allScripts = scheduler.allScripts(); REQUIRE(allScripts.size() == 3); CHECK(allScripts[0].time < allScripts[1].time); CHECK(allScripts[1].time < allScripts[2].time); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); } TEST_CASE("ScriptScheduler: All Scripts Mixed Load", "[scriptscheduler]") { - openspace::SpiceManager::initialize(); - openspace::SpiceManager::ref().loadKernel( - absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() - ); - + using namespace openspace; using namespace openspace::scripting; using namespace std::string_literals; + SpiceManager::initialize(); + SpiceManager::ref().loadKernel( + absPath("${TESTDIR}/SpiceTest/spicekernels/naif0008.tls").string() + ); + ScriptScheduler::ScheduledScript script1; - script1.time = openspace::Time::convertTime("2000 JAN 03"); + script1.time = Time::convertTime("2000 JAN 03"); script1.forwardScript = "ForwardScript1"; script1.backwardScript = "BackwardScript1"; ScriptScheduler::ScheduledScript script2; - script2.time = openspace::Time::convertTime("2000 JAN 05"); + script2.time = Time::convertTime("2000 JAN 05"); script2.forwardScript = "ForwardScript2"; script2.backwardScript = "BackwardScript2"; ScriptScheduler::ScheduledScript script3; - script3.time = openspace::Time::convertTime("2000 JAN 10"); + script3.time = Time::convertTime("2000 JAN 10"); script3.forwardScript = "ForwardScript3"; script3.backwardScript = "BackwardScript3"; @@ -845,11 +872,11 @@ TEST_CASE("ScriptScheduler: All Scripts Mixed Load", "[scriptscheduler]") { scheduler.loadScripts({ script1 }); scheduler.loadScripts({ script2, script3 }); - auto allScripts = scheduler.allScripts(); + std::vector allScripts = scheduler.allScripts(); REQUIRE(allScripts.size() == 3); CHECK(allScripts[0].time < allScripts[1].time); CHECK(allScripts[1].time < allScripts[2].time); - openspace::SpiceManager::deinitialize(); + SpiceManager::deinitialize(); }