complete Euler class, update examples, update Object3D, update unit t…

…ests.

examples/css3d_molecules.html

@@ -433,7 +433,7 @@
 
 						var objMatrix = new THREE.Matrix4().makeRotationAxis( axis.normalize(), radians );
 						object.matrix = objMatrix;
-						object.rotation.setEulerFromRotationMatrix( object.matrix, object.eulerOrder );
+						object.rotation.setFromRotationMatrix( object.matrix, object.rotation.order );
 
 						object.matrixAutoUpdate = false;
 						object.updateMatrix();
@@ -453,7 +453,7 @@
 						joint.position.lerp( end, 0.5 );
 
 						joint.matrix.copy( objMatrix );
-						joint.rotation.setEulerFromRotationMatrix( joint.matrix, joint.eulerOrder );
+						joint.rotation.setFromRotationMatrix( joint.matrix, joint.rotation.order );
 
 						joint.matrixAutoUpdate = false;
 						joint.updateMatrix();

examples/js/controls/FlyControls.js

@@ -199,7 +199,7 @@ THREE.FlyControls = function ( object, domElement ) {
 		this.object.quaternion.multiply( this.tmpQuaternion );
 
 		// expose the rotation vector for convenience
-		this.object.rotation.setEulerFromQuaternion( this.object.quaternion, this.object.eulerOrder );
+		this.object.rotation.setFromQuaternion( this.object.quaternion, this.object.rotation.order );
 
 
 	};

examples/js/controls/TransformControls.js

