diff options
| author | alexholly <alexander.holland@live.de> | 2017-06-06 20:33:51 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-06-09 15:54:02 +0200 |
| commit | 935f730170d75955f708b5014da3e11c95fcdac4 (patch) | |
| tree | 693c281eb4ed706ba4be9867e7f1276450e63e99 /core/math/face3.cpp | |
| parent | 63fd693c1ebd2d3d2c23f3969ca8f6f3e18ff3e4 (diff) | |
| download | redot-engine-935f730170d75955f708b5014da3e11c95fcdac4.tar.gz | |
renamed all Rect3.pos to Rect3.position
Diffstat (limited to 'core/math/face3.cpp')
| -rw-r--r-- | core/math/face3.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/core/math/face3.cpp b/core/math/face3.cpp index 6d772cf08c..5b66e1999a 100644 --- a/core/math/face3.cpp +++ b/core/math/face3.cpp @@ -197,20 +197,20 @@ bool Face3::intersects_aabb(const Rect3 &p_aabb) const { /** TEST FACE AXIS */ -#define TEST_AXIS(m_ax) \ - { \ - real_t aabb_min = p_aabb.pos.m_ax; \ - real_t aabb_max = p_aabb.pos.m_ax + p_aabb.size.m_ax; \ - real_t tri_min, tri_max; \ - for (int i = 0; i < 3; i++) { \ - if (i == 0 || vertex[i].m_ax > tri_max) \ - tri_max = vertex[i].m_ax; \ - if (i == 0 || vertex[i].m_ax < tri_min) \ - tri_min = vertex[i].m_ax; \ - } \ - \ - if (tri_max < aabb_min || aabb_max < tri_min) \ - return false; \ +#define TEST_AXIS(m_ax) \ + { \ + real_t aabb_min = p_aabb.position.m_ax; \ + real_t aabb_max = p_aabb.position.m_ax + p_aabb.size.m_ax; \ + real_t tri_min, tri_max; \ + for (int i = 0; i < 3; i++) { \ + if (i == 0 || vertex[i].m_ax > tri_max) \ + tri_max = vertex[i].m_ax; \ + if (i == 0 || vertex[i].m_ax < tri_min) \ + tri_min = vertex[i].m_ax; \ + } \ + \ + if (tri_max < aabb_min || aabb_max < tri_min) \ + return false; \ } TEST_AXIS(x); |