Browse Source

Added primitives constants

Fernando Serrano 8 years ago
parent
commit
483d339610

+ 9 - 11
examples/js/exporters/GLTFExporter.js

@@ -23,6 +23,14 @@ function paramThreeToGL( p ) {
 
 // @TODO Move it to constants.js ?
 var WebGLConstants = {
+	POINTS: 0x0000,
+	LINES: 0x0001,
+	LINE_LOOP: 0x0002,
+	LINE_STRIP: 0x0003,
+	TRIANGLES: 0x0004,
+	TRIANGLE_STRIP: 0x0005,
+	TRIANGLE_FAN: 0x0006,
+
 	ARRAY_BUFFER: 0x8892,
 	ELEMENT_ARRAY_BUFFER: 0x8893,
 
@@ -324,18 +332,8 @@ THREE.GLTFExporter.prototype = {
 
 			var geometry = mesh.geometry;
 
-			var modes = {
-				POINTS: 0,
-				LINES: 1,
-				LINE_LOOP: 2,
-				LINE_STRIP: 3,
-				TRIANGLES: 4,
-				TRIANGLE_STRIP: 5,
-				TRIANGLE_FAN: 6
-			}
-
 			// @FIXME Select the correct mode based on the mesh
-			var mode = modes.TRIANGLES;
+			var mode = WebGLConstants.TRIANGLES;
 
 			var gltfMesh = {
 				primitives: [

+ 0 - 339
examples/webvr_vive_camerarig2.html

@@ -1,339 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<title>three.js webvr - htc vive  - camera rig</title>
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
-		<style>
-			body {
-				font-family: Monospace;
-				background-color: #101010;
-				color: #fff;
-				margin: 0px;
-				overflow: hidden;
-			}
-			a {
-				color: #f00;
-			}
-		</style>
-	</head>
-	<body>
-
-		<script src="../build/three.js"></script>
-
-		<script src="js/controls/VRControls.js"></script>
-		<script src="js/vr/ViveController.js"></script>
-		<script src="js/vr/WebVR.js"></script>
-		<script src="js/vr/WebVRCamera.js"></script>
-
-
-		<script src="js/loaders/OBJLoader.js"></script>
-
-		<script>
-
-			if ( WEBVR.isAvailable() === false ) {
-
-				document.body.appendChild( WEBVR.getMessage() );
-
-			}
-
-			//
-
-			var clock = new THREE.Clock();
-
-			var container;
-			var vrdisplay;
-			var cameraRig, camera, scene, renderer;
-			var controller1, controller2;
-			var scale = 1;
-			var dragging = {
-				left: false,
-				right: false
-			};
-			var dragStartPointLeft = new THREE.Vector3();
-			var dragStartPointRight = new THREE.Vector3();
-
-			var room;
-
-			init();
-			animate();
-
-			function init() {
-
-				container = document.createElement( 'div' );
-				document.body.appendChild( container );
-
-				var info = document.createElement( 'div' );
-				info.style.position = 'absolute';
-				info.style.top = '10px';
-				info.style.width = '100%';
-				info.style.textAlign = 'center';
-				info.innerHTML = '<a href="http://threejs.org" target="_blank">three.js</a> webgl - htc vive';
-				container.appendChild( info );
-
-				scene = new THREE.Scene();
-
-				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.01, 1000 );
-				cameraRig = new THREE.Group();
-				scene.add( cameraRig );
-
-				room = new THREE.Mesh(
-					new THREE.BoxGeometry( 6, 6, 6, 8, 8, 8 ),
-					new THREE.MeshBasicMaterial( { color: 0x404040, wireframe: true } )
-				);
-				room.position.y = 3;
-				scene.add( room );
-
-				scene.add( new THREE.HemisphereLight( 0x606060, 0x404040 ) );
-
-				var light = new THREE.DirectionalLight( 0xffffff );
-				light.position.set( 1, 1, 1 ).normalize();
-				scene.add( light );
-
-				var geometry = new THREE.BoxGeometry( 0.2, 0.2, 0.2 );
-
-				for ( var i = 0; i < 200; i ++ ) {
-
-					var object = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { color: Math.random() * 0xffffff } ) );
-
-					object.position.x = Math.random() * 4 - 2;
-					object.position.y = Math.random() * 4 - 2;
-					object.position.z = Math.random() * 4 - 2;
-
-					object.rotation.x = Math.random() * 2 * Math.PI;
-					object.rotation.y = Math.random() * 2 * Math.PI;
-					object.rotation.z = Math.random() * 2 * Math.PI;
-
-					object.scale.x = Math.random() + 0.5;
-					object.scale.y = Math.random() + 0.5;
-					object.scale.z = Math.random() + 0.5;
-
-					object.userData.velocity = new THREE.Vector3();
-					object.userData.velocity.x = Math.random() * 0.01 - 0.005;
-					object.userData.velocity.y = Math.random() * 0.01 - 0.005;
-					object.userData.velocity.z = Math.random() * 0.01 - 0.005;
-
-					room.add( object );
-
-				}
-
-				var material = new THREE.MeshStandardMaterial();
-
-				var loader = new THREE.OBJLoader();
-				loader.setPath( 'models/obj/cerberus/' );
-				loader.load( 'Cerberus.obj', function ( group ) {
-
-					// var material = new THREE.MeshBasicMaterial( { wireframe: true } );
-
-					var loader = new THREE.TextureLoader();
-					loader.setPath( 'models/obj/cerberus/' );
-
-					material.roughness = 1;
-					material.metalness = 1;
-
-					material.map = loader.load( 'Cerberus_A.jpg' );
-					material.roughnessMap = loader.load( 'Cerberus_R.jpg' );
-					material.metalnessMap = loader.load( 'Cerberus_M.jpg' );
-					material.normalMap = loader.load( 'Cerberus_N.jpg' );
-
-					material.map.wrapS = THREE.RepeatWrapping;
-					material.roughnessMap.wrapS = THREE.RepeatWrapping;
-					material.metalnessMap.wrapS = THREE.RepeatWrapping;
-					material.normalMap.wrapS = THREE.RepeatWrapping;
-
-					group.traverse( function ( child ) {
-
-						if ( child instanceof THREE.Mesh ) {
-
-							child.material = material;
-
-						}
-
-					} );
-
-					group.position.y = - 2;
-					group.rotation.y = - Math.PI / 2;
-					room.add( group );
-
-				} );
-
-				var loader = new THREE.CubeTextureLoader();
-				loader.setPath( 'textures/cube/pisa/' );
-				material.envMap = loader.load( [
-					"px.png", "nx.png",
-					"py.png", "ny.png",
-					"pz.png", "nz.png"
-				] );
-
-				//
-
-				renderer = new THREE.WebGLRenderer( { antialias: true } );
-				renderer.setClearColor( 0x505050 );
-				renderer.setPixelRatio( window.devicePixelRatio );
-				renderer.setSize( window.innerWidth, window.innerHeight );
-				renderer.sortObjects = false;
-				container.appendChild( renderer.domElement );
-
-
-				// controllers
-				controller1 = new THREE.ViveController( 0 );
-				controller1.addEventListener( 'triggerdown', onTriggerDown );
-				controller1.addEventListener( 'triggerup', onTriggerUp );
-				cameraRig.add( controller1 );
-
-				controller2 = new THREE.ViveController( 1 );
-				controller2.addEventListener( 'triggerdown', onTriggerDown );
-				controller2.addEventListener( 'triggerup', onTriggerUp );
-				cameraRig.add( controller2 );
-
-				var loader = new THREE.OBJLoader();
-				loader.setPath( 'models/obj/vive-controller/' );
-				loader.load( 'vr_controller_vive_1_5.obj', function ( object ) {
-					console.log('asdfsafsdfadsf');
-					var loader = new THREE.TextureLoader();
-					loader.setPath( 'models/obj/vive-controller/' );
-
-					var controller = object.children[ 0 ];
-					controller.material.map = loader.load( 'onepointfive_texture.png' );
-					controller.material.specularMap = loader.load( 'onepointfive_spec.png' );
-
-					controller1.add( object.clone() );
-					controller2.add( object.clone() );
-
-				} );
-
-
-				WEBVR.getVRDisplay( function ( display ) {
-
-					vrdisplay = display;
-
-					camera = new THREE.WebVRCamera( display, renderer );
-					cameraRig.add( camera );
-
-					//controller1.standingMatrix = camera.getStandingMatrix();
-					//controller2.standingMatrix = camera.getStandingMatrix();
-
-					document.body.appendChild( WEBVR.getButton( display, renderer.domElement ) );
-
-				} );
-
-				window.addEventListener( 'resize', onWindowResize, false );
-
-			}
-
-			function onWindowResize() {
-
-				camera.aspect = window.innerWidth / window.innerHeight;
-				camera.updateProjectionMatrix();
-
-			}
-
-			//
-
-			function animate() {
-
-				( vrdisplay ? vrdisplay : window ).requestAnimationFrame( animate );
-				render();
-
-			}
-			function render() {
-
-				var delta = clock.getDelta() * 60;
-				var time = clock.getElapsedTime();
-				var scale = 1.1 + Math.sin(time);
-
-//				console.log(scale);
-				//cameraRig.scale.set(scale,scale,scale);
-
-				controller1.update();
-				controller2.update();
-
-				scaleUpdate();
-
-				for ( var i = 0; i < room.children.length; i ++ ) {
-
-					var cube = room.children[ i ];
-
-					if ( cube.geometry instanceof THREE.BoxGeometry === false ) continue;
-
-					// cube.position.add( cube.userData.velocity );
-
-					if ( cube.position.x < - 3 || cube.position.x > 3 ) {
-
-						cube.position.x = THREE.Math.clamp( cube.position.x, - 3, 3 );
-						cube.userData.velocity.x = - cube.userData.velocity.x;
-
-					}
-
-					if ( cube.position.y < - 3 || cube.position.y > 3 ) {
-
-						cube.position.y = THREE.Math.clamp( cube.position.y, - 3, 3 );
-						cube.userData.velocity.y = - cube.userData.velocity.y;
-
-					}
-
-					if ( cube.position.z < - 3 || cube.position.z > 3 ) {
-
-						cube.position.z = THREE.Math.clamp( cube.position.z, - 3, 3 );
-						cube.userData.velocity.z = - cube.userData.velocity.z;
-
-					}
-
-					cube.rotation.x += 0.01 * delta;
-
-				}
-
-				renderer.render( scene, camera );
-			}
-
-			var previousControllersSegment = new THREE.Line3();
-			var currentControllersSegment = new THREE.Line3();
-			var deltaPreviousSegment = new THREE.Vector3();
-			var deltaCurrentSegment = new THREE.Vector3();
-			var currentWorldPositionLeft = new THREE.Vector3();
-			var currentWorldPositionRight = new THREE.Vector3();
-
-			function scaleUpdate () {
-				if ( !dragging.left || !dragging.right ) {
-					return false;
-				}
-
-				currentWorldPositionLeft.setFromMatrixPosition( controller1.matrixWorld );
-				currentWorldPositionRight.setFromMatrixPosition( controller2.matrixWorld );
-
-				previousControllersSegment.set( dragStartPointLeft, dragStartPointRight );
-				currentControllersSegment.set( currentWorldPositionLeft, currentWorldPositionRight );
-
-				var dist = ( previousControllersSegment.distance() - currentControllersSegment.distance() );
-
-				scale += dist;
-				cameraRig.scale.set( scale, scale, scale );
-
-				dragStartPointLeft.copy( currentWorldPositionLeft );
-				dragStartPointRight.copy( currentWorldPositionRight );
-			}
-
-			function onTriggerDown (event) {
-				var target = event.target;
-				var left = target === controller1;
-				if (left) {
-				  dragging.left = true;
-				} else {
-				  dragging.right = true;
-				}
-
-				dragStartPointLeft.setFromMatrixPosition(controller1.matrixWorld);
-				dragStartPointRight.setFromMatrixPosition(controller2.matrixWorld);
-			}
-
-			function onTriggerUp (event) {
-				var left = event.target === controller1;
-				if (left) {
-				  dragging.left = false;
-				} else {
-				  dragging.right = false;
-				}
-			}
-		</script>
-	</body>
-</html>

+ 0 - 295
examples/webvr_vive_camerarig_panning.html

@@ -1,295 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<title>three.js webvr - htc vive  - camera rig</title>
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
-		<style>
-			body {
-				font-family: Monospace;
-				background-color: #101010;
-				color: #fff;
-				margin: 0px;
-				overflow: hidden;
-			}
-			a {
-				color: #f00;
-			}
-		</style>
-	</head>
-	<body>
-
-		<script src="../build/three.js"></script>
-
-		<script src="js/controls/VRControls.js"></script>
-		<script src="js/effects/VREffect.js"></script>
-		<script src="js/vr/ViveController.js"></script>
-		<script src="js/vr/WebVR.js"></script>
-
-		<script src="js/loaders/OBJLoader.js"></script>
-
-		<script>
-
-			if ( WEBVR.isAvailable() === false ) {
-
-				document.body.appendChild( WEBVR.getMessage() );
-
-			}
-
-			//
-
-			var clock = new THREE.Clock();
-
-			var container;
-			var cameraRig, camera, scene, renderer;
-			var effect, controls;
-			var controller1, controller2;
-			var scale = 1;
-			var dragging = {
-				left: false,
-				right: false
-			};
-			var previousPosition = new THREE.Vector3();
-			var currentPosition = new THREE.Vector3();
-
-			var room;
-
-			init();
-			animate();
-
-			function init() {
-
-				container = document.createElement( 'div' );
-				document.body.appendChild( container );
-
-				var info = document.createElement( 'div' );
-				info.style.position = 'absolute';
-				info.style.top = '10px';
-				info.style.width = '100%';
-				info.style.textAlign = 'center';
-				info.innerHTML = '<a href="http://threejs.org" target="_blank">three.js</a> webgl - htc vive';
-				container.appendChild( info );
-
-				scene = new THREE.Scene();
-
-				camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.01, 1000 );
-				cameraRig = new THREE.Group();
-				cameraRig.add( camera );
-				scene.add( cameraRig );
-
-				room = new THREE.Mesh(
-					new THREE.BoxGeometry( 6, 6, 6, 8, 8, 8 ),
-					new THREE.MeshBasicMaterial( { color: 0x404040, wireframe: true } )
-				);
-				room.position.y = 3;
-				scene.add( room );
-
-				scene.add( new THREE.HemisphereLight( 0x606060, 0x404040 ) );
-
-				var light = new THREE.DirectionalLight( 0xffffff );
-				light.position.set( 1, 1, 1 ).normalize();
-				scene.add( light );
-
-				var geometry = new THREE.BoxGeometry( 0.2, 0.2, 0.2 );
-
-				for ( var i = 0; i < 200; i ++ ) {
-
-					var object = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { color: Math.random() * 0xffffff } ) );
-
-					object.position.x = Math.random() * 4 - 2;
-					object.position.y = Math.random() * 4 - 2;
-					object.position.z = Math.random() * 4 - 2;
-
-					object.rotation.x = Math.random() * 2 * Math.PI;
-					object.rotation.y = Math.random() * 2 * Math.PI;
-					object.rotation.z = Math.random() * 2 * Math.PI;
-
-					object.scale.x = Math.random() + 0.5;
-					object.scale.y = Math.random() + 0.5;
-					object.scale.z = Math.random() + 0.5;
-
-					object.userData.velocity = new THREE.Vector3();
-					object.userData.velocity.x = Math.random() * 0.01 - 0.005;
-					object.userData.velocity.y = Math.random() * 0.01 - 0.005;
-					object.userData.velocity.z = Math.random() * 0.01 - 0.005;
-
-					room.add( object );
-
-				}
-
-				var material = new THREE.MeshStandardMaterial();
-
-				var loader = new THREE.OBJLoader();
-				loader.setPath( 'models/obj/cerberus/' );
-				loader.load( 'Cerberus.obj', function ( group ) {
-
-					// var material = new THREE.MeshBasicMaterial( { wireframe: true } );
-
-					var loader = new THREE.TextureLoader();
-					loader.setPath( 'models/obj/cerberus/' );
-
-					material.roughness = 1;
-					material.metalness = 1;
-
-					material.map = loader.load( 'Cerberus_A.jpg' );
-					material.roughnessMap = loader.load( 'Cerberus_R.jpg' );
-					material.metalnessMap = loader.load( 'Cerberus_M.jpg' );
-					material.normalMap = loader.load( 'Cerberus_N.jpg' );
-
-					material.map.wrapS = THREE.RepeatWrapping;
-					material.roughnessMap.wrapS = THREE.RepeatWrapping;
-					material.metalnessMap.wrapS = THREE.RepeatWrapping;
-					material.normalMap.wrapS = THREE.RepeatWrapping;
-
-					group.traverse( function ( child ) {
-
-						if ( child instanceof THREE.Mesh ) {
-
-							child.material = material;
-
-						}
-
-					} );
-
-					group.position.y = - 2;
-					group.rotation.y = - Math.PI / 2;
-					room.add( group );
-
-				} );
-
-				var loader = new THREE.CubeTextureLoader();
-				loader.setPath( 'textures/cube/pisa/' );
-				material.envMap = loader.load( [
-					"px.png", "nx.png",
-					"py.png", "ny.png",
-					"pz.png", "nz.png"
-				] );
-
-				//
-
-				renderer = new THREE.WebGLRenderer( { antialias: true } );
-				renderer.setClearColor( 0x505050 );
-				renderer.setPixelRatio( window.devicePixelRatio );
-				renderer.setSize( window.innerWidth, window.innerHeight );
-				renderer.sortObjects = false;
-				container.appendChild( renderer.domElement );
-
-				controls = new THREE.VRControls( camera );
-				controls.standing = true;
-
-				// controllers
-
-				controller1 = new THREE.ViveController( 0 );
-				controller1.standingMatrix = controls.getStandingMatrix();
-				controller1.addEventListener( 'triggerdown', onTriggerDown );
-				controller1.addEventListener( 'triggerup', onTriggerUp );
-				cameraRig.add( controller1 );
-
-				controller2 = new THREE.ViveController( 1 );
-				controller2.standingMatrix = controls.getStandingMatrix();
-				controller2.addEventListener( 'triggerdown', onTriggerDown );
-				controller2.addEventListener( 'triggerup', onTriggerUp );
-				cameraRig.add( controller2 );
-
-				var loader = new THREE.OBJLoader();
-				loader.setPath( 'models/obj/vive-controller/' );
-				loader.load( 'vr_controller_vive_1_5.obj', function ( object ) {
-
-					var loader = new THREE.TextureLoader();
-					loader.setPath( 'models/obj/vive-controller/' );
-
-					var controller = object.children[ 0 ];
-					controller.material.map = loader.load( 'onepointfive_texture.png' );
-					controller.material.specularMap = loader.load( 'onepointfive_spec.png' );
-
-					controller1.add( object.clone() );
-					controller2.add( object.clone() );
-
-				} );
-
-				effect = new THREE.VREffect( renderer );
-
-				if ( WEBVR.isAvailable() === true ) {
-
-					document.body.appendChild( WEBVR.getButton( effect ) );
-
-				}
-
-				//
-
-				window.addEventListener( 'resize', onWindowResize, false );
-
-			}
-
-			function onWindowResize() {
-
-				camera.aspect = window.innerWidth / window.innerHeight;
-				camera.updateProjectionMatrix();
-
-				effect.setSize( window.innerWidth, window.innerHeight );
-
-			}
-
-			//
-
-			function animate() {
-
-				effect.requestAnimationFrame( animate );
-				render();
-
-			}
-
-			function render() {
-
-				var delta = clock.getDelta() * 60;
-
-				controller1.update();
-				controller2.update();
-
-				controls.update();
-
-				panningUpdate();
-
-				effect.render( scene, camera );
-
-			}
-
-			function panningUpdate () {
-				if ( ( dragging.left && dragging.right ) || ( !dragging.left && !dragging.right ) ) {
-					return false;
-				}
-
-				var controller = dragging.left ? controller1 : controller2;
-				controller.getWorldPosition(currentPosition);
-
-				var delta = currentPosition.sub(previousPosition);
-
-				cameraRig.position.sub(delta);
-
-//				controller.getWorldPosition(previousPosition);
-			}
-
-			function onTriggerDown (event) {
-				var target = event.target;
-				var left = target === controller1;
-				if (left) {
-				  dragging.left = true;
-					controller1.getWorldPosition(previousPosition);
-				} else {
-				  dragging.right = true;
-					controller2.getWorldPosition(previousPosition);
-				}
-			}
-
-			function onTriggerUp (event) {
-				var left = event.target === controller1;
-				if (left) {
-				  dragging.left = false;
-				} else {
-				  dragging.right = false;
-				}
-			}
-
-		</script>
-	</body>
-</html>