godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed 'scale' to 'scale_basis' in 'interpolate_with'.

Browse Source
This commit is contained in:
James McLean 2015-06-11 13:44:04 -04:00
parent 237d6afa16
commit c2181285eb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/math/math_2d.cpp
View File

@ -655,7 +655,7 @@ Matrix32 Matrix32::interpolate_with(const Matrix32& p_transform, float p_c) cons
//construct matrix //construct matrix
Matrix32 res(Math::atan2(v.y, v.x), Vector2::linear_interpolate(p1, p2, p_c)); Matrix32 res(Math::atan2(v.y, v.x), Vector2::linear_interpolate(p1, p2, p_c));
res.scale(Vector2::linear_interpolate(s1, s2, p_c)); res.scale_basis(Vector2::linear_interpolate(s1, s2, p_c));
return res; return res;
} }