diff --git a/modules/galaxy/tasks/milkywayconversiontask.cpp b/modules/galaxy/tasks/milkywayconversiontask.cpp index 9dfd7fef38..189a6ea23d 100644 --- a/modules/galaxy/tasks/milkywayconversiontask.cpp +++ b/modules/galaxy/tasks/milkywayconversiontask.cpp @@ -23,19 +23,21 @@ ****************************************************************************************/ #include + #include #include #include -namespace { - char* KeyInFilenamePrefix = "InFilenamePrefix"; - char* KeyInFilenameSuffix = "InFilenameSuffix"; - char* KeyInFirstIndex = "InFirstIndex"; - char* KeyInNSlices = "InNSlices"; - char* KeyOutFilename = "OutFilename"; - char* KeyOutDimensions = "OutDimensions"; -} +#include +namespace { + const char* KeyInFilenamePrefix = "InFilenamePrefix"; + const char* KeyInFilenameSuffix = "InFilenameSuffix"; + const char* KeyInFirstIndex = "InFirstIndex"; + const char* KeyInNSlices = "InNSlices"; + const char* KeyOutFilename = "OutFilename"; + const char* KeyOutDimensions = "OutDimensions"; +} // namespace namespace openspace { @@ -45,7 +47,7 @@ MilkywayConversionTask::MilkywayConversionTask(const ghoul::Dictionary& dictiona _inFilenamePrefix = inFilenamePrefix; } - std::string inFilenamePrefix; + std::string inFilenameSuffix; if (dictionary.getValue(KeyInFilenameSuffix, inFilenameSuffix)) { _inFilenameSuffix = inFilenameSuffix; } @@ -103,9 +105,9 @@ void MilkywayConversionTask::perform(const Task::ProgressCallback& progressCallb rawWriter.write(sampleFunction, progressCallback); } -Documentation MilkywayConversionTask::documentation() +documentation::Documentation MilkywayConversionTask::documentation() { - return Documentation(); + return documentation::Documentation(); } } diff --git a/modules/galaxy/tasks/milkywayconversiontask.h b/modules/galaxy/tasks/milkywayconversiontask.h index 1a37fb5950..4e00b9c975 100644 --- a/modules/galaxy/tasks/milkywayconversiontask.h +++ b/modules/galaxy/tasks/milkywayconversiontask.h @@ -35,6 +35,8 @@ namespace openspace { +namespace documentation { struct Documentation; } + /** * Converts a set of exr image slices to a raw volume * with floating point RGBA data (32 bit per channel). @@ -45,7 +47,8 @@ public: virtual ~MilkywayConversionTask(); std::string description() override; void perform(const Task::ProgressCallback& onProgress) override; - static Documentation documentation(); + static documentation::Documentation documentation(); + private: std::string _inFilenamePrefix; std::string _inFilenameSuffix; diff --git a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp index ae9891d68f..0df1bcdb1f 100644 --- a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp +++ b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp @@ -23,9 +23,13 @@ ****************************************************************************************/ #include + #include #include #include + +#include + #include #include #include @@ -79,15 +83,15 @@ void MilkywayPointsConversionTask::perform(const Task::ProgressCallback & progre } out.write(reinterpret_cast(&nPoints), sizeof(int64_t)); - out.write(reinterpret_cast(pointData), nFloats * sizeof(float)); + out.write(reinterpret_cast(pointData.data()), nFloats * sizeof(float)); in.close(); out.close(); } -Documentation MilkywayPointsConversionTask::documentation() +documentation::Documentation MilkywayPointsConversionTask::documentation() { - return Documentation(); + return documentation::Documentation(); } } diff --git a/modules/galaxy/tasks/milkywaypointsconversiontask.h b/modules/galaxy/tasks/milkywaypointsconversiontask.h index ffc1582957..d20eb4bcef 100644 --- a/modules/galaxy/tasks/milkywaypointsconversiontask.h +++ b/modules/galaxy/tasks/milkywaypointsconversiontask.h @@ -35,6 +35,8 @@ namespace openspace { +namespace documentation { struct Documentation; } + /** * Converts ascii based point data * int64_t n @@ -47,7 +49,8 @@ public: virtual ~MilkywayPointsConversionTask(); std::string description() override; void perform(const Task::ProgressCallback& progressCallback) override; - static Documentation documentation(); + static documentation::Documentation documentation(); + private: std::string _inFilename; std::string _outFilename; diff --git a/openspace.cfg b/openspace.cfg index 6848a95040..43e33fac12 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -23,19 +23,20 @@ return { -- Sets the scene that is to be loaded by OpenSpace. A scene file is a description -- of all entities that will be visible during an instance of OpenSpace - Scene = "${SCENE}/volumes.scene", - Task = "${TASKS}/default.task", + Scene = "${SCENE}/default.scene", -- Scene = "${SCENE}/globebrowsing.scene", -- Scene = "${SCENE}/rosetta.scene", -- Scene = "${SCENE}/dawn.scene", -- Scene = "${SCENE}/newhorizons.scene", -- Scene = "${SCENE}/osirisrex.scene", + Task = "${TASKS}/default.task", + Paths = { SGCT = "${BASE_PATH}/config/sgct", SCRIPTS = "${BASE_PATH}/scripts", SHADERS = "${BASE_PATH}/shaders", - OPENSPACE_DATA = "${BASE_PATH}/data", + OPENSPACE_DATA = "${BASE_PATH}/data-minimal", SCENE = "${OPENSPACE_DATA}/scene", TASKS = "${OPENSPACE_DATA}/tasks", SPICE = "${OPENSPACE_DATA}/spice",