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

Merge

Browse Source
This commit is contained in:
Lingis
2020-01-26 17:39:24 -05:00
parent e209e7cd6a c1c96cd81d
commit 9709a9c171
2 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/autonavigation/pathsegment.cpp
+8 -4
View File
@@ -75,19 +75,23 @@ const glm::vec3 PathSegment::getPositionAt(double t) const {
}
const glm::dquat PathSegment::getRotationAt(double t) const {
double tRot = helpers::shiftAndScale(t, 0.1, 0.9);
tRot = easingfunctions::cubicEaseInOut(tRot);
double tSlerp = helpers::shiftAndScale(t, 0.1, 0.9);
tSlerp = easingfunctions::cubicEaseInOut(tSlerp);
double tLookAt = helpers::shiftAndScale(t, 0.2, 0.8);
tLookAt = easingfunctions::cubicEaseInOut(tLookAt);
switch (_curveType) {
case CurveType::Linear2:
case CurveType::Bezier3:
return getLookAtRotation(
tRot,
tLookAt,
getPositionAt(t),
global::navigationHandler.camera()->lookUpVectorWorldSpace()
);
break;
default:
return glm::slerp(_start.rotation, _end.rotation, tRot);
return glm::slerp(_start.rotation, _end.rotation, tSlerp);
}
}