Browse Source

Examples clean up.

Mr.doob 11 years ago
parent
commit
68269fb45e

+ 1 - 1
examples/js/postprocessing/BloomPass.js

@@ -69,7 +69,7 @@ THREE.BloomPass = function ( strength, kernelSize, sigma, resolution ) {
 	this.camera = new THREE.OrthographicCamera( -1, 1, 1, -1, 0, 1 );
 	this.scene  = new THREE.Scene();
 
-	this.quad = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), null );
+	this.quad = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ), null );
 	this.scene.add( this.quad );
 
 };

+ 1 - 1
examples/js/postprocessing/BokehPass.js

@@ -61,7 +61,7 @@ THREE.BokehPass = function ( scene, camera, params ) {
 	this.camera2 = new THREE.OrthographicCamera( -1, 1, 1, -1, 0, 1 );
 	this.scene2  = new THREE.Scene();
 
-	this.quad2 = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), null );
+	this.quad2 = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ), null );
 	this.scene2.add( this.quad2 );
 
 };

+ 1 - 1
examples/js/postprocessing/DotScreenPass.js

@@ -31,7 +31,7 @@ THREE.DotScreenPass = function ( center, angle, scale ) {
 	this.camera = new THREE.OrthographicCamera( -1, 1, 1, -1, 0, 1 );
 	this.scene  = new THREE.Scene();
 
-	this.quad = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), null );
+	this.quad = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ), null );
 	this.scene.add( this.quad );
 
 };

+ 1 - 1
examples/js/postprocessing/FilmPass.js

@@ -32,7 +32,7 @@ THREE.FilmPass = function ( noiseIntensity, scanlinesIntensity, scanlinesCount,
 	this.camera = new THREE.OrthographicCamera( -1, 1, 1, -1, 0, 1 );
 	this.scene  = new THREE.Scene();
 
-	this.quad = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), null );
+	this.quad = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ), null );
 	this.scene.add( this.quad );
 
 };

+ 1 - 1
examples/js/postprocessing/GlitchPass.js

@@ -31,7 +31,7 @@ THREE.GlitchPass = function ( dt_size ) {
 	this.camera = new THREE.OrthographicCamera( -1, 1, 1, -1, 0, 1 );
 	this.scene  = new THREE.Scene();
 
-	this.quad = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), null );
+	this.quad = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ), null );
 	this.scene.add( this.quad );
 	
 	this.goWild=false;

+ 1 - 1
examples/js/postprocessing/SavePass.js

@@ -38,7 +38,7 @@ THREE.SavePass = function ( renderTarget ) {
 	this.camera = new THREE.OrthographicCamera( -1, 1, 1, -1, 0, 1 );
 	this.scene  = new THREE.Scene();
 
-	this.quad = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), null );
+	this.quad = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ), null );
 	this.scene.add( this.quad );
 
 };

+ 1 - 1
examples/js/postprocessing/ShaderPass.js

@@ -26,7 +26,7 @@ THREE.ShaderPass = function ( shader, textureID ) {
 	this.camera = new THREE.OrthographicCamera( -1, 1, 1, -1, 0, 1 );
 	this.scene  = new THREE.Scene();
 
-	this.quad = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), null );
+	this.quad = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ), null );
 	this.scene.add( this.quad );
 
 };

+ 1 - 1
examples/js/postprocessing/TexturePass.js

@@ -29,7 +29,7 @@ THREE.TexturePass = function ( texture, opacity ) {
 	this.camera = new THREE.OrthographicCamera( -1, 1, 1, -1, 0, 1 );
 	this.scene  = new THREE.Scene();
 
-	this.quad = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), null );
+	this.quad = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ), null );
 	this.scene.add( this.quad );
 
 };

+ 1 - 1
examples/webgl_effects_vr.html

@@ -36,7 +36,7 @@
 	<body>
 		<div class="button">Start VR Mode</div>
 
-		<script src="../build/three.js"></script>
+		<script src="../build/three.min.js"></script>
 		<script src="js/effects/VREffect.js"></script>
 		<script src="js/controls/VRControls.js"></script>
 		<script src="js/libs/stats.min.js"></script>

+ 40 - 32
examples/webgl_materials_cubemap_dynamic.html

@@ -396,7 +396,12 @@
 
 				renderer.autoClear = false;
 
-				var renderTargetParameters = { minFilter: THREE.LinearFilter, magFilter: THREE.LinearFilter, format: THREE.RGBFormat, stencilBuffer: false };
+				var renderTargetParameters = {
+					minFilter: THREE.LinearFilter,
+					magFilter: THREE.LinearFilter,
+					format: THREE.RGBFormat,
+					stencilBuffer: false
+				};
 				renderTarget = new THREE.WebGLRenderTarget( SCREEN_WIDTH, SCREEN_HEIGHT, renderTargetParameters );
 
 				effectSave = new THREE.SavePass( new THREE.WebGLRenderTarget( SCREEN_WIDTH, SCREEN_HEIGHT, renderTargetParameters ) );
@@ -495,7 +500,7 @@
 				groundBasic = new THREE.MeshBasicMaterial( { color: 0xffffff, map: texture } );
 				groundBasic.color.setHSL( 0.1, 0.9, 0.7 );
 
