Browse Source

App: Fixed VREffect handling.

Mr.doob 10 years ago
parent
commit
ab58c646e5
1 changed files with 13 additions and 6 deletions
  1. 13 6
      editor/js/libs/app.js

+ 13 - 6
editor/js/libs/app.js

@@ -11,7 +11,7 @@ var APP = {
 		var loader = new THREE.ObjectLoader();
 		var loader = new THREE.ObjectLoader();
 		var camera, scene, renderer;
 		var camera, scene, renderer;
 
 
-		var vr, controls;
+		var vr, controls, effect;
 
 
 		var events = {};
 		var events = {};
 
 
@@ -89,7 +89,7 @@ var APP = {
 				if ( camera.parent === undefined ) {
 				if ( camera.parent === undefined ) {
 
 
 					// camera needs to be in the scene so camera2 matrix updates
 					// camera needs to be in the scene so camera2 matrix updates
-					
+
 					scene.add( camera );
 					scene.add( camera );
 
 
 				}
 				}
@@ -100,7 +100,7 @@ var APP = {
 				camera = camera2;
 				camera = camera2;
 
 
 				controls = new THREE.VRControls( camera );
 				controls = new THREE.VRControls( camera );
-				renderer = new THREE.VREffect( renderer );
+				effect = new THREE.VREffect( renderer );
 
 
 				document.addEventListener( 'keyup', function ( event ) {
 				document.addEventListener( 'keyup', function ( event ) {
 
 
@@ -114,7 +114,7 @@ var APP = {
 
 
 				this.dom.addEventListener( 'dblclick', function () {
 				this.dom.addEventListener( 'dblclick', function () {
 
 
-					renderer.setFullScreen( true );
+					effect.setFullScreen( true );
 
 
 				} );
 				} );
 
 
@@ -160,9 +160,16 @@ var APP = {
 
 
 			dispatch( events.update, { time: time, delta: time - prevTime } );
 			dispatch( events.update, { time: time, delta: time - prevTime } );
 
 
-			if ( vr ) controls.update();
+			if ( vr === true ) {
+
+				controls.update();
+				effect.render( scene, camera );
 
 
-			renderer.render( scene, camera );
+			} else {
+
+				renderer.render( scene, camera );
+
+			}
 
 
 			prevTime = time;
 			prevTime = time;