Pass.setSize - make resizing of passes automatic through EffectComposer.setSize (mrdoob#8925)

bhouston · mrdoob · commit 463a8a62aaa4 · 2016-05-19T09:16:53.000-04:00
* add Pass.setSize() and have it called automatically by EffectComposer.setSize() * fix minor bugs in EffectComposer.setSize routine. * fix buggy prototype usage in Pass derived classes. * fix buggy prototype usage in Pass derived classes. * remove constructors as suggested by @mrdoob * fix MaskPass's prototype. * init pass side when added to compositor. * tabify EffectComposer.js * simplify for loop.
diff --git a/examples/js/postprocessing/EffectComposer.js b/examples/js/postprocessing/EffectComposer.js
@@ -48,6 +48,9 @@ THREE.EffectComposer.prototype = {
 
 		this.passes.push( pass );
 
+		var size = this.renderer.getSize();
+		pass.setSize( size.width, size.height );
+
 	},
 
 	insertPass: function ( pass, index ) {
@@ -131,35 +134,43 @@ THREE.EffectComposer.prototype = {
 		this.renderTarget1.setSize( width, height );
 		this.renderTarget2.setSize( width, height );
 
+		for ( var i = 0; i < this.passes.length; i ++ ) {
+
+			this.passes[i].setSize( width, height );
+
+		}
+
 	}
 
 };
 
 
 THREE.Pass = function () {
 
-  // if set to true, the pass is processed by the composer
-  this.enabled = true;
+	// if set to true, the pass is processed by the composer
+	this.enabled = true;
 
-  // if set to true, the pass indicates to swap read and write buffer after rendering
-  this.needsSwap = true;
+	// if set to true, the pass indicates to swap read and write buffer after rendering
+	this.needsSwap = true;
 
-  // if set to true, the pass clears its buffer before rendering
-  this.clear = false;
+	// if set to true, the pass clears its buffer before rendering
+	this.clear = false;
 
-  // if set to true, the result of the pass is rendered to screen
-  this.renderToScreen = false;
+	// if set to true, the result of the pass is rendered to screen
+	this.renderToScreen = false;
 
 };
 
 THREE.Pass.prototype = {
 
-  constructor: THREE.Pass,
+	constructor: THREE.Pass,
+
+	setSize: function( width, height ) {},
 
-  render: function ( renderer, writeBuffer, readBuffer, delta, maskActive ) {
+	render: function ( renderer, writeBuffer, readBuffer, delta, maskActive ) {
 
 		console.error( "THREE.Pass: .render() must be implemented in derived pass." );
 
-  }
+	}
 
 };
diff --git a/examples/js/postprocessing/SMAAPass.js b/examples/js/postprocessing/SMAAPass.js
diff --git a/examples/js/postprocessing/TAARenderPass.js b/examples/js/postprocessing/TAARenderPass.js
@@ -29,6 +29,7 @@ THREE.TAARenderPass = function ( scene, camera, params ) {
 THREE.TAARenderPass.JitterVectors = THREE.ManualMSAARenderPass.JitterVectors;
 
 THREE.TAARenderPass.prototype = Object.create( THREE.ManualMSAARenderPass.prototype );
+
 Object.assign( THREE.TAARenderPass.prototype, {
 
 	render: function ( renderer, writeBuffer, readBuffer, delta ) {
diff --git a/examples/webgl_postprocessing_msaa.html b/examples/webgl_postprocessing_msaa.html
@@ -153,7 +153,6 @@
 				var newWidth  = Math.floor( width / pixelRatio ) || 1;
 				var newHeight = Math.floor( height / pixelRatio ) || 1;
 				composer.setSize( newWidth, newHeight );
-				msaaRenderPass.setSize( newWidth, newHeight );
 
 			}
 
diff --git a/examples/webgl_postprocessing_smaa.html b/examples/webgl_postprocessing_smaa.html
@@ -98,7 +98,6 @@
 				var newWidth  = Math.floor( width / pixelRatio ) || 1;
 				var newHeight = Math.floor( height / pixelRatio ) || 1;
 				composer.setSize( newWidth, newHeight );
-				pass.setSize( newWidth, newHeight );
 
 			}
 
diff --git a/examples/webgl_postprocessing_taa.html b/examples/webgl_postprocessing_taa.html
@@ -172,7 +172,6 @@
 				var newWidth  = Math.floor( width / pixelRatio ) || 1;
 				var newHeight = Math.floor( height / pixelRatio ) || 1;
 				composer.setSize( newWidth, newHeight );
-				taaRenderPass.setSize( newWidth, newHeight );
 
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,6 @@`
`153`	`153`	`var newWidth = Math.floor( width / pixelRatio ) \|\| 1;`
`154`	`154`	`var newHeight = Math.floor( height / pixelRatio ) \|\| 1;`
`155`	`155`	`composer.setSize( newWidth, newHeight );`
`156`		`- msaaRenderPass.setSize( newWidth, newHeight );`
`157`	`156`
`158`	`157`	`}`
`159`	`158`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@`
`98`	`98`	`var newWidth = Math.floor( width / pixelRatio ) \|\| 1;`
`99`	`99`	`var newHeight = Math.floor( height / pixelRatio ) \|\| 1;`
`100`	`100`	`composer.setSize( newWidth, newHeight );`
`101`		`- pass.setSize( newWidth, newHeight );`
`102`	`101`
`103`	`102`	`}`
`104`	`103`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,6 @@`
`172`	`172`	`var newWidth = Math.floor( width / pixelRatio ) \|\| 1;`
`173`	`173`	`var newHeight = Math.floor( height / pixelRatio ) \|\| 1;`
`174`	`174`	`composer.setSize( newWidth, newHeight );`
`175`		`- taaRenderPass.setSize( newWidth, newHeight );`
`176`	`175`
`177`	`176`	`}`
`178`	`177`