diff options
| author | Rémi Verschelde | 2017-11-17 20:04:29 +0100 |
|---|---|---|
| committer | GitHub | 2017-11-17 20:04:29 +0100 |
| commit | 0968c8d2f65f7ac6e0d6b3718ee1028b229b3353 (patch) | |
| tree | d2265ef6e3273658171104abe9b215f961d17495 /servers/physics/collision_object_sw.cpp | |
| parent | 1feeb3e1c8406caf5497d5fcb40820cbb2d0d165 (diff) | |
| parent | d28763a4c1792dc00fde3d151eaea54f9cf2b8a9 (diff) | |
| download | godot-0968c8d2f65f7ac6e0d6b3718ee1028b229b3353.tar.gz godot-0968c8d2f65f7ac6e0d6b3718ee1028b229b3353.tar.zst godot-0968c8d2f65f7ac6e0d6b3718ee1028b229b3353.zip | |
Merge pull request #12982 from tagcup/aabb_rename
Rename Rect3 to AABB.
Diffstat (limited to '')
| -rw-r--r-- | servers/physics/collision_object_sw.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/physics/collision_object_sw.cpp b/servers/physics/collision_object_sw.cpp index 3af8b542f..126f8141f 100644 --- a/servers/physics/collision_object_sw.cpp +++ b/servers/physics/collision_object_sw.cpp @@ -149,7 +149,7 @@ void CollisionObjectSW::_update_shapes() { } //not quite correct, should compute the next matrix.. - Rect3 shape_aabb = s.shape->get_aabb(); + AABB shape_aabb = s.shape->get_aabb(); Transform xform = transform * s.xform; shape_aabb = xform.xform(shape_aabb); s.aabb_cache = shape_aabb; @@ -176,10 +176,10 @@ void CollisionObjectSW::_update_shapes_with_motion(const Vector3 &p_motion) { } //not quite correct, should compute the next matrix.. - Rect3 shape_aabb = s.shape->get_aabb(); + AABB shape_aabb = s.shape->get_aabb(); Transform xform = transform * s.xform; shape_aabb = xform.xform(shape_aabb); - shape_aabb = shape_aabb.merge(Rect3(shape_aabb.position + p_motion, shape_aabb.size)); //use motion + shape_aabb = shape_aabb.merge(AABB(shape_aabb.position + p_motion, shape_aabb.size)); //use motion s.aabb_cache = shape_aabb; space->get_broadphase()->move(s.bpid, shape_aabb); |