Browse Source

Renamed vr demo to panorama demo, duplicated to panorama fisheye demo (to avoid confusions).

Mr.doob 14 years ago
parent
commit
4fe5e8d292

+ 204 - 0
examples/geometry_panorama.html

@@ -0,0 +1,204 @@
+<!DOCTYPE HTML>
+<html lang="en">
+	<head>
+		<title>three.js - panorama demo</title>
+		<meta charset="utf-8">
+		<style type="text/css">
+			body {
+				background-color: rgb(200,200,200);
+				margin: 0px;
+				overflow: hidden;
+			}
+
+			#info {
+				position: absolute;
+				top: 0px; width: 100%;
+				color: #ffffff;
+				padding: 5px;
+				font-family:Monospace;
+				font-size:13px;
+				font-weight: bold;
+				text-align:center;
+			}
+
+			a {
+				color: #ffffff;
+			}
+		</style>
+	</head>
+	<body>
+
+		<div id="container"></div> 
+		<div id="info"><a href="http://github.com/mrdoob/three.js" target="_blank">three.js</a> - panorama demo. cubemap by <a href="http://www.zfight.com/" target="_blank">Jochum Skoglund</a>.</div>
+
+		<script type="text/javascript" src="../build/Three.js"></script>
+		<script type="text/javascript" src="../src/extras/primitives/Cube.js"></script>
+
+		<script type="text/javascript">
+
+			var camera, scene, renderer;
+
+			var fov = 75,
+			texture_placeholder, wireframe,
+			isUserInteracting = false,
+			onMouseDownMouseX = 0, onMouseDownMouseY = 0,
+			lon = 90, onMouseDownLon = 0,
+			lat = 0, onMouseDownLat = 0,
+			phi = 0, theta = 0;
+
+			init();
+
+			function init() {
+
+				var container, mesh;
+
+				container = document.getElementById( 'container' );
+
+				camera = new THREE.Camera( fov, window.innerWidth / window.innerHeight, 1, 1100 );
+
+				scene = new THREE.Scene();
+
+				texture_placeholder = document.createElement( 'canvas' );
+				texture_placeholder.width = 128;
+				texture_placeholder.height = 128;
+
+				wireframe = new THREE.MeshBasicMaterial( { color: 0xffffff, opacity: 0, wireframe: true } );
+
+				var context = texture_placeholder.getContext( '2d' );
+				context.fillStyle = 'rgb( 200, 200, 200 )';
+				context.fillRect( 0, 0, texture_placeholder.width, texture_placeholder.height );
+
+				var materials = [];
+				materials.push( [ loadTexture( 'textures/cube/skybox/px.jpg' ), wireframe ] ); // right
+				materials.push( [ loadTexture( 'textures/cube/skybox/nx.jpg' ), wireframe ] ); // left
+				materials.push( [ loadTexture( 'textures/cube/skybox/py.jpg' ), wireframe ] ); // top
+				materials.push( [ loadTexture( 'textures/cube/skybox/ny.jpg' ), wireframe ] ); // bottom
+				materials.push( [ loadTexture( 'textures/cube/skybox/pz.jpg' ), wireframe ] ); // back
+				materials.push( [ loadTexture( 'textures/cube/skybox/nz.jpg' ), wireframe ] ); // front
+
+				mesh = new THREE.Mesh( new Cube( 300, 300, 300, 7, 7, materials, true ), new THREE.MeshFaceMaterial() );
+				mesh.overdraw = true;
+				scene.addObject( mesh );
+
+				renderer = new THREE.CanvasRenderer();
+				renderer.setSize( window.innerWidth, window.innerHeight );
+
+				container.appendChild( renderer.domElement );
+
+				document.addEventListener( 'mousedown', onDocumentMouseDown, false );
+				document.addEventListener( 'mousemove', onDocumentMouseMove, false );
+				document.addEventListener( 'mouseup', onDocumentMouseUp, false );
+				document.addEventListener( 'mousewheel', onDocumentMouseWheel, false );
+
+				document.addEventListener( 'touchstart', onDocumentTouchStart, false );
+				document.addEventListener( 'touchmove', onDocumentTouchMove, false );
+
+			}
+
+			function loadTexture( path ) {
+
+				var material = new THREE.MeshBasicMaterial( { map: new THREE.Texture( texture_placeholder, THREE.UVMapping ) } );
+
+				var texture = new Image();
+
+				texture.onload = function () {
+
+					material.map.image = this;
+					render();
+
+				};
+
+				texture.src = path;
+
+				return material;
+			}
+
+			function onDocumentMouseDown( event ) {
+
+				event.preventDefault();
+
+				isUserInteracting = true;
+
+				wireframe.opacity = 0.2;
+
+				onPointerDownPointerX = event.clientX;
+				onPointerDownPointerY = event.clientY;
+
+				onPointerDownLon = lon;
+				onPointerDownLat = lat;
+
+			}
+
+			function onDocumentMouseMove( event ) {
+
+				if ( isUserInteracting ) {
+
+					lon = ( onPointerDownPointerX - event.clientX ) * 0.1 + onPointerDownLon;
+					lat = ( event.clientY - onPointerDownPointerY ) * 0.1 + onPointerDownLat;
+					render();
+
+				}
+			}
+
+			function onDocumentMouseUp( event ) {
+
+				isUserInteracting = false;
+				wireframe.opacity = 0;
+				render();
+
+			}
+
+			function onDocumentMouseWheel( event ) {
+
+				fov -= event.wheelDeltaY * 0.05;
+				camera.projectionMatrix = THREE.Matrix4.makePerspective( fov, window.innerWidth / window.innerHeight, 1, 1100 );
+				render();
+
+			}
+
+
+			function onDocumentTouchStart( event ) {
+
+				if( event.touches.length == 1 ) {
+
+					event.preventDefault();
+
+					onPointerDownPointerX = event.touches[ 0 ].pageX;
+					onPointerDownPointerY = event.touches[ 0 ].pageY;
+
+					onPointerDownLon = lon;
+					onPointerDownLat = lat;
+				}
+			}
+
+			function onDocumentTouchMove( event ) {
+
+				if( event.touches.length == 1 ) {
+
+					event.preventDefault();
+
+					lon = ( onPointerDownPointerX - event.touches[0].pageX ) * 0.1 + onPointerDownLon;
+					lat = ( event.touches[0].pageY - onPointerDownPointerY ) * 0.1 + onPointerDownLat;
+
+					render();
+
+				}
+			}
+
+			function render() {
+
+				lat = Math.max( - 85, Math.min( 85, lat ) );
+				phi = ( 90 - lat ) * Math.PI / 180;
+				theta = lon * Math.PI / 180;
+
+				camera.target.position.x = 500 * Math.sin( phi ) * Math.cos( theta );
+				camera.target.position.y = 500 * Math.cos( phi );
+				camera.target.position.z = 500 * Math.sin( phi ) * Math.sin( theta );
+
+				renderer.render( scene, camera );
+
+			}
+
+		</script>
+	</body>
+</html>

