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 /servers/physics/broad_phase_basic.h | |
| parent | 1feeb3e1c8406caf5497d5fcb40820cbb2d0d165 (diff) | |
| parent | d28763a4c1792dc00fde3d151eaea54f9cf2b8a9 (diff) | |
Merge pull request #12982 from tagcup/aabb_rename
Rename Rect3 to AABB.
Diffstat (limited to 'servers/physics/broad_phase_basic.h')
| -rw-r--r-- | servers/physics/broad_phase_basic.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/physics/broad_phase_basic.h b/servers/physics/broad_phase_basic.h index 5c124c1792..ee683ed840 100644 --- a/servers/physics/broad_phase_basic.h +++ b/servers/physics/broad_phase_basic.h @@ -39,7 +39,7 @@ class BroadPhaseBasic : public BroadPhaseSW { CollisionObjectSW *owner; bool _static; - Rect3 aabb; + AABB aabb; int subindex; }; @@ -83,7 +83,7 @@ class BroadPhaseBasic : public BroadPhaseSW { public: // 0 is an invalid ID virtual ID create(CollisionObjectSW *p_object, int p_subindex = 0); - virtual void move(ID p_id, const Rect3 &p_aabb); + virtual void move(ID p_id, const AABB &p_aabb); virtual void set_static(ID p_id, bool p_static); virtual void remove(ID p_id); @@ -93,7 +93,7 @@ public: virtual int cull_point(const Vector3 &p_point, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices = NULL); virtual int cull_segment(const Vector3 &p_from, const Vector3 &p_to, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices = NULL); - virtual int cull_aabb(const Rect3 &p_aabb, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices = NULL); + virtual int cull_aabb(const AABB &p_aabb, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices = NULL); virtual void set_pair_callback(PairCallback p_pair_callback, void *p_userdata); virtual void set_unpair_callback(UnpairCallback p_unpair_callback, void *p_userdata); |