summaryrefslogtreecommitdiffstats
path: root/core/math/aabb.h
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-01-27 21:16:20 +0100
committerGitHub <noreply@github.com>2021-01-27 21:16:20 +0100
commit976e768e71310766ac3927118b15eee03a15cfdb (patch)
treeae4102e4286723456653483856db0f1255543324 /core/math/aabb.h
parent9d3a9b3e7dff8a3645fbb7fe95cd1e8141ba1802 (diff)
parent1be0d6b30e673b209fa8b1f2aa77995c9534df5e (diff)
downloadredot-engine-976e768e71310766ac3927118b15eee03a15cfdb.tar.gz
Merge pull request #45489 from aaronfranke/core
Type consistencies in core
Diffstat (limited to 'core/math/aabb.h')
-rw-r--r--core/math/aabb.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/math/aabb.h b/core/math/aabb.h
index 2861358e32..e16246902a 100644
--- a/core/math/aabb.h
+++ b/core/math/aabb.h
@@ -107,8 +107,8 @@ public:
Variant intersects_segment_bind(const Vector3 &p_from, const Vector3 &p_to) const;
Variant intersects_ray_bind(const Vector3 &p_from, const Vector3 &p_dir) const;
- _FORCE_INLINE_ void quantize(float p_unit);
- _FORCE_INLINE_ AABB quantized(float p_unit) const;
+ _FORCE_INLINE_ void quantize(real_t p_unit);
+ _FORCE_INLINE_ AABB quantized(real_t p_unit) const;
_FORCE_INLINE_ void set_end(const Vector3 &p_end) {
size = p_end - position;
@@ -430,7 +430,7 @@ void AABB::grow_by(real_t p_amount) {
size.z += 2.0 * p_amount;
}
-void AABB::quantize(float p_unit) {
+void AABB::quantize(real_t p_unit) {
size += position;
position.x -= Math::fposmodp(position.x, p_unit);
@@ -448,7 +448,7 @@ void AABB::quantize(float p_unit) {
size -= position;
}
-AABB AABB::quantized(float p_unit) const {
+AABB AABB::quantized(real_t p_unit) const {
AABB ret = *this;
ret.quantize(p_unit);
return ret;