From 99efa7ce62c0075345c5580642bcbeef413e313a Mon Sep 17 00:00:00 2001 From: Hein-Pieter van Braam Date: Wed, 21 Feb 2018 23:47:04 +0100 Subject: [PATCH] Revert "Fix wrong return type of xform functions" As this will change bindings API this will have to wait for 3.1 This reverts commit 187c40d64dd733ea77b27d96416ab7ad106069b9. --- core/variant_call.cpp | 8 ++++---- doc/classes/Transform.xml | 4 ++-- doc/classes/Transform2D.xml | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core/variant_call.cpp b/core/variant_call.cpp index 2ca435611bb..e9f7af3f633 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -1748,10 +1748,10 @@ void register_variant_methods() { ADDFUNC1R(TRANSFORM2D, TRANSFORM2D, Transform2D, rotated, REAL, "phi", varray()); ADDFUNC1R(TRANSFORM2D, TRANSFORM2D, Transform2D, scaled, VECTOR2, "scale", varray()); ADDFUNC1R(TRANSFORM2D, TRANSFORM2D, Transform2D, translated, VECTOR2, "offset", varray()); - ADDFUNC1R(TRANSFORM2D, NIL, Transform2D, xform, NIL, "v", varray()); - ADDFUNC1R(TRANSFORM2D, NIL, Transform2D, xform_inv, NIL, "v", varray()); - ADDFUNC1R(TRANSFORM2D, VECTOR2, Transform2D, basis_xform, VECTOR2, "v", varray()); - ADDFUNC1R(TRANSFORM2D, VECTOR2, Transform2D, basis_xform_inv, VECTOR2, "v", varray()); + ADDFUNC1R(TRANSFORM2D, TRANSFORM2D, Transform2D, xform, NIL, "v", varray()); + ADDFUNC1R(TRANSFORM2D, TRANSFORM2D, Transform2D, xform_inv, NIL, "v", varray()); + ADDFUNC1R(TRANSFORM2D, TRANSFORM2D, Transform2D, basis_xform, NIL, "v", varray()); + ADDFUNC1R(TRANSFORM2D, TRANSFORM2D, Transform2D, basis_xform_inv, NIL, "v", varray()); ADDFUNC2R(TRANSFORM2D, TRANSFORM2D, Transform2D, interpolate_with, TRANSFORM2D, "transform", REAL, "weight", varray()); ADDFUNC0R(BASIS, BASIS, Basis, inverse, varray()); diff --git a/doc/classes/Transform.xml b/doc/classes/Transform.xml index cf1c9ea032f..c893903b4fb 100644 --- a/doc/classes/Transform.xml +++ b/doc/classes/Transform.xml @@ -143,7 +143,7 @@ - Transforms the given [Vector3], [Plane], or [AABB] by this transform. + Transforms the given vector "v" by this transform. @@ -152,7 +152,7 @@ - Inverse-transforms the given [Vector3], [Plane], or [AABB] by this transform. + Inverse-transforms the given vector "v" by this transform. diff --git a/doc/classes/Transform2D.xml b/doc/classes/Transform2D.xml index e20f48ba141..2a7a8bd97d4 100644 --- a/doc/classes/Transform2D.xml +++ b/doc/classes/Transform2D.xml @@ -52,18 +52,18 @@ - + - + Transforms the given vector by this transform's basis (no translation). - + - + Inverse-transforms the given vector by this transform's basis (no translation). @@ -143,21 +143,21 @@ - + - Transforms the given [Vector2] or [Rect2] by this transform. + Transforms the given vector "v" by this transform. - + - Inverse-transforms the given [Vector2] or [Rect2] by this transform. + Inverse-transforms the given vector "v" by this transform.