瀏覽代碼

Merge remote-tracking branch 'paulmcpazzi/master' into dev

Mr.doob 13 年之前
父節點
當前提交
e7a71da071
共有 1 個文件被更改,包括 7 次插入2 次删除
  1. 7 2
      src/extras/loaders/SceneLoader.js

+ 7 - 2
src/extras/loaders/SceneLoader.js

@@ -414,12 +414,17 @@ THREE.SceneLoader.prototype.createScene = function ( json, callbackFinished, url
 			camera = new THREE.OrthographicCamera( c.left, c.right, c.top, c.bottom, c.near, c.far );
 
 		}
-
+		
 		p = c.position;
 		t = c.target;
+		u = c.up;
 		camera.position.set( p[0], p[1], p[2] );
 		camera.target = new THREE.Vector3( t[0], t[1], t[2] );
-
+		if ( u ) {
+			
+			camera.up.set( u[0], u[1], u[2] );
+		}
+		
 		result.cameras[ dc ] = camera;
 
 	}