Merge remote branch 'alteredq/master' into experimental

src/cameras/Camera.js

@@ -42,13 +42,6 @@ THREE.Camera.prototype.updateProjectionMatrix = function () {
 
 };
 
-THREE.Camera.prototype.updateMatrix = function () {
-
-	// this.parent === undefined && this.update( undefined, true );
-	this.update( undefined, true );
-
-};
-
 THREE.Camera.prototype.update = function ( parentMatrixWorld, forceUpdate, camera ) {
 
 	if ( this.useTarget ) {
@@ -77,15 +70,7 @@ THREE.Camera.prototype.update = function ( parentMatrixWorld, forceUpdate, camer
 
 	} else {
 
-		/*
-		if ( this.matrixAutoUpdate ) {
-
-			// this doesn't make sense, it is endless loop
-			// also updateMatrix() doesn't return anything
-			//forceUpdate |= this.updateMatrix();
-
-		}
-		*/
+		this.matrixAutoUpdate && this.updateMatrix();
 
 		if ( forceUpdate || this.matrixWorldNeedsUpdate ) {
 

src/core/Quaternion.js

@@ -1,5 +1,6 @@
 /*
  * @author mikael emtinger / http://gomo.se/
+ * @author alteredq / http://alteredqualia.com/
  */
 
 THREE.Quaternion = function( x, y, z, w ) {
@@ -28,6 +29,17 @@ THREE.Quaternion.prototype = {
 
 	},
 
+	copy : function ( q ) {
+
+		this.x = q.x;
+		this.y = q.y;
+		this.z = q.z;
+		this.w = q.w;
+
+		return this;
+
+	},
+
 	setFromEuler : function ( vec3 ) {
 
 		var c = 0.5 * Math.PI / 360, // 0.5 is an optimization
@@ -41,6 +53,7 @@ THREE.Quaternion.prototype = {
 		s2 = Math.sin( -z ),
 		c3 = Math.cos( x  ),
 		s3 = Math.sin( x  ),
+
 		c1c2 = c1 * c2,
 		s1s2 = s1 * s2;
 
@@ -53,6 +66,23 @@ THREE.Quaternion.prototype = {
 
 	},
 
+	setFromAxisAngle: function ( axis, angle ) {
+
+		// from http://www.euclideanspace.com/maths/geometry/rotations/conversions/angleToQuaternion/index.htm
+		// axis have to be normalized
+
+		var halfAngle = angle / 2,
+			s = Math.sin( halfAngle );
+
+		this.x = axis.x * s;
+		this.y = axis.y * s;
+		this.z = axis.z * s;
+		this.w = Math.cos( halfAngle );
+
+		return this;
+
+	},
+	
 	calculateW  : function () {
 
 		this.w = - Math.sqrt( Math.abs( 1.0 - this.x * this.x - this.y * this.y - this.z * this.z ) );
@@ -117,6 +147,17 @@ THREE.Quaternion.prototype = {
 
 	},
 
+	multiply: function ( q1, q2 ) {
+
+		// from http://www.euclideanspace.com/maths/algebra/realNormedAlgebra/quaternions/code/index.htm
+
+		this.x =  q1.x * q2.w + q1.y * q2.z - q1.z * q2.y + q1.w * q2.x;
+		this.y = -q1.x * q2.z + q1.y * q2.w + q1.z * q2.x + q1.w * q2.y;
+		this.z =  q1.x * q2.y - q1.y * q2.x + q1.z * q2.w + q1.w * q2.z;
+		this.w = -q1.x * q2.x - q1.y * q2.y - q1.z * q2.z + q1.w * q2.w;
+
+	},
+
 	multiplyVector3 : function ( vec, dest ) {
 
 		if( !dest ) { dest = vec; }

src/renderers/Projector.js

@@ -98,8 +98,8 @@ THREE.Projector = function() {
 		_face4Count = 0;
 		_lineCount = 0;
 		_particleCount = 0;
-
-		camera.matrixAutoUpdate && camera.updateMatrix();
+	
+		camera.matrixAutoUpdate && camera.update( undefined, true );
 
 		scene.update( undefined, false, camera );
 

src/renderers/WebGLRenderer.js

@@ -2924,7 +2924,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 			lights = scene.lights,
 			fog = scene.fog;
 
-		camera.matrixAutoUpdate && camera.updateMatrix();
+		camera.matrixAutoUpdate && camera.update( undefined, true );
 
 		scene.update( undefined, false, camera );