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

Display the Y angle properly when rotating from gizmo, partially helps #1479

Browse Source 
(cherry picked from commit cd9539f85d)
This commit is contained in:
Juan Linietsky
2017-08-07 15:07:43 -03:00
committed by Rémi Verschelde
parent 57084ada96
commit 641135ba21
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/math/matrix3.cpp
View File

@@ -30,7 +30,7 @@
#include "matrix3.h"
#include "math_funcs.h"
#include "os/copymem.h"
#include "print_string.h"
#define cofac(row1, col1, row2, col2) \
(elements[row1][col1] * elements[row2][col2] - elements[row1][col2] * elements[row2][col1])
@@ -169,8 +169,16 @@ Vector3 Matrix3::get_euler() const {
euler.y = Math::asin(m[0][2]);
if (euler.y < Math_PI * 0.5) {
if (euler.y > -Math_PI * 0.5) {
euler.x = Math::atan2(-m[1][2], m[2][2]);
euler.z = Math::atan2(-m[0][1], m[0][0]);
//if rotation is Y-only, return a proper -pi,pi range like in x or z for the same case.
if (m[1][0] == 0.0 && m[0][1] == 0.0 && m[0][0] < 0.0) {
if (euler.y > 0.0)
euler.y = Math_PI - euler.y;
else
euler.y = -(Math_PI + euler.y);
} else {
euler.x = Math::atan2(-m[1][2], m[2][2]);
euler.z = Math::atan2(-m[0][1], m[0][0]);
}
} else {
real_t r = Math::atan2(m[1][0], m[1][1]);