浏览代码

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 );
+
+		}
 
 	}