diff options
author | George Marques <george@gmarqu.es> | 2021-02-28 16:52:06 -0300 |
---|---|---|
committer | George Marques <george@gmarqu.es> | 2021-02-28 16:57:34 -0300 |
commit | cba90d630177ce6c57b5537e74ef3eab4e9c1ea2 (patch) | |
tree | 439897c2673d4f0af2635abffe73699d0cae6a01 /src/core/Transform2D.cpp | |
parent | 77d41fa179e40560f1e264ed483638bf51713779 (diff) | |
download | redot-cpp-cba90d630177ce6c57b5537e74ef3eab4e9c1ea2.tar.gz |
Update clang-format to version 11
This is taken from the Godot repository, so formatting is similar. This
updates the style rules as well.
Also fix style in files to conform with this version.
Diffstat (limited to 'src/core/Transform2D.cpp')
-rw-r--r-- | src/core/Transform2D.cpp | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/core/Transform2D.cpp b/src/core/Transform2D.cpp index 6395c3d..ad4691b 100644 --- a/src/core/Transform2D.cpp +++ b/src/core/Transform2D.cpp @@ -12,7 +12,6 @@ const Transform2D Transform2D::FLIP_X = Transform2D(-1, 0, 0, 1, 0, 0); const Transform2D Transform2D::FLIP_Y = Transform2D(1, 0, 0, -1, 0, 0); Transform2D::Transform2D(real_t xx, real_t xy, real_t yx, real_t yy, real_t ox, real_t oy) { - elements[0][0] = xx; elements[0][1] = xy; elements[1][0] = yx; @@ -22,28 +21,24 @@ Transform2D::Transform2D(real_t xx, real_t xy, real_t yx, real_t yy, real_t ox, } Vector2 Transform2D::basis_xform(const Vector2 &v) const { - return Vector2( tdotx(v), tdoty(v)); } Vector2 Transform2D::basis_xform_inv(const Vector2 &v) const { - return Vector2( elements[0].dot(v), elements[1].dot(v)); } Vector2 Transform2D::xform(const Vector2 &v) const { - return Vector2( tdotx(v), tdoty(v)) + elements[2]; } Vector2 Transform2D::xform_inv(const Vector2 &p_vec) const { - Vector2 v = p_vec - elements[2]; return Vector2( @@ -51,7 +46,6 @@ Vector2 Transform2D::xform_inv(const Vector2 &p_vec) const { elements[1].dot(v)); } Rect2 Transform2D::xform(const Rect2 &p_rect) const { - Vector2 x = elements[0] * p_rect.size.x; Vector2 y = elements[1] * p_rect.size.y; Vector2 position = xform(p_rect.position); @@ -65,7 +59,6 @@ Rect2 Transform2D::xform(const Rect2 &p_rect) const { } void Transform2D::set_rotation_and_scale(real_t p_rot, const Size2 &p_scale) { - elements[0][0] = ::cos(p_rot) * p_scale.x; elements[1][1] = ::cos(p_rot) * p_scale.y; elements[1][0] = -::sin(p_rot) * p_scale.y; @@ -73,7 +66,6 @@ void Transform2D::set_rotation_and_scale(real_t p_rot, const Size2 &p_scale) { } Rect2 Transform2D::xform_inv(const Rect2 &p_rect) const { - Vector2 ends[4] = { xform_inv(p_rect.position), xform_inv(Vector2(p_rect.position.x, p_rect.position.y + p_rect.size.y)), @@ -98,14 +90,12 @@ void Transform2D::invert() { } Transform2D Transform2D::inverse() const { - Transform2D inv = *this; inv.invert(); return inv; } void Transform2D::affine_invert() { - real_t det = basis_determinant(); ERR_FAIL_COND(det == 0); real_t idet = 1.0 / det; @@ -118,7 +108,6 @@ void Transform2D::affine_invert() { } Transform2D Transform2D::affine_inverse() const { - Transform2D inv = *this; inv.affine_invert(); return inv; @@ -138,7 +127,6 @@ real_t Transform2D::get_rotation() const { } void Transform2D::set_rotation(real_t p_rot) { - real_t cr = ::cos(p_rot); real_t sr = ::sin(p_rot); elements[0][0] = cr; @@ -148,7 +136,6 @@ void Transform2D::set_rotation(real_t p_rot) { } Transform2D::Transform2D(real_t p_rot, const Vector2 &p_position) { - real_t cr = ::cos(p_rot); real_t sr = ::sin(p_rot); elements[0][0] = cr; @@ -168,23 +155,19 @@ void Transform2D::scale(const Size2 &p_scale) { elements[2] *= p_scale; } void Transform2D::scale_basis(const Size2 &p_scale) { - elements[0][0] *= p_scale.x; elements[0][1] *= p_scale.y; elements[1][0] *= p_scale.x; elements[1][1] *= p_scale.y; } void Transform2D::translate(real_t p_tx, real_t p_ty) { - translate(Vector2(p_tx, p_ty)); } void Transform2D::translate(const Vector2 &p_translation) { - elements[2] += basis_xform(p_translation); } void Transform2D::orthonormalize() { - // Gram-Schmidt Process Vector2 x = elements[0]; @@ -198,14 +181,12 @@ void Transform2D::orthonormalize() { elements[1] = y; } Transform2D Transform2D::orthonormalized() const { - Transform2D on = *this; on.orthonormalize(); return on; } bool Transform2D::operator==(const Transform2D &p_transform) const { - for (int i = 0; i < 3; i++) { if (elements[i] != p_transform.elements[i]) return false; @@ -215,7 +196,6 @@ bool Transform2D::operator==(const Transform2D &p_transform) const { } bool Transform2D::operator!=(const Transform2D &p_transform) const { - for (int i = 0; i < 3; i++) { if (elements[i] != p_transform.elements[i]) return true; @@ -225,7 +205,6 @@ bool Transform2D::operator!=(const Transform2D &p_transform) const { } void Transform2D::operator*=(const Transform2D &p_transform) { - elements[2] = xform(p_transform.elements[2]); real_t x0, x1, y0, y1; @@ -242,54 +221,46 @@ void Transform2D::operator*=(const Transform2D &p_transform) { } Transform2D Transform2D::operator*(const Transform2D &p_transform) const { - Transform2D t = *this; t *= p_transform; return t; } Transform2D Transform2D::scaled(const Size2 &p_scale) const { - Transform2D copy = *this; copy.scale(p_scale); return copy; } Transform2D Transform2D::basis_scaled(const Size2 &p_scale) const { - Transform2D copy = *this; copy.scale_basis(p_scale); return copy; } Transform2D Transform2D::untranslated() const { - Transform2D copy = *this; copy.elements[2] = Vector2(); return copy; } Transform2D Transform2D::translated(const Vector2 &p_offset) const { - Transform2D copy = *this; copy.translate(p_offset); return copy; } Transform2D Transform2D::rotated(real_t p_phi) const { - Transform2D copy = *this; copy.rotate(p_phi); return copy; } real_t Transform2D::basis_determinant() const { - return elements[0].x * elements[1].y - elements[0].y * elements[1].x; } Transform2D Transform2D::interpolate_with(const Transform2D &p_transform, real_t p_c) const { - //extract parameters Vector2 p1 = get_origin(); Vector2 p2 = p_transform.get_origin(); @@ -325,7 +296,6 @@ Transform2D Transform2D::interpolate_with(const Transform2D &p_transform, real_t } Transform2D::operator String() const { - return String(String() + elements[0] + ", " + elements[1] + ", " + elements[2]); } |