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

Clean up TimelineTranslation position calculation

Browse Source
This commit is contained in:
Malin E
2021-10-12 08:58:18 +02:00
parent 659cc09e4b
commit 1f0b44959f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/base/translation/timelinetranslation.cpp
View File

@@ -94,23 +94,22 @@ glm::dvec3 TimelineTranslation::position(const UpdateData& data) const {
const double prevTime = prev->timestamp;
const double nextTime = next->timestamp;
glm::dvec3 pos = glm::dvec3(0.0);
if (_shouldInterpolate) {
double t = 0.0;
if (nextTime - prevTime > 0.0) {
t = (now - prevTime) / (nextTime - prevTime);
}
pos = t * next->data->position(data) + (1.0 - t) * prev->data->position(data);
return t * next->data->position(data) + (1.0 - t) * prev->data->position(data);
}
else {
if (prevTime <= now && now < nextTime) {
pos = prev->data->position(data);
return prev->data->position(data);
}
else if (nextTime <= now) {
pos = next->data->position(data);
return next->data->position(data);
}
}
return pos;
return glm::dvec3(0.0);
}
} // namespace openspace