mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 20:21:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use the parameter passed to the function for speed

Browse Source
This commit is contained in:
Emma Broman
2021-06-21 13:23:09 +02:00
parent f36b0f2869
commit 933580e08c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/autonavigation/path.cpp
View File

@@ -182,7 +182,7 @@ double Path::speedAlongPath(double traveledDistance) {
const glm::dvec3 endNodePos = _end.node()->worldPosition();
const glm::dvec3 startNodePos = _start.node()->worldPosition();
const CameraPose prevPose = interpolatedPose(_traveledDistance);
const CameraPose prevPose = interpolatedPose(traveledDistance);
const double distanceToEndNode = glm::distance(prevPose.position, endNodePos);
const double distanceToStartNode = glm::distance(prevPose.position, startNodePos);
@@ -200,15 +200,15 @@ double Path::speedAlongPath(double traveledDistance) {
// Dampen speed in beginning of path
const double startUpDistance = 2.0 * _start.node()->boundingSphere();
if (_traveledDistance < startUpDistance) {
speed *= _traveledDistance / startUpDistance + 0.01;
if (traveledDistance < startUpDistance) {
speed *= traveledDistance / startUpDistance + 0.01;
}
// Dampen speed in end of path
// Note: this leads to problems when the full length of the path is really big
const double closeUpDistance = 2.0 * _end.node()->boundingSphere();
if (_traveledDistance > (pathLength() - closeUpDistance)) {
const double remainingDistance = pathLength() - _traveledDistance;
if (traveledDistance > (pathLength() - closeUpDistance)) {
const double remainingDistance = pathLength() - traveledDistance;
speed *= remainingDistance / closeUpDistance + 0.01;
}