Skip to content

Commit 249703e

Browse files
authored
Merge pull request #1796 from xeokit/XEOK-205-math.mat4ToEuler-to-degrees
XEOK-205 Fix math.mat4ToEuler to return angles in degrees, not radians
2 parents 1b0ee43 + cd47898 commit 249703e

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/viewer/scene/math/math.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -1965,7 +1965,7 @@ const math = {
19651965
* @param {Number[]} mat The 4x4 matrix.
19661966
* @param {String} order Desired Euler angle order: "XYZ", "YXZ", "ZXY" etc.
19671967
* @param {Number[]} [dest] Destination Euler angles, created by default.
1968-
* @returns {Number[]} The Euler angles.
1968+
* @returns {Number[]} The Euler angles (in degrees).
19691969
*/
19701970
mat4ToEuler(mat, order, dest = math.vec4()) {
19711971
const clamp = math.clamp;
@@ -2057,6 +2057,10 @@ const math = {
20572057
}
20582058
}
20592059

2060+
dest[0] *= math.RADTODEG;
2061+
dest[1] *= math.RADTODEG;
2062+
dest[2] *= math.RADTODEG;
2063+
20602064
return dest;
20612065
},
20622066

@@ -2866,7 +2870,7 @@ const math = {
28662870
/**
28672871
* Initializes a quaternion from Euler angles.
28682872
*
2869-
* @param {Number[]} euler The Euler angles.
2873+
* @param {Number[]} euler The Euler angles (in degrees).
28702874
* @param {String} order Euler angle order: "XYZ", "YXZ", "ZXY" etc.
28712875
* @param {Number[]} [dest] Destination quaternion, created by default.
28722876
* @returns {Number[]} The quaternion.

0 commit comments

Comments
 (0)