From 604f275d61da2fc0456a7e5a376f2afe8d894ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Sun, 10 Feb 2019 21:08:44 -0800 Subject: [PATCH] Cleanup. --- examples/common/bounds.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/common/bounds.cpp b/examples/common/bounds.cpp index 102798246..09527d21f 100644 --- a/examples/common/bounds.cpp +++ b/examples/common/bounds.cpp @@ -864,13 +864,13 @@ void calcPlane(Plane& _outPlane, const Triangle& _triangle) calcPlane(_outPlane, _triangle.v0, _triangle.v1, _triangle.v2); } -struct Range1 +struct Interval { float start; float end; }; -bool overlap(const Range1& _a, const Range1& _b) +bool overlap(const Interval& _a, const Interval& _b) { return _a.end > _b.start && _b.end > _a.start @@ -882,7 +882,7 @@ float projectToAxis(const Vec3& _axis, const Vec3& _point) return dot(_axis, _point); } -Range1 projectToAxis(const Vec3& _axis, const Aabb& _aabb) +Interval projectToAxis(const Vec3& _axis, const Aabb& _aabb) { const float extent = bx::abs(dot(abs(_axis), getExtents(_aabb) ) ); const float center = dot( _axis , getCenter (_aabb) ); @@ -893,7 +893,7 @@ Range1 projectToAxis(const Vec3& _axis, const Aabb& _aabb) }; } -Range1 projectToAxis(const Vec3& _axis, const Triangle& _triangle) +Interval projectToAxis(const Vec3& _axis, const Triangle& _triangle) { const float a0 = dot(_axis, _triangle.v0); const float a1 = dot(_axis, _triangle.v1); @@ -1302,8 +1302,8 @@ bool overlap(const Aabb& _aabb, const Triangle& _triangle) { const Vec3 axis = cross(kAxis[ii], edge[jj]); - const Range1 aabbR = projectToAxis(axis, _aabb); - const Range1 triR = projectToAxis(axis, _triangle); + const Interval aabbR = projectToAxis(axis, _aabb); + const Interval triR = projectToAxis(axis, _triangle); if (!overlap(aabbR, triR) ) {