diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/math/transform_2d.cpp | 10 | ||||
-rw-r--r-- | core/math/transform_2d.h | 6 | ||||
-rw-r--r-- | core/math/transform_3d.cpp | 10 | ||||
-rw-r--r-- | core/math/transform_3d.h | 6 | ||||
-rw-r--r-- | core/variant/variant_call.cpp | 4 |
5 files changed, 18 insertions, 18 deletions
diff --git a/core/math/transform_2d.cpp b/core/math/transform_2d.cpp index cbd2fd3fa1..bb8bf9f569 100644 --- a/core/math/transform_2d.cpp +++ b/core/math/transform_2d.cpp @@ -136,11 +136,11 @@ void Transform2D::scale_basis(const Size2 &p_scale) { columns[1][1] *= p_scale.y; } -void Transform2D::translate(const real_t p_tx, const real_t p_ty) { - translate(Vector2(p_tx, p_ty)); +void Transform2D::translate_local(const real_t p_tx, const real_t p_ty) { + translate_local(Vector2(p_tx, p_ty)); } -void Transform2D::translate(const Vector2 &p_translation) { +void Transform2D::translate_local(const Vector2 &p_translation) { columns[2] += basis_xform(p_translation); } @@ -235,9 +235,9 @@ Transform2D Transform2D::untranslated() const { return copy; } -Transform2D Transform2D::translated(const Vector2 &p_offset) const { +Transform2D Transform2D::translated_local(const Vector2 &p_offset) const { Transform2D copy = *this; - copy.translate(p_offset); + copy.translate_local(p_offset); return copy; } diff --git a/core/math/transform_2d.h b/core/math/transform_2d.h index 72d34a5d4c..e64d050f0c 100644 --- a/core/math/transform_2d.h +++ b/core/math/transform_2d.h @@ -74,8 +74,8 @@ struct _NO_DISCARD_ Transform2D { void scale(const Size2 &p_scale); void scale_basis(const Size2 &p_scale); - void translate(const real_t p_tx, const real_t p_ty); - void translate(const Vector2 &p_translation); + void translate_local(const real_t p_tx, const real_t p_ty); + void translate_local(const Vector2 &p_translation); real_t basis_determinant() const; @@ -87,7 +87,7 @@ struct _NO_DISCARD_ Transform2D { Transform2D scaled(const Size2 &p_scale) const; Transform2D basis_scaled(const Size2 &p_scale) const; - Transform2D translated(const Vector2 &p_offset) const; + Transform2D translated_local(const Vector2 &p_offset) const; Transform2D rotated(const real_t p_angle) const; Transform2D untranslated() const; diff --git a/core/math/transform_3d.cpp b/core/math/transform_3d.cpp index 44248c274f..96dd88676d 100644 --- a/core/math/transform_3d.cpp +++ b/core/math/transform_3d.cpp @@ -129,19 +129,19 @@ void Transform3D::scale_basis(const Vector3 &p_scale) { basis.scale(p_scale); } -void Transform3D::translate(real_t p_tx, real_t p_ty, real_t p_tz) { - translate(Vector3(p_tx, p_ty, p_tz)); +void Transform3D::translate_local(real_t p_tx, real_t p_ty, real_t p_tz) { + translate_local(Vector3(p_tx, p_ty, p_tz)); } -void Transform3D::translate(const Vector3 &p_translation) { +void Transform3D::translate_local(const Vector3 &p_translation) { for (int i = 0; i < 3; i++) { origin[i] += basis[i].dot(p_translation); } } -Transform3D Transform3D::translated(const Vector3 &p_translation) const { +Transform3D Transform3D::translated_local(const Vector3 &p_translation) const { Transform3D t = *this; - t.translate(p_translation); + t.translate_local(p_translation); return t; } diff --git a/core/math/transform_3d.h b/core/math/transform_3d.h index 25832434cd..a746e80dfe 100644 --- a/core/math/transform_3d.h +++ b/core/math/transform_3d.h @@ -56,9 +56,9 @@ struct _NO_DISCARD_ Transform3D { void scale(const Vector3 &p_scale); Transform3D scaled(const Vector3 &p_scale) const; void scale_basis(const Vector3 &p_scale); - void translate(real_t p_tx, real_t p_ty, real_t p_tz); - void translate(const Vector3 &p_translation); - Transform3D translated(const Vector3 &p_translation) const; + void translate_local(real_t p_tx, real_t p_ty, real_t p_tz); + void translate_local(const Vector3 &p_translation); + Transform3D translated_local(const Vector3 &p_translation) const; const Basis &get_basis() const { return basis; } void set_basis(const Basis &p_basis) { basis = p_basis; } diff --git a/core/variant/variant_call.cpp b/core/variant/variant_call.cpp index 6b04c6e4e8..143fb28910 100644 --- a/core/variant/variant_call.cpp +++ b/core/variant/variant_call.cpp @@ -1883,7 +1883,7 @@ static void _register_variant_builtin_methods() { bind_method(Transform2D, orthonormalized, sarray(), varray()); bind_method(Transform2D, rotated, sarray("angle"), varray()); bind_method(Transform2D, scaled, sarray("scale"), varray()); - bind_method(Transform2D, translated, sarray("offset"), varray()); + bind_method(Transform2D, translated_local, sarray("offset"), varray()); bind_method(Transform2D, basis_xform, sarray("v"), varray()); bind_method(Transform2D, basis_xform_inv, sarray("v"), varray()); bind_method(Transform2D, interpolate_with, sarray("xform", "weight"), varray()); @@ -1948,7 +1948,7 @@ static void _register_variant_builtin_methods() { bind_method(Transform3D, orthonormalized, sarray(), varray()); bind_method(Transform3D, rotated, sarray("axis", "angle"), varray()); bind_method(Transform3D, scaled, sarray("scale"), varray()); - bind_method(Transform3D, translated, sarray("offset"), varray()); + bind_method(Transform3D, translated_local, sarray("offset"), varray()); bind_method(Transform3D, looking_at, sarray("target", "up"), varray(Vector3(0, 1, 0))); bind_method(Transform3D, sphere_interpolate_with, sarray("xform", "weight"), varray()); bind_method(Transform3D, interpolate_with, sarray("xform", "weight"), varray()); |