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

Small cleanup

Browse Source
This commit is contained in:
Alexander Bock
2020-01-24 21:40:09 +01:00
parent 18ed125851
commit 4cef2be366
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/base/rendering/renderabletrailorbit.cpp
View File

@@ -358,18 +358,17 @@ void RenderableTrailOrbit::update(const UpdateData& data) {
glBindVertexArray(0);
// Updating bounding sphere
glm::vec3 maxVertex(std::numeric_limits<float>::min());
glm::vec3 maxVertex(-std::numeric_limits<float>::max());
glm::vec3 minVertex(std::numeric_limits<float>::max());
auto setMax = [&maxVertex, &minVertex](TrailVBOLayout &vertexData)
{
maxVertex.x = maxVertex.x < vertexData.x ? vertexData.x : maxVertex.x;
maxVertex.y = maxVertex.y < vertexData.y ? vertexData.y : maxVertex.y;
maxVertex.z = maxVertex.z < vertexData.z ? vertexData.z : maxVertex.z;
auto setMax = [&maxVertex, &minVertex](const TrailVBOLayout& vertexData) {
maxVertex.x = std::max(maxVertex.x, vertexData.x);
maxVertex.y = std::max(maxVertex.y, vertexData.y);
maxVertex.z = std::max(maxVertex.z, vertexData.z);
minVertex.x = minVertex.x > vertexData.x ? vertexData.x : minVertex.x;
minVertex.y = minVertex.y > vertexData.y ? vertexData.y : minVertex.y;
minVertex.z = minVertex.z > vertexData.z ? vertexData.z : minVertex.z;
minVertex.x = std::min(minVertex.x, vertexData.x);
minVertex.y = std::min(minVertex.y, vertexData.y);
minVertex.z = std::min(minVertex.z, vertexData.z);
};
std::for_each(_vertexArray.begin(), _vertexArray.end(), setMax);