diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index b43fdda4f4..1dd1160fbf 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit b43fdda4f495b0b1d761c501cd5407088a17c187 +Subproject commit 1dd1160fbf62427a8094cb74488690769e63900a diff --git a/ext/ghoul b/ext/ghoul index cc65370084..a1e2f46953 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit cc6537008411a2aa042e5a9345b28faecd44dcba +Subproject commit a1e2f46953a8fb77320c959453a25a8d898dc846 diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp index b72a4441b8..08c660c509 100644 --- a/modules/base/dashboard/dashboarditemframerate.cpp +++ b/modules/base/dashboard/dashboarditemframerate.cpp @@ -322,8 +322,8 @@ glm::vec2 DashboardItemFramerate::size() const { ZoneScoped const FrametimeType t = FrametimeType(_frametimeType.value()); - format(_buffer, t, _minDeltaTimeCache, _maxDeltaTimeCache); - std::string_view output = _buffer.data(); + char* end = format(_buffer, t, _minDeltaTimeCache, _maxDeltaTimeCache); + std::string_view output = std::string_view(_buffer.data(), end - _buffer.data()); if (output.empty()) { return { 0.f, 0.f }; diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp index 0ff2b95c81..d7cbfc22e4 100644 --- a/modules/galaxy/rendering/renderablegalaxy.cpp +++ b/modules/galaxy/rendering/renderablegalaxy.cpp @@ -199,13 +199,37 @@ RenderableGalaxy::RenderableGalaxy(const ghoul::Dictionary& dictionary) { dictionary.getValue("VolumeRenderingEnabled", _volumeRenderingEnabled); dictionary.getValue("StarRenderingEnabled", _starRenderingEnabled); - dictionary.getValue("StepSize", _stepSize); - dictionary.getValue("AbsorptionMultiply", _absorptionMultiply); - dictionary.getValue("EmissionMultiply", _emissionMultiply); + { + double stepSize; + dictionary.getValue("StepSize", stepSize); + _stepSize = static_cast(stepSize); + } + { + double absorptionMultiply = _absorptionMultiply; + dictionary.getValue("AbsorptionMultiply", absorptionMultiply); + _absorptionMultiply = static_cast(absorptionMultiply); + } + { + double emissionMultiply = _emissionMultiply; + dictionary.getValue("EmissionMultiply", emissionMultiply); + _emissionMultiply = static_cast(emissionMultiply); + } dictionary.getValue("StarRenderingMethod", _starRenderingMethod); - dictionary.getValue("EnabledPointsRatio", _enabledPointsRatio); - dictionary.getValue("Translation", _translation); - dictionary.getValue("Rotation", _rotation); + { + double enabledPointsRatio = _enabledPointsRatio; + dictionary.getValue("EnabledPointsRatio", enabledPointsRatio); + _enabledPointsRatio = static_cast(enabledPointsRatio); + } + { + glm::dvec3 translation = glm::vec3(_translation); + dictionary.getValue("Translation", translation); + _translation = glm::vec3(translation); + } + { + glm::dvec3 rotation = glm::vec3(_rotation); + dictionary.getValue("Rotation", rotation); + _rotation = glm::vec3(rotation); + } if (dictionary.hasKeyAndValue(VolumeRenderingEnabledInfo.identifier)) { _volumeRenderingEnabled = dictionary.value( diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp index f8da41f7a9..02831af39a 100644 --- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp +++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp @@ -230,7 +230,7 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) { ghoul::fontrendering::CrDirection::Down ); - std::string_view str = SpiceManager::ref().dateFromEphemerisTime( + std::string str = SpiceManager::ref().dateFromEphemerisTime( sequencer.nextCaptureTime(global::timeManager.time().j2000Seconds()), "YYYY MON DD HR:MN:SC" ); diff --git a/src/interaction/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp index fbd8f6a77b..956639443b 100644 --- a/src/interaction/tasks/convertrecformattask.cpp +++ b/src/interaction/tasks/convertrecformattask.cpp @@ -35,8 +35,6 @@ namespace { constexpr const char* _loggerCat = "ConvertRecFormatTask"; - constexpr const char* KeyConvertToAscii = "ConvertToAscii"; - constexpr const char* KeyConvertToBinary = "ConvertToBinary"; constexpr const char* KeyInFilePath = "InputFilePath"; constexpr const char* KeyOutFilePath = "OutputFilePath"; } // namespace diff --git a/src/scene/assetloader.cpp b/src/scene/assetloader.cpp index 1a1dd1f958..828a3faf99 100644 --- a/src/scene/assetloader.cpp +++ b/src/scene/assetloader.cpp @@ -43,7 +43,6 @@ namespace { constexpr const char* AssetGlobalVariableName = "asset"; constexpr const char* RequireFunctionName = "require"; - constexpr const char* RequestFunctionName = "request"; constexpr const char* ExistsFunctionName = "exists"; constexpr const char* ExportFunctionName = "export";