noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #18955 from tagcup/fix_set_scale

Browse Source 
Removed incorrect Basis::set_scale().
This commit is contained in:
Rémi Verschelde
2018-07-26 10:37:03 +02:00
committed by GitHub
parent eab105310b 1bba6eeeb9
commit 5c8919aac6
4 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/math/transform.cpp
View File

@@ -127,12 +127,11 @@ Transform Transform::interpolate_with(const Transform &p_transform, real_t p_c)
Quat dst_rot = p_transform.basis.get_rotation_quat();
Vector3 dst_loc = p_transform.origin;
Transform dst; //this could be made faster by using a single function in Basis..
dst.basis = src_rot.slerp(dst_rot, p_c).normalized();
dst.basis.set_scale(src_scale.linear_interpolate(dst_scale, p_c));
dst.origin = src_loc.linear_interpolate(dst_loc, p_c);
Transform interp;
interp.basis.set_quat_scale(src_rot.slerp(dst_rot, p_c).normalized(), src_scale.linear_interpolate(dst_scale, p_c));
interp.origin = src_loc.linear_interpolate(dst_loc, p_c);
return dst;
return interp;
}
void Transform::scale(const Vector3 &p_scale) {