Converted webgl_effects_cardboard to webvr_shadow. See #8400.

deddb9dd · Mr.doob · 355f686f · deddb9dd · deddb9dd
隐藏空白更改
内联并排

Showing with 23 addition and 26 deletion

examples/files.js examples/files.js +1 -1

examples/webvr_shadow.html examples/webvr_shadow.html +22 -25

未找到文件。
--- a/examples/files.js
+++ b/examples/files.js
@@ -8,7 +8,6 @@ var files = {
 		"webgl_camera_logarithmicdepthbuffer",
 		"webgl_decals",
 		"webgl_effects_anaglyph",
-		"webgl_effects_cardboard",
 		"webgl_effects_parallaxbarrier",
 		"webgl_effects_peppersghost",
 		"webgl_effects_stereo",
@@ -239,6 +238,7 @@ var files = {
 		"webvr_cubes",
 		"webvr_panorama",
 		"webvr_rollercoaster",
+		"webvr_shadow",
 		"webvr_video"
 	],
 	"css3d": [

--- a/examples/webgl_effects_cardboard.html
+++ b/examples/webgl_effects_cardboard.html
@@ -14,11 +14,22 @@
 	<body>

 		<script src="../build/three.min.js"></script>
-		<script src="js/effects/CardboardEffect.js"></script>
+
+		<script src="js/WebVR.js"></script>
+		<script src="js/controls/VRControls.js"></script>
+		<script src="js/effects/VREffect.js"></script>
 		<script>

+			if ( WEBVR.isLatestAvailable() === false ) {
+
+				document.body.appendChild( WEBVR.getMessage() );
+
+			}
+
+			//
+
 			var camera, scene, renderer;
-			var effect;
+			var effect, controls;

 			init();
 			animate();
@@ -62,39 +73,23 @@

 				//

-				renderer = new THREE.WebGLRenderer( { antialias: false } );
+				renderer = new THREE.WebGLRenderer( { antialias: true } );
 				renderer.setClearColor( 0x101010 );
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( window.innerWidth, window.innerHeight );
 				renderer.shadowMap.enabled = true;
 				document.body.appendChild( renderer.domElement );

-				renderer.domElement.addEventListener( 'click', function () {
-
-					if ( this.requestFullscreen ) {
-
-						this.requestFullscreen();
-
-					} else if ( this.msRequestFullscreen ) {
-
-						this.msRequestFullscreen();
-
-					} else if ( this.mozRequestFullScreen ) {
-
-						this.mozRequestFullScreen();
-
-					} else if ( this.webkitRequestFullscreen ) {
-
-						this.webkitRequestFullscreen();
+				//

-					}
+				controls = new THREE.VRControls( camera );
+				effect = new THREE.VREffect( renderer );

-				} );
+				if ( WEBVR.isAvailable() === true ) {

-				//
+					document.body.appendChild( WEBVR.getButton( effect ) );

-				effect = new THREE.CardboardEffect( renderer );
-				effect.setSize( window.innerWidth, window.innerHeight );
+				}

 				//

@@ -129,6 +124,8 @@
 				mesh.rotation.x = time * 2;
 				mesh.rotation.y = time * 5;

+				controls.update();
+
 				effect.render( scene, camera );

 			}