godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

Merge pull request #13151 from akien-mga/basis-vector3-constructor

Browse Source 
Properly implement Basis constructor using Vector3 of Euler angles
This commit is contained in:
Rémi Verschelde
2017-11-22 01:20:14 +01:00
committed by GitHub
parent f8fd9a4a62 a3f8dde502
commit 3b7e9df255
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/variant_call.cpp
View File

@@ -899,11 +899,6 @@ struct _VariantCall {
r_ret = Basis(p_args[0]->operator Vector3(), p_args[1]->operator real_t());
}
static void Basis_init3(Variant &r_ret, const Variant **p_args) {
r_ret = Basis(p_args[0]->operator Vector3());
}
static void Transform_init1(Variant &r_ret, const Variant **p_args) {
Transform t;
@@ -1799,7 +1794,6 @@ void register_variant_methods() {
_VariantCall::add_constructor(_VariantCall::Basis_init1, Variant::BASIS, "x_axis", Variant::VECTOR3, "y_axis", Variant::VECTOR3, "z_axis", Variant::VECTOR3);
_VariantCall::add_constructor(_VariantCall::Basis_init2, Variant::BASIS, "axis", Variant::VECTOR3, "phi", Variant::REAL);
_VariantCall::add_constructor(_VariantCall::Basis_init3, Variant::BASIS, "euler", Variant::VECTOR3);
_VariantCall::add_constructor(_VariantCall::Transform_init1, Variant::TRANSFORM, "x_axis", Variant::VECTOR3, "y_axis", Variant::VECTOR3, "z_axis", Variant::VECTOR3, "origin", Variant::VECTOR3);
_VariantCall::add_constructor(_VariantCall::Transform_init2, Variant::TRANSFORM, "basis", Variant::BASIS, "origin", Variant::VECTOR3);