Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/stereo

include/openspace/engine/openspaceengine.h

@@ -29,6 +29,7 @@
 #include <openspace/util/keys.h>
 #include <openspace/util/mouse.h>
 #include <ghoul/glm.h>
+#include <ghoul/misc/assert.h>
 
 #include <functional>
 #include <memory>

include/openspace/interaction/navigationhandler.h

@@ -36,6 +36,7 @@
 #include <openspace/util/keys.h>
 
 #include <ghoul/misc/boolean.h>
+#include <ghoul/misc/assert.h>
 
 namespace openspace {
     class Camera;

include/openspace/scene/asset.h

@@ -80,6 +80,7 @@ public:
     State state() const;
 
     void addSynchronization(std::shared_ptr<ResourceSynchronization> synchronization);
+    void clearSynchronizations();
     std::vector<std::shared_ptr<ResourceSynchronization>> ownSynchronizations() const;
 
     void syncStateChanged(ResourceSynchronization::State s);
@@ -89,7 +90,7 @@ public:
      * i.e. if this and all required assets loaded without errors.
      */
     bool load();
-    bool hasLoadedParent() const;
+    bool hasLoadedParent();
     bool isLoaded() const;
     void unload();
     void unloadIfUnwanted();

include/openspace/util/timeconversion.h

@@ -82,13 +82,13 @@ constexpr const char* TimeUnitDays = "days";
 constexpr const char* TimeUnitMonths = "months";
 constexpr const char* TimeUnitYears = "years";
 
-constexpr std::array<TimeUnit, static_cast<int>(TimeUnit::Year) + 1> TimeUnits = {
+constexpr const std::array<TimeUnit, static_cast<int>(TimeUnit::Year) + 1> TimeUnits = {
     TimeUnit::Nanosecond, TimeUnit::Microsecond, TimeUnit::Millisecond,
     TimeUnit::Second, TimeUnit::Minute, TimeUnit::Hour, TimeUnit::Day,
     TimeUnit::Month, TimeUnit::Year
 };
 
-constexpr std::array<const char*, static_cast<int>(TimeUnit::Year) + 1>
+constexpr const std::array<const char*, static_cast<int>(TimeUnit::Year) + 1>
 TimeUnitNamesSingular = {
     TimeUnitNanosecond, TimeUnitMicrosecond, TimeUnitMillisecond, TimeUnitSecond,
     TimeUnitMinute, TimeUnitHour, TimeUnitDay, TimeUnitMonth, TimeUnitYear
@@ -158,12 +158,9 @@ constexpr TimeUnit timeUnitFromString(const char* unitName) {
         ++i;
     }
 
-    ghoul_assert(false, "Unit name is not a valid name");
     throw ghoul::MissingCaseException();
 }
 
-
-
 std::pair<double, std::string> simplifyTime(double seconds,
     bool forceSingularForm = false);