Cleanup of mostly asset files

- Fixes for all files
 - constexpr cleanup
 - Cosmetic changes
 - Remove punctuation from the end of messages

include/openspace/camera/camera.h

@@ -148,8 +148,10 @@ public:
     std::vector<Syncable*> getSyncables();
 
     // Static constants
-    static const glm::dvec3 ViewDirectionCameraSpace;
-    static const glm::dvec3 UpDirectionCameraSpace;
+    // (2021-07-16, emmbr) Note that this hard coded vector for the view direction is also
+    // used in a qauternion -> view direction helper function in ghoul/glm.h
+    static constexpr glm::dvec3 ViewDirectionCameraSpace = glm::dvec3(0.0, 0.0, -1.0);
+    static constexpr glm::dvec3 UpDirectionCameraSpace = glm::dvec3(0.0, 1.0, 0.0);
 
 private:
 

include/openspace/events/event.h

@@ -113,7 +113,7 @@ void logAllEvents(const Event* e);
  * to the scene.
  */
 struct EventSceneGraphNodeAdded : public Event {
-    static const Type Type = Event::Type::SceneGraphNodeAdded;
+    static constexpr Type Type = Event::Type::SceneGraphNodeAdded;
 
     /**
      * Creates an instance of an EventSceneGraphNodeAdded event.
@@ -131,7 +131,7 @@ struct EventSceneGraphNodeAdded : public Event {
  * is signalled, the scene graph node has already been removed.
  */
 struct EventSceneGraphNodeRemoved : public Event {
-    static const Type Type = Event::Type::SceneGraphNodeRemoved;
+    static constexpr Type Type = Event::Type::SceneGraphNodeRemoved;
 
     /**
      * Creates an instance of an EventSceneGraphNodeRemoved event.
@@ -149,7 +149,7 @@ struct EventSceneGraphNodeRemoved : public Event {
  * The new state is sent as an argument with this event.
  */
 struct EventParallelConnection : public Event {
-    static const Type Type = Event::Type::ParallelConnection;
+    static constexpr Type Type = Event::Type::ParallelConnection;
 
     enum class State : uint8_t {
         Established,
@@ -173,7 +173,7 @@ struct EventParallelConnection : public Event {
  * regardless of whether it is the initial profile, or any subsequent profile is loaded.
  */
 struct EventProfileLoadingFinished : public Event {
-    static const Type Type = Event::Type::ProfileLoadingFinished;
+    static constexpr Type Type = Event::Type::ProfileLoadingFinished;
 
     /**
      * Creates an instance of an EventProfileLoadingFinished event.
@@ -187,7 +187,7 @@ struct EventProfileLoadingFinished : public Event {
  * which means that OpenSpace is just about the shutdown.
  */
 struct EventApplicationShutdown : public Event {
-    static const Type Type = Event::Type::ApplicationShutdown;
+    static constexpr Type Type = Event::Type::ApplicationShutdown;
 
     enum class State : uint8_t {
         Started,
@@ -210,7 +210,7 @@ struct EventApplicationShutdown : public Event {
  * this event is craeted, the screenspace renderable is already registered and available.
  */
 struct EventScreenSpaceRenderableAdded : public Event {
-    static const Type Type = Event::Type::ScreenSpaceRenderableAdded;
+    static constexpr Type Type = Event::Type::ScreenSpaceRenderableAdded;
 
     /**
      * Creates an instance of an EventScreenSpaceRenderableAdded event.
@@ -229,7 +229,7 @@ struct EventScreenSpaceRenderableAdded : public Event {
  * no longer available
  */
 struct EventScreenSpaceRenderableRemoved : public Event {
-    static const Type Type = Event::Type::ScreenSpaceRenderableRemoved;
+    static constexpr Type Type = Event::Type::ScreenSpaceRenderableRemoved;
 
     /**
      * Creates an instance of an EventScreenSpaceRenderableRemoved event.
@@ -259,7 +259,7 @@ Exiting                 Receding               Reaching                Approachi
 ```
  */
 struct EventCameraFocusTransition : public Event {
-    static const Type Type = Event::Type::CameraFocusTransition;
+    static constexpr Type Type = Event::Type::CameraFocusTransition;
 
     enum class Transition {
         Approaching,
@@ -294,7 +294,7 @@ struct EventCameraFocusTransition : public Event {
  * currently unused.
  */
 struct EventTimeOfInterestReached : public Event {
-    static const Type Type = Event::Type::TimeOfInterestReached;
+    static constexpr Type Type = Event::Type::TimeOfInterestReached;
 
     /**
      * Creates an instance of an EventTimeOfInterestReached event.
@@ -314,7 +314,7 @@ struct EventTimeOfInterestReached : public Event {
  * currently unused.
  */
 struct EventMissionEventReached : public Event {
-    static const Type Type = Event::Type::MissionEventReached;
+    static constexpr Type Type = Event::Type::MissionEventReached;
 
     // Not sure which kind of parameters we want to pass here
     EventMissionEventReached();
@@ -325,7 +325,7 @@ struct EventMissionEventReached : public Event {
  * event is currently unused.
  */
 struct EventPlanetEclipsed : public Event {
-    static const Type Type = Event::Type::PlanetEclipsed;
+    static constexpr Type Type = Event::Type::PlanetEclipsed;
 
     /**
      * Creates an instance of an EventPlanetEclipsed event.
@@ -347,7 +347,7 @@ struct EventPlanetEclipsed : public Event {
  * interpolation time of a property change is 0s, this event is not fired
  */
 struct EventInterpolationFinished : public Event {
-    static const Type Type = Event::Type::InterpolationFinished;
+    static constexpr Type Type = Event::Type::InterpolationFinished;
 
     /**
      * Creates an instance of an EventInterpolationFinished event.
@@ -366,7 +366,7 @@ struct EventInterpolationFinished : public Event {
  * same time.
  */
 struct EventFocusNodeChanged : public Event {
-    static const Type Type = Event::Type::FocusNodeChanged;
+    static constexpr Type Type = Event::Type::FocusNodeChanged;
 
     /**
      * Creates an instance of an EventFocusNodeChanged event.
@@ -387,7 +387,7 @@ struct EventFocusNodeChanged : public Event {
  * This event is created when a layer is added to to a globe.
  */
 struct EventLayerAdded : public Event {
-    static const Type Type = Event::Type::LayerAdded;
+    static constexpr Type Type = Event::Type::LayerAdded;
 
     /**
      * Creates an instance of an EventLayerAdded event.
@@ -412,7 +412,7 @@ struct EventLayerAdded : public Event {
  * This event is created when a layer is removed from a globe.
  */
 struct EventLayerRemoved : public Event {
-    static const Type Type = Event::Type::LayerRemoved;
+    static constexpr Type Type = Event::Type::LayerRemoved;
 
     /**
      * Creates an instance of an EventLayerRemoved event.
@@ -438,7 +438,7 @@ struct EventLayerRemoved : public Event {
  * The event contains information about the new state of the session recording subsystem.
  */
 struct EventSessionRecordingPlayback : public Event {
-    static const Type Type = Event::Type::SessionRecordingPlayback;
+    static constexpr Type Type = Event::Type::SessionRecordingPlayback;
 
     enum class State {
         Started,
@@ -465,7 +465,7 @@ struct EventSessionRecordingPlayback : public Event {
  * it should do the pointing.
  */
 struct EventPointSpacecraft : public Event {
-    static const Type Type = Event::Type::PointSpacecraft;
+    static constexpr Type Type = Event::Type::PointSpacecraft;
 
     /**
      * Creates an instance of an EventSessionRecordingPlayback event.
@@ -487,7 +487,7 @@ struct EventPointSpacecraft : public Event {
  * signalled, the renderable has already been enabled.
  */
 struct EventRenderableEnabled : public Event {
-    static const Type Type = Event::Type::RenderableEnabled;
+    static constexpr Type Type = Event::Type::RenderableEnabled;
 
     /**
      * Creates an instance of an EventRenderableEnabled event.
@@ -506,7 +506,7 @@ struct EventRenderableEnabled : public Event {
  * signalled, the renderable has already been disabled.
  */
 struct EventRenderableDisabled : public Event {
-    static const Type Type = Event::Type::RenderableDisabled;
+    static constexpr Type Type = Event::Type::RenderableDisabled;
 
     /**
      * Creates an instance of an EventRenderableDisabled event.
@@ -526,7 +526,7 @@ struct EventRenderableDisabled : public Event {
  * transitioned to a specific event type, if it is deemed to be useful.
  */
 struct CustomEvent : public Event {
-    static const Type Type = Event::Type::Custom;
+    static constexpr Type Type = Event::Type::Custom;
 
     /**
      * Creates an instance of a CustomEvent event.

include/openspace/interaction/sessionrecording.h

@@ -854,7 +854,7 @@ public:
             //Read string length from file
             in->read(reinterpret_cast<char*>(&strLen), sizeof(strLen));
             if (strLen > saveBufferStringSize_max) {
-                throw ConversionError("Invalid script size for conversion read.");
+                throw ConversionError("Invalid script size for conversion read");
             }
             //Read back full string
             std::vector<char> temp(strLen + 1);

include/openspace/navigation/navigationhandler.h

@@ -159,7 +159,7 @@ private:
     Camera* _camera = nullptr;
     std::function<void()> _playbackEndCallback;
 
-    inline static const double InteractionHystersis = 0.0125;
+    static constexpr double InteractionHystersis = 0.0125;
     bool _inAnchorApproachSphere = false;
     bool _inAnchorReachSphere = false;
 

include/openspace/network/parallelconnection.h

@@ -85,7 +85,8 @@ public:
 
     ParallelConnection::Message receiveMessage();
 
-    static const uint8_t ProtocolVersion;
+    // Gonna do some UTF-like magic once we reach 255 to introduce a second byte or so
+    static constexpr uint8_t ProtocolVersion = 6;
 
 private:
     std::unique_ptr<ghoul::io::TcpSocket> _socket;

include/openspace/properties/propertyowner.h

@@ -52,7 +52,7 @@ class Property;
 class PropertyOwner : public DocumentationGenerator {
 public:
     /// The separator that is used while accessing the properties and/or sub-owners
-    static const char URISeparator = '.';
+    static constexpr char URISeparator = '.';
 
     struct PropertyOwnerInfo {
         std::string identifier;

include/openspace/util/concurrentjobmanager.inl

@@ -48,7 +48,7 @@ void ConcurrentJobManager<P>::clearEnqueuedJobs() {
 
 template<typename P>
 std::shared_ptr<Job<P>> ConcurrentJobManager<P>::popFinishedJob() {
-    ghoul_assert(!_finishedJobs.empty(), "There is no finished job to pop!");
+    ghoul_assert(!_finishedJobs.empty(), "There is no finished job to pop");
 
     std::lock_guard lock(_finishedJobsMutex);
     return _finishedJobs.pop();