seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Type consistencies in core

Browse Source
This commit is contained in:
Aaron Franke
2021-01-25 14:46:35 -05:00
parent fa498f6105
commit 1be0d6b30e
6 changed files with 40 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/math/aabb.h
View File

@ -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;