@@ -379,11 +379,11 @@ THREE.TransformControls = function ( camera, domElement, doc ) {
 
 		this.object.updateMatrixWorld();
 		worldPosition.getPositionFromMatrix( this.object.matrixWorld );
-		worldRotation.setEulerFromRotationMatrix( tempMatrix.extractRotation(this.object.matrixWorld ));
+		worldRotation.setFromRotationMatrix( tempMatrix.extractRotation(this.object.matrixWorld ));
 
 		this.camera.updateMatrixWorld();
 		camPosition.getPositionFromMatrix( this.camera.matrixWorld );
-		camRotation.setEulerFromRotationMatrix( tempMatrix.extractRotation( this.camera.matrixWorld ));
+		camRotation.setFromRotationMatrix( tempMatrix.extractRotation( this.camera.matrixWorld ));
 
 		scale = worldPosition.distanceTo( camPosition ) / 6 * this.scale;
 		this.gizmo.position.copy( worldPosition )
@@ -399,7 +399,7 @@ THREE.TransformControls = function ( camera, domElement, doc ) {
 				if ( name.search('E') != -1 ){
 
 					lookAtMatrix.lookAt( camPosition, worldPosition, tempVector.set( 0, 1, 0 ));
-					object.rotation.setEulerFromRotationMatrix( lookAtMatrix );
+					object.rotation.setFromRotationMatrix( lookAtMatrix );
 
 				} else {
 
@@ -431,7 +431,7 @@ THREE.TransformControls = function ( camera, domElement, doc ) {
 
 						}
 
-						object.rotation.setEulerFromQuaternion( tempQuaternion );
+						object.rotation.setFromQuaternion( tempQuaternion );
 
 					} else if ( this.space == 'world' ) {
 
@@ -789,7 +789,7 @@ THREE.TransformControls = function ( camera, domElement, doc ) {
 						tempQuaternion.multiplyQuaternions( tempQuaternion, quaternionE );
 						tempQuaternion.multiplyQuaternions( tempQuaternion, quaternionXYZ );
 
-						scope.object.rotation.setEulerFromQuaternion( tempQuaternion );
+						scope.object.rotation.setFromQuaternion( tempQuaternion );
 
 					} else if ( scope.active == "RXYZE" ) {
 
@@ -802,7 +802,7 @@ THREE.TransformControls = function ( camera, domElement, doc ) {
 						tempQuaternion.multiplyQuaternions( tempQuaternion, quaternionX );
 						tempQuaternion.multiplyQuaternions( tempQuaternion, quaternionXYZ );
 
-						scope.object.rotation.setEulerFromQuaternion( tempQuaternion );
+						scope.object.rotation.setFromQuaternion( tempQuaternion );
 
 					} else if ( scope.space == 'local' ) {
 
@@ -822,7 +822,7 @@ THREE.TransformControls = function ( camera, domElement, doc ) {
 						if ( scope.active == "RY" ) quaternionXYZ.multiplyQuaternions( quaternionXYZ, quaternionY );
 						if ( scope.active == "RZ" ) quaternionXYZ.multiplyQuaternions( quaternionXYZ, quaternionZ );
 
-						scope.object.rotation.setEulerFromQuaternion( quaternionXYZ );
+						scope.object.rotation.setFromQuaternion( quaternionXYZ );
 
 					} else if ( scope.space == 'world' ) {
 
@@ -842,7 +842,7 @@ THREE.TransformControls = function ( camera, domElement, doc ) {
 
 						tempQuaternion.multiplyQuaternions( tempQuaternion, quaternionXYZ );
 
-						scope.object.rotation.setEulerFromQuaternion( tempQuaternion );
+						scope.object.rotation.setFromQuaternion( tempQuaternion );
 
 					}
 

examples/webgl_geometry_extrude_splines.html

@@ -380,7 +380,7 @@
 			if (!lookAhead)
 			lookAt.copy( pos ).add( dir );
 			splineCamera.matrix.lookAt(splineCamera.position, lookAt, normal);
-			splineCamera.rotation.setEulerFromRotationMatrix( splineCamera.matrix, splineCamera.eulerOrder );
+			splineCamera.rotation.setFromRotationMatrix( splineCamera.matrix, splineCamera.rotation.order );
 
 			cameraHelper.update();
 

examples/webgl_multiple_windows.html

@@ -192,7 +192,7 @@
 					dst.up.copy( src.up );
 					dst.position.copy( src.position );
 					dst.scale.copy( src.scale );
-					dst.eulerOrder = src.eulerOrder;
+					dst.rotation.copy( src.rotation );
 					dst.quaternion.copy( src.quaternion );
 
 				};

src/cameras/Camera.js

@@ -33,7 +33,7 @@ THREE.Camera.prototype.lookAt = function () {
 
 		} else {
 
-			this.rotation.setEulerFromRotationMatrix( m1, this.eulerOrder );
+			this.rotation.setFromRotationMatrix( m1, this.rotation.Order );
 
 		}
 

src/core/Object3D.js

@@ -17,8 +17,7 @@ THREE.Object3D = function () {
 	this.up = new THREE.Vector3( 0, 1, 0 );
 
 	this.position = new THREE.Vector3();
-	this.rotation = new THREE.Vector3();
-	this.eulerOrder = THREE.Object3D.defaultEulerOrder;
+	this.rotation = new THREE.Euler();
 	this.scale = new THREE.Vector3( 1, 1, 1 );
 
 	this.renderDepth = null;
@@ -75,7 +74,7 @@ THREE.Object3D.prototype = {
 
 			} else {
 
-				this.rotation.setEulerFromRotationMatrix( m1, this.eulerOrder );
+				this.rotation.setFromRotationMatrix( m1, this.rotation.order );
 
 			}
 
@@ -101,10 +100,10 @@ THREE.Object3D.prototype = {
 
 			} else {
 
-				q2.setFromEuler( this.rotation, this.eulerOrder );
+				q2.setFromEuler( this.rotation );
 				q2.multiply( q1 );
 
-				this.rotation.setEulerFromQuaternion( q2, this.eulerOrder );
+				this.rotation.setFromQuaternion( q2, this.rotation.order );
 
 			}
 
@@ -131,7 +130,7 @@ THREE.Object3D.prototype = {
 
 			} else {
 
-				v1.applyEuler( this.rotation, this.eulerOrder );
+				v1.applyEuler( this.rotation );
 
 			}
 
@@ -220,7 +219,7 @@ THREE.Object3D.prototype = {
 
 			} else {
 
-				this.rotation.setEulerFromRotationMatrix( m1, this.eulerOrder );
+				this.rotation.setFromRotationMatrix( m1, this.rotation.order );
 
 			}
 
@@ -398,7 +397,7 @@ THREE.Object3D.prototype = {
 
 		if ( this.useQuaternion === false )  {
 
-			this.matrix.makeFromPositionEulerScale( this.position, this.rotation, this.eulerOrder, this.scale );
+			this.matrix.makeFromPositionEulerScale( this.position, this.rotation, this.scale );
 
 		} else {
 
@@ -451,8 +450,7 @@ THREE.Object3D.prototype = {
 		object.up.copy( this.up );
 
 		object.position.copy( this.position );
-		if ( object.rotation instanceof THREE.Vector3 ) object.rotation.copy( this.rotation ); // because of Sprite madness
-		object.eulerOrder = this.eulerOrder;
+		if ( object.rotation instanceof THREE.Euler ) object.rotation.copy( this.rotation ); // because of Sprite madness
 		object.scale.copy( this.scale );
 
 		object.renderDepth = this.renderDepth;

src/math/Euler3.js → src/math/Euler.js

@@ -1,21 +1,25 @@
 /**
+ * @author mrdoob / http://mrdoob.com/
+ * @author WestLangley / http://github.com/WestLangley
  * @author bhouston / http://exocortex.com
  */
 
-THREE.Euler3 = function ( x, y, z, order ) {
+THREE.Euler = function ( x, y, z, order ) {
 
 	this.x = x || 0;
 	this.y = y || 0;
 	this.z = z || 0;
-	this.order = order || "XYZ";
+	this.order = order || THREE.Euler.DefaultOrder;
 
 };
 
-THREE.Euler3.RotationOrders = [ 'XYZ', 'YZX', 'ZXY', 'XZY', 'YXZ', 'ZYX' ];
+THREE.Euler.RotationOrders = [ 'XYZ', 'YZX', 'ZXY', 'XZY', 'YXZ', 'ZYX' ];
 
-THREE.Euler3.prototype = {
+THREE.Euler.DefaultOrder = 'XYZ';
 
-	constructor: THREE.Euler3,
+THREE.Euler.prototype = {
+
+	constructor: THREE.Euler,
 
 	set: function ( x, y, z, order ) {
 
@@ -226,30 +230,50 @@ THREE.Euler3.prototype = {
 	clamp: function() {
 
 		// todo
+		console.error( "ERROR: Euler.clamp() is not yet implemented.");
 
 	},
 
 	reorder: function( newOrder ) {
 
 		// todo.
+		console.error( "ERROR: Euler.reorder() is not yet implemented.");
 
 	},
 
 	alternativeSolution: function() {
 
 		// todo.
+		console.error( "ERROR: Euler.alternativeSolution() is not yet implemented.");
+
+	},
+
+	fromArray: function ( array ) {
+
+		this.x = array[ 0 ];
+		this.y = array[ 1 ];
+		this.z = array[ 2 ];
+		this.order = array[ 3 ];
+
+		return this;
+
+	},
+
+	toArray: function () {
+
+		return [ this.x, this.y, this.z, this.order ];
 
 	},
 
-	equals: function ( e ) {
+	equals: function ( rotation ) {
 
-		return ( ( e.x === this.x ) && ( e.y === this.y ) && ( e.z === this.z ) && ( e.order === this.order ) );
+		return ( ( rotation.x === this.x ) && ( rotation.y === this.y ) && ( rotation.z === this.z ) && ( rotation.order === this.order ) );
 
 	},
 
 	clone: function () {
 
-		return new THREE.Euler3( this.x, this.y, this.z, this.order );
+		return new THREE.Euler( this.x, this.y, this.z, this.order );
 
 	}
 

src/math/Matrix4.js

@@ -126,24 +126,20 @@ THREE.Matrix4.prototype = {
 
 	}(),
 
-	setRotationFromEuler: function ( v, order ) {
+	makeRotationFromEuler: function ( rotation ) {
 
-		console.warn( 'DEPRECATED: Matrix4\'s .setRotationFromEuler() has been deprecated in favor of makeRotationFromEuler.  Please update your code.' );
-
-		return this.makeRotationFromEuler( v, order );
-
-	},
-
-	makeRotationFromEuler: function ( v, order ) {
+		if( typeof rotation['order'] === undefined ) {
+			console.error( 'ERROR: Matrix\'s .makeRotationFromEuler() now expects a Euler rotation rather than a Vector3 and order.  Please update your code.' );
+		}
 
 		var te = this.elements;
 
-		var x = v.x, y = v.y, z = v.z;
+		var x = rotation.x, y = rotation.y, z = rotation.z;
 		var a = Math.cos( x ), b = Math.sin( x );
 		var c = Math.cos( y ), d = Math.sin( y );
 		var e = Math.cos( z ), f = Math.sin( z );
 
-		if ( order === undefined || order === 'XYZ' ) {
+		if ( rotation.order === undefined || rotation.order === 'XYZ' ) {
 
 			var ae = a * e, af = a * f, be = b * e, bf = b * f;
 
@@ -159,7 +155,7 @@ THREE.Matrix4.prototype = {
 			te[6] = be + af * d;
 			te[10] = a * c;
 
-		} else if ( order === 'YXZ' ) {
+		} else if ( rotation.order === 'YXZ' ) {
 
 			var ce = c * e, cf = c * f, de = d * e, df = d * f;
 
@@ -175,7 +171,7 @@ THREE.Matrix4.prototype = {
 			te[6] = df + ce * b;
 			te[10] = a * c;
 
-		} else if ( order === 'ZXY' ) {
+		} else if ( rotation.order === 'ZXY' ) {
 
 			var ce = c * e, cf = c * f, de = d * e, df = d * f;
 
@@ -191,7 +187,7 @@ THREE.Matrix4.prototype = {
 			te[6] = b;
 			te[10] = a * c;
 
-		} else if ( order === 'ZYX' ) {
+		} else if ( rotation.order === 'ZYX' ) {
 
 			var ae = a * e, af = a * f, be = b * e, bf = b * f;
 
@@ -207,7 +203,7 @@ THREE.Matrix4.prototype = {
 			te[6] = b * c;
 			te[10] = a * c;
 
-		} else if ( order === 'YZX' ) {
+		} else if ( rotation.order === 'YZX' ) {
 
 			var ac = a * c, ad = a * d, bc = b * c, bd = b * d;
 
@@ -223,7 +219,7 @@ THREE.Matrix4.prototype = {
 			te[6] = ad * f + bc;
 			te[10] = ac - bd * f;
 
-		} else if ( order === 'XZY' ) {
+		} else if ( rotation.order === 'XZY' ) {
 
 			var ac = a * c, ad = a * d, bc = b * c, bd = b * d;
 
@@ -843,9 +839,13 @@ THREE.Matrix4.prototype = {
 
 	},
 
-	makeFromPositionEulerScale: function ( position, rotation, eulerOrder, scale ) {
+	makeFromPositionEulerScale: function ( position, rotation, scale ) {
+
+		if( typeof rotation['order'] === undefined ) {
+			console.error( 'ERROR: Matrix4\'s .makeFromPositionEulerScale() now expects a Euler rotation rather than a Vector3 and order.  Please update your code.' );
+		}
 
-		this.makeRotationFromEuler( rotation, eulerOrder );
+		this.makeRotationFromEuler( rotation );
 		this.scale( scale );
 		this.setPosition( position );