From a5e0bb447c339365d99dba772ea733c997c21200 Mon Sep 17 00:00:00 2001 From: tagcup Date: Sat, 14 Apr 2018 15:53:25 -0400 Subject: Avoid converting Quat to Euler angles when not necessary. Also ensure that get_scale doesn't arbitrarlity change the signs of scales, ensuring that the combination of get_rotation and get_scale gives the correct basis. Added various missing functions and constructors. Should close #17968. --- core/math/transform.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/math/transform.cpp') diff --git a/core/math/transform.cpp b/core/math/transform.cpp index f727d00e3..7cd186ca6 100644 --- a/core/math/transform.cpp +++ b/core/math/transform.cpp @@ -119,11 +119,11 @@ Transform Transform::interpolate_with(const Transform &p_transform, real_t p_c) /* not sure if very "efficient" but good enough? */ - Vector3 src_scale = basis.get_signed_scale(); + Vector3 src_scale = basis.get_scale(); Quat src_rot = basis.orthonormalized(); Vector3 src_loc = origin; - Vector3 dst_scale = p_transform.basis.get_signed_scale(); + Vector3 dst_scale = p_transform.basis.get_scale(); Quat dst_rot = p_transform.basis; Vector3 dst_loc = p_transform.origin; -- cgit v1.2.3-70-g09d2