Browse Source

Revert "convert webgl_loader_vtk into a roughness variation test."

This reverts commit d03508fc4dd835d6d6d0d6afa1a99901082ee43a.
Ben Houston 9 years ago
parent
commit
9db2e9012e

+ 2 - 21
examples/webgl_loader_vtk.html

@@ -47,7 +47,7 @@
 
 			var container, stats;
 
-			var camera, controls, scene, renderer, material;
+			var camera, controls, scene, renderer;
 
 			var cross;
 
@@ -83,20 +83,7 @@
 				camera.add( dirLight );
 				camera.add( dirLight.target );
 
-
-				var path = "textures/cube/pisa/";
-				var format = '.png';
-				var urls = [
-						path + 'px' + format, path + 'nx' + format,
-						path + 'py' + format, path + 'ny' + format,
-						path + 'pz' + format, path + 'nz' + format
-					];
-
-				var reflectionCube = THREE.ImageUtils.loadTextureCube( urls );
-				reflectionCube.format = THREE.RGBFormat;
-
-				var diffuseColor = new THREE.Color( 1, 1, 1 );
-				material = new THREE.MeshPhysicalMaterial( { color: diffuseColor, metalness: 1.0, roughness: 0.2, shading: THREE.SmoothShading, envMap: reflectionCube } );
+				var material = new THREE.MeshLambertMaterial( { color:0xffffff, side: THREE.DoubleSide } );
 
 				var loader = new THREE.VTKLoader();
 				loader.load( "models/vtk/bunny.vtk", function ( geometry ) {
@@ -145,12 +132,6 @@
 
 				requestAnimationFrame( animate );
 
-				var timer = Date.now() * 0.001;
-
-				if( material ) {
-					material.roughness = Math.cos( timer ) * 0.5 + 0.5;
-					material.needsUpdate = true;
-				}
 				controls.update();
 				renderer.render( scene, camera );
 

+ 0 - 248
examples/webgl_materials_physical_variations_teapot.html

@@ -1,248 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<title>three.js webgl - materials</title>
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
-		<style>
-					body {
-				color: #fff;
-				font-family:Monospace;
-				font-size:13px;
-				text-align:center;
-
-				background-color: #fff;
-				margin: 0px;
-				overflow: hidden;
-			}
-
-			#info {
-				position: absolute;
-				top: 0px; width: 100%;
-				padding: 5px;
-			}
-		</style>
-	</head>
-	<body>
-
-		<div id="container"></div>
-		<div id="info"><a href="http://threejs.org" target="_blank">three.js</a> - Physical Material Variantions by <a href="http://clara.io/" target="_blank">Ben Houston</a>.</div>
-
-		<script src="../build/three.min.js"></script>
-		<script src="js/controls/OrbitControls.js"></script>
-		<script src="js/geometries/TextGeometry.js"></script>
-		<script src="js/utils/FontUtils.js"></script>
-		<script src="fonts/gentilis_regular.typeface.js"></script>
-
-		<script src='js/geometries/TeapotBufferGeometry.js'></script>
-
-		<script src="js/Detector.js"></script>
-		<script src="js/libs/stats.min.js"></script>
-
-		<script>
-
-			if ( ! Detector.webgl ) Detector.addGetWebGLMessage();
-
-			var container, stats;
-
-			var camera, scene, renderer, controls, objects = [];
-			var particleLight;
-
-			init();
-			animate();
-
-			function init() {
-
-				container = document.createElement( 'div' );
-				document.body.appendChild( container );
-
-				camera = new THREE.PerspectiveCamera( 40, window.innerWidth / window.innerHeight, 1, 2000 );
-				camera.position.set( 0.0, 400, 400 * 3.5 );
-
-				scene = new THREE.Scene();
-
-				// Materials
-
-				var imgTexture = THREE.ImageUtils.loadTexture( "textures/planets/moon_1024.jpg" );
-				imgTexture.wrapS = imgTexture.wrapT = THREE.RepeatWrapping;
-				imgTexture.anisotropy = 16;
-				imgTexture = null;
-
-				var shininess = 50, specular = 0x333333, bumpScale = 1, shading = THREE.SmoothShading;
-
-				var materials = [];
-
-				var path = "textures/cube/pisa/";
-				var format = '.png';
-				var urls = [
-						path + 'px' + format, path + 'nx' + format,
-						path + 'py' + format, path + 'ny' + format,
-						path + 'pz' + format, path + 'nz' + format
-					];
-
-				var reflectionCube = THREE.ImageUtils.loadTextureCube( urls );
-				reflectionCube.format = THREE.RGBFormat;
-
-				var cubeWidth = 400;
-				var numberOfSphersPerSide = 4;
-				var sphereRadius = ( cubeWidth / numberOfSphersPerSide ) * 0.6 * 0.5;
-				var stepSize = 1.0 / numberOfSphersPerSide;
-
-				//var geometry = new THREE.SphereBufferGeometry( sphereRadius, 32, 16 );
-				var geometry = new THREE.TeapotBufferGeometry( sphereRadius, 8 );
-
-				var localReflectionCube;
-				
-				for( var alpha = 0, alphaIndex = 0; alpha <= 1.0; alpha += stepSize, alphaIndex ++ ) {
-
-					var roughness = 1.0 - alpha;
-
-					localReflectionCube = reflectionCube;
-
-					for( var beta = 0; beta <= 1.0; beta += stepSize ) {
-
-						var metalness = beta;
-
-						for( var gamma = 0; gamma <= 1.0; gamma += stepSize ) {
-
-							// basic monochromatic energy preservation
-							var diffuseColor = new THREE.Color( 1, 1, 0 ).multiplyScalar( gamma ).add( new THREE.Color( 0.5, 0.5, 0.5 ).multiplyScalar( 1 - gamma ) );
-
-							var material = new THREE.MeshPhysicalMaterial( { map: imgTexture, bumpMap: imgTexture, bumpScale: bumpScale, color: diffuseColor, metalness: metalness, roughness: roughness, shading: THREE.SmoothShading, envMap: localReflectionCube } )
-
-							var mesh = new THREE.Mesh( geometry, material );
-
-							mesh.position.x = alpha * 400 - 200;
-							mesh.position.y = beta * 400 - 200;
-							mesh.position.z = gamma * 400 - 200;
-
-							objects.push( mesh );
-
-							scene.add( mesh );
-						}
-					}
-				}
-	
-				function addLabel( name, location ) {
-					var textGeo = new THREE.TextGeometry( name, {
-
-						size: 20,
-						height: 5,
-						curveSegments: 10,
-
-						font: 'gentilis',
-						weight: 'normal',
-						style: 'normal',
-
-						material: 0,
-						extrudeMaterial: 1
-
-					});
-
-					var textMaterial = new THREE.MeshBasicMaterial( { color: 0xffffff } );
-					var textMesh = new THREE.Mesh( textGeo, textMaterial );
-					textMesh.position.copy( location );
-					scene.add( textMesh );
-				}
-
-				addLabel( "+roughness", new THREE.Vector3( -350, 0, 0 ) );
-				addLabel( "-roughness", new THREE.Vector3( 350, 0, 0 ) );
-
-				addLabel( "-metalness", new THREE.Vector3( 0, -300, 0 ) );
-				addLabel( "+metalness", new THREE.Vector3( 0, 300, 0 ) );
-
-				addLabel( "gray diffuse", new THREE.Vector3( 0, 0, -300 ) );
-				addLabel( "yellow diffuse", new THREE.Vector3( 0, 0, 300 ) );
-
-				particleLight = new THREE.Mesh( new THREE.SphereBufferGeometry( 4, 8, 8 ), new THREE.MeshBasicMaterial( { color: 0xffffff } ) );
-				scene.add( particleLight );
-
-				// Lights
-
-				scene.add( new THREE.AmbientLight( 0x222222 ) );
-
-				var directionalLight = new THREE.DirectionalLight( 0xffffff, 1 );
-				directionalLight.position.set( 1, 1, 1 ).normalize();
-				scene.add( directionalLight );
-
-				var pointLight = new THREE.PointLight( 0xffffff, 2, 800 );
-				particleLight.add( pointLight );
-
-				//
-
-				renderer = new THREE.WebGLRenderer( { antialias: true } );
-				renderer.setClearColor( 0x0a0a0a );
-				renderer.setPixelRatio( window.devicePixelRatio );
-				renderer.setSize( window.innerWidth, window.innerHeight );
-				renderer.sortObjects = true;
-
-				container.appendChild( renderer.domElement );
-
-				renderer.gammaInput = true;
-				renderer.gammaOutput = true;
-
-				//
-
-				stats = new Stats();
-				stats.domElement.style.position = 'absolute';
-				stats.domElement.style.top = '0px';
-
-				container.appendChild( stats.domElement );
-
-				controls = new THREE.OrbitControls( camera );
-				controls.target.set( 0, 0, 0 );
-				controls.update();
-
-				window.addEventListener( 'resize', onWindowResize, false );
-
-			}
-
-			function onWindowResize() {
-
-				camera.aspect = window.innerWidth / window.innerHeight;
-				camera.updateProjectionMatrix();
-
-				renderer.setSize( window.innerWidth, window.innerHeight );
-
-			}
-
-			//
-
-			function animate() {
-
-				requestAnimationFrame( animate );
-
-				render();
-				stats.update();
-
-			}
-
-			function render() {
-
-				var timer = Date.now() * 0.00025;
-
-				//camera.position.x = Math.cos( timer ) * 800;
-				//camera.position.z = Math.sin( timer ) * 800;
-
-				camera.lookAt( scene.position );
-
-				for ( var i = 0, l = objects.length; i < l; i ++ ) {
-
-					var object = objects[ i ];
-
-					object.rotation.y += 0.005;
-
-				}
-
-				particleLight.position.x = Math.sin( timer * 7 ) * 300;
-				particleLight.position.y = Math.cos( timer * 5 ) * 400;
-				particleLight.position.z = Math.cos( timer * 3 ) * 300;
-
-				renderer.render( scene, camera );
-
-			}
-
-		</script>
-
-	</body>
-</html>