diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-16 09:16:40 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-16 09:16:40 +0100 |
| commit | 15800812685a7df069cc417f4f5b371d3e07fdf7 (patch) | |
| tree | d28500b07d345fa2a8c9d068392c7cf5df40abbf /core | |
| parent | 2118f8e8a39c072a043923a2777ab428ffb9f13a (diff) | |
| parent | 7560340ef61bf4f2bf67dc3f8b1415dfeeb8e485 (diff) | |
Merge pull request #71474 from raulsntos/plane_get_center
Rename `center` method to `get_center` in Plane.
Diffstat (limited to 'core')
| -rw-r--r-- | core/math/geometry_3d.cpp | 2 | ||||
| -rw-r--r-- | core/math/plane.h | 2 | ||||
| -rw-r--r-- | core/variant/variant_call.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/math/geometry_3d.cpp b/core/math/geometry_3d.cpp index 3ac78e0709..c04fe7320d 100644 --- a/core/math/geometry_3d.cpp +++ b/core/math/geometry_3d.cpp @@ -748,7 +748,7 @@ Geometry3D::MeshData Geometry3D::build_convex_mesh(const Vector<Plane> &p_planes Vector3 right = p.normal.cross(ref).normalized(); Vector3 up = p.normal.cross(right).normalized(); - Vector3 center = p.center(); + Vector3 center = p.get_center(); // make a quad clockwise LocalVector<Vector3> vertices = { diff --git a/core/math/plane.h b/core/math/plane.h index 3bc7c54b9d..8159f25342 100644 --- a/core/math/plane.h +++ b/core/math/plane.h @@ -47,7 +47,7 @@ struct _NO_DISCARD_ Plane { /* Plane-Point operations */ - _FORCE_INLINE_ Vector3 center() const { return normal * d; } + _FORCE_INLINE_ Vector3 get_center() const { return normal * d; } Vector3 get_any_perpendicular_normal() const; _FORCE_INLINE_ bool is_point_over(const Vector3 &p_point) const; ///< Point is over plane diff --git a/core/variant/variant_call.cpp b/core/variant/variant_call.cpp index 05fb62ff12..2cc0b3a8d7 100644 --- a/core/variant/variant_call.cpp +++ b/core/variant/variant_call.cpp @@ -1923,7 +1923,7 @@ static void _register_variant_builtin_methods() { /* Plane */ bind_method(Plane, normalized, sarray(), varray()); - bind_method(Plane, center, sarray(), varray()); + bind_method(Plane, get_center, sarray(), varray()); bind_method(Plane, is_equal_approx, sarray("to_plane"), varray()); bind_method(Plane, is_finite, sarray(), varray()); bind_method(Plane, is_point_over, sarray("point"), varray()); |