diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-17 20:04:29 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-17 20:04:29 +0100 |
commit | 0968c8d2f65f7ac6e0d6b3718ee1028b229b3353 (patch) | |
tree | d2265ef6e3273658171104abe9b215f961d17495 /core/math/face3.cpp | |
parent | 1feeb3e1c8406caf5497d5fcb40820cbb2d0d165 (diff) | |
parent | d28763a4c1792dc00fde3d151eaea54f9cf2b8a9 (diff) | |
download | redot-engine-0968c8d2f65f7ac6e0d6b3718ee1028b229b3353.tar.gz |
Merge pull request #12982 from tagcup/aabb_rename
Rename Rect3 to AABB.
Diffstat (limited to 'core/math/face3.cpp')
-rw-r--r-- | core/math/face3.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/math/face3.cpp b/core/math/face3.cpp index e1b172e491..070ce77db4 100644 --- a/core/math/face3.cpp +++ b/core/math/face3.cpp @@ -189,13 +189,13 @@ ClockDirection Face3::get_clock_dir() const { return (normal.dot(vertex[0]) >= 0) ? CLOCKWISE : COUNTERCLOCKWISE; } -bool Face3::intersects_aabb(const Rect3 &p_aabb) const { +bool Face3::intersects_aabb(const AABB &p_aabb) const { /** TEST PLANE **/ if (!p_aabb.intersects_plane(get_plane())) return false; -/** TEST FACE AXIS */ + /** TEST FACE AXIS */ #define TEST_AXIS(m_ax) \ { \ |