mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-03 02:48:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/general-performance

Browse Source
This commit is contained in:
Alexander Bock
2020-08-18 08:56:30 +02:00
parent 97811d82d0 52a2442f06
commit 4d9dda9a73
4 changed files with 68 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/openspace/interaction/orbitalnavigator.h
View File

@@ -65,9 +65,9 @@ public:
void setCamera(Camera* camera);
void clearPreviousState();
SceneGraphNode* focusNode() const;
void setFocusNode(const SceneGraphNode* focusNode);
void setFocusNode(const std::string& focusNode);
void setFocusNode(const SceneGraphNode* focusNode,
bool resetVelocitiesOnChange = true);
void setFocusNode(const std::string& focusNode, bool resetVelocitiesOnChange = true);
void setAnchorNode(const std::string& anchorNode);
void setAimNode(const std::string& aimNode);
@@ -121,7 +121,8 @@ private:
properties::FloatProperty friction;
};
void setAnchorNode(const SceneGraphNode* anchorNode);
void setAnchorNode(const SceneGraphNode* anchorNode,
bool resetVelocitiesOnChange = true);
void setAimNode(const SceneGraphNode* aimNode);
Camera* _camera;