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

Fixes #2540 by correctly showing all points, including the proper end point

Browse Source
This commit is contained in:
Adam Rohdin
2023-06-07 16:20:19 +02:00
parent fdcddaf1c0
commit 959efddc51
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/base/rendering/renderabletrailtrajectory.cpp
View File

@@ -230,7 +230,7 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
// Make space for the vertices
_vertexArray.clear();
_vertexArray.resize(_numberOfVertices);
_vertexArray.resize(_numberOfVertices + 1);
}
// Calculate sweeping range for this iteration
@@ -253,6 +253,17 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
}
++_sweepIteration;
// Adds the last point in time to the _vertexArray so that we
// ensure that points for _start and _end always exists.
if (stopIndex == _numberOfVertices) {
const glm::vec3 p = _translation->position({
{},
Time(_end),
Time(0.0)
});
_vertexArray[stopIndex] = { p.x, p.y, p.z };
}
if (stopIndex == _numberOfVertices) {
_sweepIteration = 0;
setBoundingSphere(glm::distance(_maxVertex, _minVertex) / 2.f);
@@ -299,10 +310,13 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
0.0,
(data.time.j2000Seconds() - _start) / (_end - _start)
);
_primaryRenderInformation.count = std::min(
static_cast<GLsizei>(ceil(_vertexArray.size() * t)),
static_cast<GLsizei>(_vertexArray.size() - 1)
);
if (data.time.j2000Seconds() < _end) {
_primaryRenderInformation.count = static_cast<GLsizei>(_vertexArray.size() * t);
}
else {
_primaryRenderInformation.count = static_cast<GLsizei>(_vertexArray.size());
}
}
// If we are inside the valid time, we additionally want to draw a line from the last