diff --git a/include/openspace/navigation/navigationhandler.h b/include/openspace/navigation/navigationhandler.h index c61021b7fa..3c0a01fc22 100644 --- a/include/openspace/navigation/navigationhandler.h +++ b/include/openspace/navigation/navigationhandler.h @@ -174,7 +174,7 @@ public: * \param fadeDuration An optional duration for the fading. If unspecified, use the * JumpToFadeDuration property */ - void triggerFadeToTransition(const std::string& transitionScript, + void triggerFadeToTransition(std::string transitionScript, std::optional fadeDuration = std::nullopt); /** diff --git a/include/openspace/navigation/orbitalnavigator.h b/include/openspace/navigation/orbitalnavigator.h index 6a3d3283c5..f3601b7bc3 100644 --- a/include/openspace/navigation/orbitalnavigator.h +++ b/include/openspace/navigation/orbitalnavigator.h @@ -181,7 +181,7 @@ private: void updatePreviousAnchorState(); void updatePreviousAimState(); - Camera* _camera; + Camera* _camera = nullptr; Friction _friction; diff --git a/include/openspace/util/keys.h b/include/openspace/util/keys.h index 0b27f262e4..1753e154a9 100644 --- a/include/openspace/util/keys.h +++ b/include/openspace/util/keys.h @@ -92,7 +92,7 @@ constexpr KeyAction operator|=(KeyAction& lhs, KeyAction rhs) { ////////////////////////////////////////////////////////////////////////////////////////// enum class KeyModifier : uint8_t { - None = 0, + None = 0x00, Shift = 0x01, Control = 0x02, Alt = 0x04, diff --git a/include/openspace/util/syncdata.inl b/include/openspace/util/syncdata.inl index f1c5b92833..915150b913 100644 --- a/include/openspace/util/syncdata.inl +++ b/include/openspace/util/syncdata.inl @@ -30,7 +30,10 @@ template SyncData::SyncData(const T& val) : _data(val) {} template -SyncData::SyncData(const SyncData& o) : _data(o._data) {} +SyncData::SyncData(const SyncData& o) + : _data(o._data) + , _doubleBufferedData(o._doubleBufferedData) +{} template SyncData& SyncData::operator=(const T& rhs) { diff --git a/src/navigation/navigationhandler.cpp b/src/navigation/navigationhandler.cpp index cc39cbe53d..61e9db397a 100644 --- a/src/navigation/navigationhandler.cpp +++ b/src/navigation/navigationhandler.cpp @@ -194,14 +194,14 @@ void NavigationHandler::setInterpolationTime(float durationInSeconds) { _orbitalNavigator.setRetargetInterpolationTime(durationInSeconds); } -void NavigationHandler::triggerFadeToTransition(const std::string& transitionScript, +void NavigationHandler::triggerFadeToTransition(std::string transitionScript, std::optional fadeDuration) { const float duration = fadeDuration.value_or(_jumpToFadeDuration); std::string script; if (duration < std::numeric_limits::epsilon()) { - script = transitionScript; + script = std::move(transitionScript); } else { const std::string onArrivalScript = std::format( diff --git a/src/navigation/navigationhandler_lua.inl b/src/navigation/navigationhandler_lua.inl index 5d7314c971..310cdac058 100644 --- a/src/navigation/navigationhandler_lua.inl +++ b/src/navigation/navigationhandler_lua.inl @@ -1256,7 +1256,7 @@ localPositionFromGeoDeprecated(std::string nodeIdentifier, double latitude, bool setTime = (ns.timestamp.has_value() && useTimeStamp.value_or(false)); - const std::string script = std::format( + std::string script = std::format( "openspace.navigation.setNavigationState({}, {})", ghoul::formatLua(ns.dictionary()), setTime ); @@ -1268,7 +1268,7 @@ localPositionFromGeoDeprecated(std::string nodeIdentifier, double latitude, ); } else { - global::navigationHandler->triggerFadeToTransition(script); + global::navigationHandler->triggerFadeToTransition(std::move(script)); } } @@ -1288,7 +1288,7 @@ localPositionFromGeoDeprecated(std::string nodeIdentifier, double latitude, throw ghoul::lua::LuaError("Unknown node name: " + nodeIdentifier); } - const std::string script = std::format( + std::string script = std::format( "openspace.navigation.flyTo('{}', 0)", nodeIdentifier ); @@ -1299,7 +1299,7 @@ localPositionFromGeoDeprecated(std::string nodeIdentifier, double latitude, ); } else { - global::navigationHandler->triggerFadeToTransition(script); + global::navigationHandler->triggerFadeToTransition(std::move(script)); } }