Browse Source

Reverting Camera.update as how it was before (as it turned out that wasn't the problem). This needs more testing.

Mr.doob 14 years ago
parent
commit
67c7b15552
1 changed files with 18 additions and 7 deletions
  1. 18 7
      src/cameras/Camera.js

+ 18 - 7
src/cameras/Camera.js

@@ -77,19 +77,30 @@ THREE.Camera.prototype.update = function ( parentMatrixWorld, forceUpdate, camer
 
 
 	} else {
 	} else {
 
 
-		if ( parentMatrixWorld ) {
+		if ( this.matrixAutoUpdate ) {
 
 
-			this.matrixWorld.multiply( parentMatrixWorld, this.matrix );
+			forceUpdate |= this.updateMatrix();
 
 
-		} else {
+		}
 
 
-			this.matrixWorld.copy( this.matrix );
+		if ( forceUpdate || this.matrixWorldNeedsUpdate ) {
 
 
-		}
+			if ( parentMatrixWorld ) {
 
 
-		THREE.Matrix4.makeInvert( this.matrixWorld, this.matrixWorldInverse );
+				this.matrixWorld.multiply( parentMatrixWorld, this.matrix );
 
 
-		forceUpdate = true;
+			} else {
+
+				this.matrixWorld.copy( this.matrix );
+
+			}
+
+			this.matrixWorldNeedsUpdate = false;
+			forceUpdate = true;
+
+			THREE.Matrix4.makeInvert( this.matrixWorld, this.matrixWorldInverse );
+
+		}
 
 
 	}
 	}