diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-20 15:24:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-20 15:24:57 +0200 |
| commit | 177583e282bb04945e118ee9424204ed11d4222d (patch) | |
| tree | 8e6cda17455ae474d18624d39bbb6a9486d6d9f3 | |
| parent | dca8df47b48cd04b3f1c2ea99ca7ddc15e84ee37 (diff) | |
| parent | 6d56c73de7b8b24ac3faf8ab50bafb48cbfdb51f (diff) | |
Merge pull request #10466 from n-pigeon/expose_transform
Exposed Transform.interpolate_with()
| -rw-r--r-- | core/variant_call.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/variant_call.cpp b/core/variant_call.cpp index aabc2546bc..59d31d2586 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -747,6 +747,7 @@ struct _VariantCall { VCALL_PTR1R(Transform, translated); VCALL_PTR0R(Transform, orthonormalized); VCALL_PTR2R(Transform, looking_at); + VCALL_PTR2R(Transform, interpolate_with); static void _call_Transform_xform(Variant &r_ret, Variant &p_self, const Variant **p_args) { @@ -1691,7 +1692,7 @@ void register_variant_methods() { ADDFUNC1(TRANSFORM2D, TRANSFORM2D, Transform2D, xform_inv, NIL, "v", varray()); ADDFUNC1(TRANSFORM2D, TRANSFORM2D, Transform2D, basis_xform, NIL, "v", varray()); ADDFUNC1(TRANSFORM2D, TRANSFORM2D, Transform2D, basis_xform_inv, NIL, "v", varray()); - ADDFUNC2(TRANSFORM2D, TRANSFORM2D, Transform2D, interpolate_with, TRANSFORM2D, "m", REAL, "c", varray()); + ADDFUNC2(TRANSFORM2D, TRANSFORM2D, Transform2D, interpolate_with, TRANSFORM2D, "transform", REAL, "weight", varray()); ADDFUNC0(BASIS, BASIS, Basis, inverse, varray()); ADDFUNC0(BASIS, BASIS, Basis, transposed, varray()); @@ -1718,6 +1719,7 @@ void register_variant_methods() { ADDFUNC1(TRANSFORM, TRANSFORM, Transform, scaled, VECTOR3, "scale", varray()); ADDFUNC1(TRANSFORM, TRANSFORM, Transform, translated, VECTOR3, "ofs", varray()); ADDFUNC2(TRANSFORM, TRANSFORM, Transform, looking_at, VECTOR3, "target", VECTOR3, "up", varray()); + ADDFUNC2(TRANSFORM, TRANSFORM, Transform, interpolate_with, TRANSFORM, "transform", REAL, "weight", varray()); ADDFUNC1(TRANSFORM, NIL, Transform, xform, NIL, "v", varray()); ADDFUNC1(TRANSFORM, NIL, Transform, xform_inv, NIL, "v", varray()); |