Преглед на файлове

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

Mr.doob преди 14 години
родител
ревизия
67c7b15552
променени са 1 файла, в които са добавени 18 реда и са изтрити 7 реда
  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 {
 
-		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 );
+
+		}
 
 	}