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

Resolve merge conflict

Browse Source
This commit is contained in:
Emma Broman
2020-02-04 18:10:02 -05:00
parent d60ff85b5a cf8472cf34
commit 6acbee90f7
8 changed files with 78 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/autonavigation/pathsegment.h
+1
View File
@@ -58,6 +58,7 @@ public:
const double duration() const;
const double startTime() const;
const std::vector<glm::dvec3> getControlPoints() const; // TODO: remove this debugging function
const glm::dvec3 getPositionAt(double t) const;
const glm::dquat getRotationAt(double t) const;
const glm::dquat getLookAtRotation(double t, glm::dvec3 currentPos, glm::dvec3 up) const;