-				ground = new THREE.Mesh( new THREE.PlaneGeometry( 50000, 50000 ), groundBasic );
+				ground = new THREE.Mesh( new THREE.PlaneBufferGeometry( 50000, 50000 ), groundBasic );
 				ground.position.y = - 215;
 				ground.rotation.x = - Math.PI / 2;
 				scene.add( ground );
@@ -525,45 +530,42 @@
 
 			//
 
-			function addObject( geometry, color, x, y, z, sy ) {
+			var canvas = document.createElement( 'canvas' );
+			canvas.width = 128;
+			canvas.height = 128;
 
-				var object = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { color: color, ambient: color } ) );
-				object.position.set( x, y, z );
-				object.castShadow = true;
-				object.receiveShadow = true;
-				scene.add( object );
+			var context = canvas.getContext( '2d' );
+			var gradient = context.createRadialGradient( canvas.width / 2, canvas.height / 2, 0, canvas.width / 2, canvas.height / 2, canvas.width / 2 );
+			gradient.addColorStop( 0.1, 'rgba(0,0,0,1)' );
+			gradient.addColorStop( 1, 'rgba(0,0,0,0)' );
 
-				//
-
-				var canvas = document.createElement( 'canvas' );
-				canvas.width = 128;
-				canvas.height = 128;
+			context.fillStyle = gradient;
+			context.fillRect( 0, 0, canvas.width, canvas.height );
 
-				var context = canvas.getContext( '2d' );
-				var gradient = context.createRadialGradient( canvas.width / 2, canvas.height / 2, 0, canvas.width / 2, canvas.height / 2, canvas.width / 2 );
-				gradient.addColorStop( 0.1, 'rgba(0,0,0,1)' );
-				gradient.addColorStop( 1, 'rgba(0,0,0,0)' );
+			//
 
-				context.fillStyle = gradient;
-				context.fillRect( 0, 0, canvas.width, canvas.height );
+			var shadowTexture = new THREE.Texture( canvas );
+			shadowTexture.needsUpdate = true;
 
-				//
+			var shadowPlane = new THREE.PlaneBufferGeometry( 400, 400 );
+			var shadowMaterial = new THREE.MeshBasicMaterial( {
 
-				var shadowTexture = new THREE.Texture( canvas );
-				shadowTexture.needsUpdate = true;
+				opacity: 0.35, transparent: true, map: shadowTexture,
+				polygonOffset: false, polygonOffsetFactor: -0.5, polygonOffsetUnits: 1
 
-				var shadowPlane = new THREE.PlaneGeometry( 400, 400 );
-				var shadowMaterial = new THREE.MeshBasicMaterial( {
+			} );
 
-					opacity: 0.35, transparent: true, map: shadowTexture,
-					polygonOffset: false, polygonOffsetFactor: -0.5, polygonOffsetUnits: 1
+			function addObject( geometry, color, x, y, z, sy ) {
 
-				} );
+				var object = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { color: color, ambient: color } ) );
+				object.position.set( x, y, z );
+				object.castShadow = true;
+				object.receiveShadow = true;
+				scene.add( object );
 
 				var shadow = new THREE.Mesh( shadowPlane, shadowMaterial );
 				shadow.position.y = sy;
 				shadow.rotation.x = - Math.PI / 2;
-
 				object.add( shadow );
 
 			}
@@ -572,7 +574,12 @@
 
 			function generateDropShadowTexture( object, width, height, bluriness ) {
 
-				var renderTargetParameters = { minFilter: THREE.LinearMipmapLinearFilter, magFilter: THREE.LinearFilter, format: THREE.RGBAFormat, stencilBuffer: false };
+				var renderTargetParameters = {
+					minFilter: THREE.LinearMipmapLinearFilter,
+					magFilter: THREE.LinearFilter,
+					format: THREE.RGBAFormat,
+					stencilBuffer: false
+				};
 				var shadowTarget = new THREE.WebGLRenderTarget( width, height, renderTargetParameters );
 
 				var shadowMaterial = new THREE.MeshBasicMaterial( { color: 0x000000 } );
@@ -639,7 +646,6 @@
 
 			}
 
-
 			//
 
 			function addCar( object, x, y, z, s ) {
@@ -672,7 +678,7 @@
 				var shadowWidth  =        ss * ( bb.max.z - bb.min.z );
 				var shadowHeight = 1.25 * ss * ( bb.max.x - bb.min.x );
 
-				var shadowPlane = new THREE.PlaneGeometry( shadowWidth, shadowHeight );
+				var shadowPlane = new THREE.PlaneBufferGeometry( shadowWidth, shadowHeight );
 				var shadowMaterial = new THREE.MeshBasicMaterial( {
 					color: 0xffffff, opacity: 0.5, transparent: true, map: shadowTexture,
 					polygonOffset: false, polygonOffsetFactor: -0.5, polygonOffsetUnits: 1
@@ -979,7 +985,9 @@
 
 				camera.lookAt( cameraTarget );
 
-				renderer.clearTarget( null );
+				renderer.setRenderTarget( null );
+
+				renderer.clear();
 				composer.render( 0.1 );
 
 				renderer.shadowMapEnabled = false;