Fix wrong return type of xform functions

(cherry picked from commit ebe2337)
godotengine · Jan 30, 2018 · 187c40d · 187c40d
1 parent e69b30b
commit 187c40d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git 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, 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());
+ 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());
  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
@@ -143,7 +143,7 @@
  <argument index="0" name="v" type="var">
  </argument>
  <description>
- Transforms the given vector "v" by this transform.
+ Transforms the given [Vector3], [Plane], or [AABB] by this transform.
  </description>
  </method>
  <method name="xform_inv">
@@ -152,7 +152,7 @@
  <argument index="0" name="v" type="var">
  </argument>
  <description>
- Inverse-transforms the given vector "v" by this transform.
+ Inverse-transforms the given [Vector3], [Plane], or [AABB] by this transform.
  </description>
  </method>
  </methods>

diff --git a/doc/classes/Transform2D.xml b/doc/classes/Transform2D.xml
@@ -52,18 +52,18 @@
  </description>
  </method>
  <method name="basis_xform">
- <return type="Transform2D">
+ <return type="Vector2">
  </return>
- <argument index="0" name="v" type="var">
+ <argument index="0" name="v" type="Vector2">
  </argument>
  <description>
  Transforms the given vector by this transform's basis (no translation).
  </description>
  </method>
  <method name="basis_xform_inv">
- <return type="Transform2D">
+ <return type="Vector2">
  </return>
- <argument index="0" name="v" type="var">
+ <argument index="0" name="v" type="Vector2">
  </argument>
  <description>
  Inverse-transforms the given vector by this transform's basis (no translation).
@@ -143,21 +143,21 @@
  </description>
  </method>
  <method name="xform">
- <return type="Transform2D">
+ <return type="var">
  </return>
  <argument index="0" name="v" type="var">
  </argument>
  <description>
- Transforms the given vector "v" by this transform.
+ Transforms the given [Vector2] or [Rect2] by this transform.
  </description>
  </method>
  <method name="xform_inv">
- <return type="Transform2D">
+ <return type="var">
  </return>
  <argument index="0" name="v" type="var">
  </argument>
  <description>
- Inverse-transforms the given vector "v" by this transform.
+ Inverse-transforms the given [Vector2] or [Rect2] by this transform.
  </description>
  </method>
  </methods>