Skip to content

Commit

Permalink
Merge pull request #1796 from xeokit/XEOK-205-math.mat4ToEuler-to-deg…
Browse files Browse the repository at this point in the history
…rees

XEOK-205 Fix math.mat4ToEuler to return angles in degrees, not radians
  • Loading branch information
xeolabs authored Feb 3, 2025
2 parents 1b0ee43 + cd47898 commit 249703e
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/viewer/scene/math/math.js
Original file line number Diff line number Diff line change
Expand Up @@ -1965,7 +1965,7 @@ const math = {
* @param {Number[]} mat The 4x4 matrix.
* @param {String} order Desired Euler angle order: "XYZ", "YXZ", "ZXY" etc.
* @param {Number[]} [dest] Destination Euler angles, created by default.
* @returns {Number[]} The Euler angles.
* @returns {Number[]} The Euler angles (in degrees).
*/
mat4ToEuler(mat, order, dest = math.vec4()) {
const clamp = math.clamp;
Expand Down Expand Up @@ -2057,6 +2057,10 @@ const math = {
}
}

dest[0] *= math.RADTODEG;
dest[1] *= math.RADTODEG;
dest[2] *= math.RADTODEG;

return dest;
},

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

0 comments on commit 249703e

Please sign in to comment.