mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 04:30:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/FXAA

Browse Source
This commit is contained in:
Jonathas Costa
2019-08-19 14:57:37 -04:00
parent 15d6586e06 f09f79f6c9
commit 53fee40937
78 changed files with 2320 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/interaction/orbitalnavigator.h
+3 -4
View File
@@ -83,7 +83,8 @@ public:
ScriptCameraStates& scriptStates();
const ScriptCameraStates& scriptStates() const;
bool followingNodeRotation() const;
bool shouldFollowAnchorRotation() const;
bool followingAnchorRotation() const;
const SceneGraphNode* anchorNode() const;
const SceneGraphNode* aimNode() const;
@@ -290,9 +291,7 @@ private:
* Interpolates between rotationDiff and a 0 rotation.
*/
glm::dquat interpolateRotationDifferential(double deltaTime,
double interpolationTime, const glm::dquat& rotationDiff,
const glm::dvec3& objectPosition, const glm::dvec3& cameraPosition,
const SurfacePositionHandle& positionHandle);
double interpolationTime, const glm::dquat& rotationDiff);
/**
* Get the vector from the camera to the surface of the anchor object in world space.