Merging Master

This commit is contained in:
Jonathas Costa
2019-07-22 16:47:58 -04:00
parent 20d24764e7
commit a6b90991b2
119 changed files with 1812 additions and 1660 deletions
@@ -226,8 +226,8 @@ void RenderableTrailTrajectory::update(const UpdateData& data) {
for (int i = 0; i < nValues; ++i) {
const glm::vec3 p = _translation->position({
{},
_start + i * totalSampleInterval,
0.0,
Time(_start + i * totalSampleInterval),
Time(0.0),
false
});
_vertexArray[i] = { p.x, p.y, p.z };