Merge remote-tracking branch 'origin/master' into issue/2029

include/openspace/navigation/path.h

@@ -75,6 +75,12 @@ public:
      */
     CameraPose traversePath(double dt, float speedScale = 1.f);
 
+    /**
+     * Function that can be used to permaturely quit a path ,for example when skipping
+     * to the end
+     */
+    void quitPath();
+
     /**
      * Return the identifer of the node that is the current appropriate anchor node, of
      * the start and end waypoint's reference node. Dtermined based on how far along the

include/openspace/navigation/pathnavigator.h

@@ -72,6 +72,7 @@ public:
     void abortPath();
     void pausePath();
     void continuePath();
+    void skipToEnd();
 
     Path::Type defaultPathType() const;
     double minValidBoundingSphere() const;
@@ -79,6 +80,13 @@ public:
 
     const std::vector<SceneGraphNode*>& relevantNodes();
 
+    /**
+    * Find a node close to the given node. Closeness is determined by a factor times
+    * the bounding sphere of the object
+    * \return pointer to the SGN if one was found, nullptr otherwise
+    */
+    static SceneGraphNode* findNodeNearTarget(const SceneGraphNode* node);
+
     /**
     * \return The Lua library that contains all Lua functions available to affect the
     * path navigation
@@ -99,6 +107,8 @@ private:
     bool _isPlaying = false;
     bool _startSimulationTimeOnFinish = false;
 
+    bool _setCameraToEndNextFrame = false;
+
     properties::OptionProperty _defaultPathType;
     properties::BoolProperty _includeRoll;
     properties::FloatProperty _speedScale;