+ 2 - 2
examples/geometry_vr.html → examples/geometry_panorama_fisheye.html

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <!DOCTYPE HTML>
 <html lang="en">
 <html lang="en">
 	<head>
 	<head>
-		<title>three.js - vr</title>
+		<title>three.js - panorama fisheye demo</title>
 		<meta charset="utf-8">
 		<meta charset="utf-8">
 		<style type="text/css">
 		<style type="text/css">
 			body {
 			body {
@@ -29,7 +29,7 @@
 	<body>
 	<body>
 
 
 		<div id="container"></div> 
 		<div id="container"></div> 
-		<div id="info"><a href="http://github.com/mrdoob/three.js" target="_blank">three.js</a> - vr demo. skybox by <a href="http://www.zfight.com/" target="_blank">Jochum Skoglund</a>. (mousewheel: change fov)</div>
+		<div id="info"><a href="http://github.com/mrdoob/three.js" target="_blank">three.js</a> - panorama fisheye demo. cubemap by <a href="http://www.zfight.com/" target="_blank">Jochum Skoglund</a>. (mousewheel: change fov)</div>
 
 
 		<script type="text/javascript" src="../build/Three.js"></script>
 		<script type="text/javascript" src="../build/Three.js"></script>
 		<script type="text/javascript" src="../src/extras/primitives/Cube.js"></script>
 		<script type="text/javascript" src="../src/extras/primitives/Cube.js"></script>

+ 2 - 11
examples/materials_cars.html

@@ -510,13 +510,8 @@
 			function switchCar( car ) {
 			function switchCar( car ) {
 
 
 				for ( var c in CARS ) {
 				for ( var c in CARS ) {
-					if ( c != car && CARS[ c ].object ) {
 
 
-						/*
-						scene.removeObject( CARS[ c ].object );
-						webglRenderer.removeObject( scene, CARS[ c ].object );
-						CARS[ c ].object = null;
-						*/
+					if ( c != car && CARS[ c ].object ) {
 
 
 						CARS[ c ].object.visible = false;
 						CARS[ c ].object.visible = false;
 						CARS[ c ].buttons.style.display = "none";
 						CARS[ c ].buttons.style.display = "none";
@@ -601,7 +596,6 @@
 
 
 			function onDocumentMouseMove(event) {
 			function onDocumentMouseMove(event) {
 
 
-				mouseX = ( event.clientX - windowHalfX );
 				mouseY = ( event.clientY - window.innerHeight );
 				mouseY = ( event.clientY - window.innerHeight );
 
 
 			}
 			}
@@ -612,7 +606,6 @@
 
 
 				r -= 0.005;
 				r -= 0.005;
 
 
-				// camera.position.x += ( mouseX - camera.position.x ) * .05;
 				camera.position.y += ( - mouseY - camera.position.y ) * .05;
 				camera.position.y += ( - mouseY - camera.position.y ) * .05;
 
 
 				camera.position.x = 1000 * Math.cos( r );
 				camera.position.x = 1000 * Math.cos( r );
@@ -626,13 +619,11 @@
 				webglRenderer.render( sceneCube, cameraCube );
 				webglRenderer.render( sceneCube, cameraCube );
 				webglRenderer.render( scene, camera );
 				webglRenderer.render( scene, camera );
 
 
-				// webglRenderer.render( scene, camera );
-
 				if ( STATS_ENABLED ) stats.update();
 				if ( STATS_ENABLED ) stats.update();
 
 
 			}
 			}
 
 
-			function log(text) {
+			function log( text ) {
 
 
 				var e = document.getElementById("log");
 				var e = document.getElementById("log");
 				e.innerHTML = text + "<br/>" + e.innerHTML;
 				e.innerHTML = text + "<br/>" + e.innerHTML;