godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15083 from tagcup/spatial_rot_fix

Browse Source 
Restore the behavior of Spatial rotations recently changed in c1153f5.
This commit is contained in:
Juan Linietsky
2018-01-02 15:02:19 -03:00
committed by GitHub
parent 9821562b30 e9896b17a9
commit 14772d2213
6 changed files with 139 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/math/matrix3.cpp
View File

@@ -228,12 +228,24 @@ void Basis::scale(const Vector3 &p_scale) {
}
Basis Basis::scaled(const Vector3 &p_scale) const {
Basis m = *this;
m.scale(p_scale);
return m;
}
void Basis::scale_local(const Vector3 &p_scale) {
// performs a scaling in object-local coordinate system:
// M -> (M.S.Minv).M = M.S.
*this = scaled_local(p_scale);
}
Basis Basis::scaled_local(const Vector3 &p_scale) const {
Basis b;
b.set_scale(p_scale);
return (*this) * b;
}
void Basis::set_scale(const Vector3 &p_scale) {
set_axis(0, get_axis(0).normalized() * p_scale.x);
@@ -312,7 +324,8 @@ void Basis::rotate(const Vector3 &p_axis, real_t p_phi) {
}
void Basis::rotate_local(const Vector3 &p_axis, real_t p_phi) {
// performs a rotation in object-local coordinate system:
// M -> (M.R.Minv).M = M.R.
*this = rotated_local(p_axis, p_phi);
}
Basis Basis::rotated_local(const Vector3 &p_axis, real_t p_phi) const {