Skip to content

Matrix4: Avoid NaN values in certain methods. #32440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Om-Mishra09 wants to merge 8 commits into
base: dev
Choose a base branch
from
+29 −4
Open

Matrix4: Avoid NaN values in certain methods. #32440

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
605b589
Fix: Handle zero scale in Matrix4.extractRotation
Om-Mishra09 Dec 1, 2025
2c2c43a
Fix: Apply zero-scale safety to decompose() for consistency
Om-Mishra09 Dec 1, 2025
d5d18b4
Refactor: Use identity basis fallback in extractRotation, revert deco…
Om-Mishra09 Dec 3, 2025
1843933
Feat: Apply identity fallback to extractBasis as requested
Om-Mishra09 Dec 6, 2025
0111597
Style: Fix ESLint padded-blocks errors
Om-Mishra09 Dec 6, 2025
7bf0c6f
Refactor: Use determinant check for zero-scale robustness
Om-Mishra09 Dec 6, 2025
b96ed88
Refactor: Add determinant guard to decompose() as requested
Om-Mishra09 Dec 6, 2025
2fa0485
Update Matrix4.js
Mugen87 Dec 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions src/math/Matrix4.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,16 @@ class Matrix4 {
*/
extractBasis( xAxis, yAxis, zAxis ) {

if ( this.determinant() === 0 ) {

xAxis.set( 1, 0, 0 );
yAxis.set( 0, 1, 0 );
zAxis.set( 0, 0, 1 );

return this;

}

xAxis.setFromMatrixColumn( this, 0 );
yAxis.setFromMatrixColumn( this, 1 );
zAxis.setFromMatrixColumn( this, 2 );
Expand Down Expand Up @@ -274,6 +284,12 @@ class Matrix4 {
*/
extractRotation( m ) {

if ( m.determinant() === 0 ) {

return this.identity();

}

const te = this.elements;
const me = m.elements;

Expand Down Expand Up @@ -1026,6 +1042,19 @@ class Matrix4 {

const te = this.elements;

position.x = te[ 12 ];
position.y = te[ 13 ];
position.z = te[ 14 ];

if ( this.determinant() === 0 ) {

scale.set( 1, 1, 1 );
quaternion.identity();

return this;

}

let sx = _v1.set( te[ 0 ], te[ 1 ], te[ 2 ] ).length();
const sy = _v1.set( te[ 4 ], te[ 5 ], te[ 6 ] ).length();
const sz = _v1.set( te[ 8 ], te[ 9 ], te[ 10 ] ).length();
Expand All @@ -1034,10 +1063,6 @@ class Matrix4 {
const det = this.determinant();
if ( det < 0 ) sx = - sx;

position.x = te[ 12 ];
position.y = te[ 13 ];
position.z = te[ 14 ];

// scale the rotation part
_m1.copy( this );

Expand Down