Bladeren bron

Euler: Updated static class properties to ALL_CAPS (#25104)

* Updated static class properties to ALL_CAPS

* new nomemclature

* Clean up

* Updated static class properties to ALL_CAPS
WestLangley 2 jaren geleden
bovenliggende
commit
4d6d52aca6
3 gewijzigde bestanden met toevoegingen van 9 en 16 verwijderingen
  1. 3 3
      examples/jsm/loaders/FBXLoader.js
  2. 2 3
      src/math/Euler.js
  3. 4 10
      test/unit/src/math/Euler.tests.js

+ 3 - 3
examples/jsm/loaders/FBXLoader.js

@@ -3968,7 +3968,7 @@ function generateTransform( transformData ) {
 	if ( transformData.preRotation ) {
 
 		const array = transformData.preRotation.map( MathUtils.degToRad );
-		array.push( transformData.eulerOrder || Euler.DefaultOrder );
+		array.push( transformData.eulerOrder || Euler.DEFAULT_ORDER );
 		lPreRotationM.makeRotationFromEuler( tempEuler.fromArray( array ) );
 
 	}
@@ -3976,7 +3976,7 @@ function generateTransform( transformData ) {
 	if ( transformData.rotation ) {
 
 		const array = transformData.rotation.map( MathUtils.degToRad );
-		array.push( transformData.eulerOrder || Euler.DefaultOrder );
+		array.push( transformData.eulerOrder || Euler.DEFAULT_ORDER );
 		lRotationM.makeRotationFromEuler( tempEuler.fromArray( array ) );
 
 	}
@@ -3984,7 +3984,7 @@ function generateTransform( transformData ) {
 	if ( transformData.postRotation ) {
 
 		const array = transformData.postRotation.map( MathUtils.degToRad );
-		array.push( transformData.eulerOrder || Euler.DefaultOrder );
+		array.push( transformData.eulerOrder || Euler.DEFAULT_ORDER );
 		lPostRotationM.makeRotationFromEuler( tempEuler.fromArray( array ) );
 		lPostRotationM.invert();
 

+ 2 - 3
src/math/Euler.js

@@ -7,7 +7,7 @@ const _quaternion = /*@__PURE__*/ new Quaternion();
 
 class Euler {
 
-	constructor( x = 0, y = 0, z = 0, order = Euler.DefaultOrder ) {
+	constructor( x = 0, y = 0, z = 0, order = Euler.DEFAULT_ORDER ) {
 
 		this.isEuler = true;
 
@@ -318,7 +318,6 @@ class Euler {
 
 }
 
-Euler.DefaultOrder = 'XYZ';
-Euler.RotationOrders = [ 'XYZ', 'YZX', 'ZXY', 'XZY', 'YXZ', 'ZYX' ];
+Euler.DEFAULT_ORDER = 'XYZ';
 
 export { Euler };

+ 4 - 10
test/unit/src/math/Euler.tests.js

@@ -58,16 +58,10 @@ export default QUnit.module( 'Maths', () => {
 		} );
 
 		// STATIC STUFF
-		QUnit.test( 'RotationOrders', ( assert ) => {
 
-			assert.ok( Array.isArray( Euler.RotationOrders ), 'Passed!' );
-			assert.deepEqual( Euler.RotationOrders, [ 'XYZ', 'YZX', 'ZXY', 'XZY', 'YXZ', 'ZYX' ], 'Passed!' );
+		QUnit.test( 'DEFAULT_ORDER', ( assert ) => {
 
-		} );
-
-		QUnit.test( 'DefaultOrder', ( assert ) => {
-
-			assert.equal( Euler.DefaultOrder, 'XYZ', 'Passed!' );
+			assert.equal( Euler.DEFAULT_ORDER, 'XYZ', 'Passed!' );
 
 
 		} );
@@ -163,10 +157,10 @@ export default QUnit.module( 'Maths', () => {
 
 
 			var a = new Euler();
-			assert.ok( a.order === Euler.DefaultOrder, 'Passed!' );
+			assert.ok( a.order === Euler.DEFAULT_ORDER, 'Passed!' );
 
 			a = new Euler( 1, 2, 3 );
-			assert.ok( a.order === Euler.DefaultOrder, 'Passed!' );
+			assert.ok( a.order === Euler.DEFAULT_ORDER, 'Passed!' );
 
 			a = new Euler( 4, 5, 6, 'YZX' );
 			assert.ok( a.order === 'YZX', 'Passed!' );