From 4cef2be366f918ee779ef539ef7b85b0c1b5ee4f Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Fri, 24 Jan 2020 21:40:09 +0100 Subject: [PATCH] Small cleanup --- modules/base/rendering/renderabletrailorbit.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp index 87836132bd..4a06aaf182 100644 --- a/modules/base/rendering/renderabletrailorbit.cpp +++ b/modules/base/rendering/renderabletrailorbit.cpp @@ -358,18 +358,17 @@ void RenderableTrailOrbit::update(const UpdateData& data) { glBindVertexArray(0); // Updating bounding sphere - glm::vec3 maxVertex(std::numeric_limits::min()); + glm::vec3 maxVertex(-std::numeric_limits::max()); glm::vec3 minVertex(std::numeric_limits::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);