Editor: Added WebVR support.

mrdoob · mrdoob · commit dc62ed1b5e94 · 2016-06-24T21:57:54.000-07:00
diff --git a/editor/index.html b/editor/index.html
@@ -98,6 +98,7 @@
 
 		<script src="../examples/js/effects/VREffect.js"></script>
 		<script src="../examples/js/controls/VRControls.js"></script>
+		<script src="../examples/js/WebVR.js"></script>
 
 		<script src="js/Storage.js"></script>
 
diff --git a/editor/js/Menubar.File.js b/editor/js/Menubar.File.js
@@ -242,6 +242,7 @@ Menubar.File = function ( editor ) {
 
 				includes.push( '<script src="js/VRControls.js"></script>' );
 				includes.push( '<script src="js/VREffect.js"></script>' );
+				includes.push( '<script src="js/WebVR.js"></script>' );
 
 			}
 
@@ -275,6 +276,12 @@ Menubar.File = function ( editor ) {
 
 			} );
 
+			loader.load( '../examples/js/WebVR.js', function ( content ) {
+
+				zip.file( 'js/WebVR.js', content );
+
+			} );
+
 		}
 
 	} );
diff --git a/editor/js/Player.js b/editor/js/Player.js
@@ -14,11 +14,10 @@ var Player = function ( editor ) {
 	//
 
 	var player = new APP.Player();
+	container.dom.appendChild( player.dom );
 
 	window.addEventListener( 'resize', function () {
 
-		if ( player.dom === undefined ) return;
-
 		player.setSize( container.dom.clientWidth, container.dom.clientHeight );
 
 	} );
@@ -31,17 +30,14 @@ var Player = function ( editor ) {
 		player.setSize( container.dom.clientWidth, container.dom.clientHeight );
 		player.play();
 
-		container.dom.appendChild( player.dom );
-
 	} );
 
 	signals.stopPlayer.add( function () {
 
 		container.setDisplay( 'none' );
 
 		player.stop();
-
-		container.dom.removeChild( player.dom );
+		player.dispose();
 
 	} );
 
diff --git a/editor/js/libs/app.js b/editor/js/libs/app.js
@@ -15,7 +15,7 @@ var APP = {
 
 		var events = {};
 
-		this.dom = undefined;
+		this.dom = document.createElement( 'div' );
 
 		this.width = 500;
 		this.height = 500;
@@ -35,7 +35,7 @@ var APP = {
 
 			}
 
-			this.dom = renderer.domElement;
+			this.dom.appendChild( renderer.domElement );
 
 			this.setScene( loader.parse( json.scene ) );
 			this.setCamera( loader.parse( json.camera ) );
@@ -133,21 +133,17 @@ var APP = {
 				controls = new THREE.VRControls( camera );
 				effect = new THREE.VREffect( renderer );
 
-				document.addEventListener( 'keyup', function ( event ) {
+				if ( WEBVR.isAvailable() === true ) {
 
-					switch ( event.keyCode ) {
-						case 90:
-							controls.zeroSensor();
-							break;
-					}
+					this.dom.appendChild( WEBVR.getButton( effect ) );
 
-				} );
+				}
 
-				this.dom.addEventListener( 'dblclick', function () {
+				if ( WEBVR.isLatestAvailable() === false ) {
 
-					effect.setFullScreen( true );
+					this.dom.appendChild( WEBVR.getMessage() );
 
-				} );
+				}
 
 			}
 
@@ -249,6 +245,18 @@ var APP = {
 
 		};
 
+		this.dispose = function () {
+
+			while ( this.dom.children.length ) {
+
+				this.dom.removeChild( this.dom.firstChild );
+
+			}
+
+			renderer.dispose();
+
+		};
+
 		//
 
 		function onDocumentKeyDown( event ) {

Original file line number	Diff line number	Diff line change
`@@ -242,6 +242,7 @@ Menubar.File = function ( editor ) {`
`242`	`242`
`243`	`243`	`includes.push( '<script src="js/VRControls.js"></script>' );`
`244`	`244`	`includes.push( '<script src="js/VREffect.js"></script>' );`
	`245`	`+ includes.push( '<script src="js/WebVR.js"></script>' );`
`245`	`246`
`246`	`247`	`}`
`247`	`248`
`@@ -275,6 +276,12 @@ Menubar.File = function ( editor ) {`
`275`	`276`
`276`	`277`	`} );`
`277`	`278`
	`279`	`+ loader.load( '../examples/js/WebVR.js', function ( content ) {`
	`280`	`+`
	`281`	`+ zip.file( 'js/WebVR.js', content );`
	`282`	`+`
	`283`	`+ } );`
	`284`	`+`
`278`	`285`	`}`
`279`	`286`
`280`	`287`	`} );`