diff options
| author | Ferenc Arn | 2017-11-16 21:09:00 -0500 |
|---|---|---|
| committer | Ferenc Arn | 2017-11-17 11:01:41 -0500 |
| commit | d28763a4c1792dc00fde3d151eaea54f9cf2b8a9 (patch) | |
| tree | 7abd311b6e672829bd751fbf4d9135b60f2f9913 /servers/physics/broad_phase_basic.cpp | |
| parent | b44cb4e3b9b573a3cbbd6f71aff81e6c3465d84b (diff) | |
| download | godot-d28763a4c1792dc00fde3d151eaea54f9cf2b8a9.tar.gz godot-d28763a4c1792dc00fde3d151eaea54f9cf2b8a9.tar.zst godot-d28763a4c1792dc00fde3d151eaea54f9cf2b8a9.zip | |
Diffstat (limited to 'servers/physics/broad_phase_basic.cpp')
| -rw-r--r-- | servers/physics/broad_phase_basic.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/servers/physics/broad_phase_basic.cpp b/servers/physics/broad_phase_basic.cpp index c6565ac2e..e4eae09c6 100644 --- a/servers/physics/broad_phase_basic.cpp +++ b/servers/physics/broad_phase_basic.cpp @@ -46,7 +46,7 @@ BroadPhaseSW::ID BroadPhaseBasic::create(CollisionObjectSW *p_object, int p_subi return current; } -void BroadPhaseBasic::move(ID p_id, const Rect3 &p_aabb) { +void BroadPhaseBasic::move(ID p_id, const AABB &p_aabb) { Map<ID, Element>::Element *E = element_map.find(p_id); ERR_FAIL_COND(!E); @@ -109,7 +109,7 @@ int BroadPhaseBasic::cull_point(const Vector3 &p_point, CollisionObjectSW **p_re for (Map<ID, Element>::Element *E = element_map.front(); E; E = E->next()) { - const Rect3 aabb = E->get().aabb; + const AABB aabb = E->get().aabb; if (aabb.has_point(p_point)) { p_results[rc] = E->get().owner; @@ -129,7 +129,7 @@ int BroadPhaseBasic::cull_segment(const Vector3 &p_from, const Vector3 &p_to, Co for (Map<ID, Element>::Element *E = element_map.front(); E; E = E->next()) { - const Rect3 aabb = E->get().aabb; + const AABB aabb = E->get().aabb; if (aabb.intersects_segment(p_from, p_to)) { p_results[rc] = E->get().owner; @@ -142,13 +142,13 @@ int BroadPhaseBasic::cull_segment(const Vector3 &p_from, const Vector3 &p_to, Co return rc; } -int BroadPhaseBasic::cull_aabb(const Rect3 &p_aabb, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices) { +int BroadPhaseBasic::cull_aabb(const AABB &p_aabb, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices) { int rc = 0; for (Map<ID, Element>::Element *E = element_map.front(); E; E = E->next()) { - const Rect3 aabb = E->get().aabb; + const AABB aabb = E->get().aabb; if (aabb.intersects(p_aabb)) { p_results[rc] = E->get().owner; |