Browse Source

EffectComposer: Clean up.

Mr.doob 4 years ago
parent
commit
0e8e04305a

+ 5 - 4
examples/js/postprocessing/EffectComposer.js

@@ -261,11 +261,12 @@ Object.assign( THREE.Pass.prototype, {
 THREE.Pass.FullScreenQuad = ( function () {
 
 	var camera = new THREE.OrthographicCamera( - 1, 1, 1, - 1, 0, 1 );
+
+	// https://github.com/mrdoob/three.js/pull/21358
+
 	var geometry = new THREE.BufferGeometry();
-	const vertices = new Float32Array([-1, 3, 0, -1, -1, 0, 3, -1, 0]);
-	geometry.setAttribute("position", new THREE.BufferAttribute(vertices, 3));
-	const uv = new Float32Array([0, 2, 0, 0, 2, 0]);
-	geometry.setAttribute("uv", new THREE.BufferAttribute(uv, 2));
+	geometry.setAttribute( 'position', new THREE.Float32BufferAttribute( [ - 1, 3, 0, - 1, - 1, 0, 3, - 1, 0 ], 3 ) );
+	geometry.setAttribute( 'uv', new THREE.Float32BufferAttribute( [ 0, 2, 0, 0, 2, 0 ], 2 ) );
 
 	var FullScreenQuad = function ( material ) {
 

+ 7 - 6
examples/jsm/postprocessing/EffectComposer.js

@@ -1,10 +1,10 @@
 import {
+	BufferGeometry,
 	Clock,
+	Float32BufferAttribute,
 	LinearFilter,
 	Mesh,
 	OrthographicCamera,
-	BufferGeometry,
-	BufferAttribute,
 	RGBAFormat,
 	Vector2,
 	WebGLRenderTarget
@@ -277,11 +277,12 @@ Object.assign( Pass.prototype, {
 Pass.FullScreenQuad = ( function () {
 
 	var camera = new OrthographicCamera( - 1, 1, 1, - 1, 0, 1 );
+
+	// https://github.com/mrdoob/three.js/pull/21358
+
 	var geometry = new BufferGeometry();
-	const vertices = new Float32Array([-1, 3, 0, -1, -1, 0, 3, -1, 0]);
-	geometry.setAttribute("position", new BufferAttribute(vertices, 3));
-	const uv = new Float32Array([0, 2, 0, 0, 2, 0]);
-	geometry.setAttribute("uv", new BufferAttribute(uv, 2));
+	geometry.setAttribute( 'position', new Float32BufferAttribute( [ - 1, 3, 0, - 1, - 1, 0, 3, - 1, 0 ], 3 ) );
+	geometry.setAttribute( 'uv', new Float32BufferAttribute( [ 0, 2, 0, 0, 2, 0 ], 2 ) );
 
 	var FullScreenQuad = function ( material ) {
 

+ 7 - 6
examples/jsm/postprocessing/Pass.js

@@ -1,7 +1,7 @@
 import {
-	OrthographicCamera,
 	BufferGeometry,
-	BufferAttribute,
+	Float32BufferAttribute,
+	OrthographicCamera,
 	Mesh
 } from '../../../build/three.module.js';
 
@@ -42,11 +42,12 @@ Object.assign( Pass.prototype, {
 Pass.FullScreenQuad = ( function () {
 
 	var camera = new OrthographicCamera( - 1, 1, 1, - 1, 0, 1 );
+
+	// https://github.com/mrdoob/three.js/pull/21358
+
 	var geometry = new BufferGeometry();
-	const vertices = new Float32Array([-1, 3, 0, -1, -1, 0, 3, -1, 0]);
-	geometry.setAttribute("position", new BufferAttribute(vertices, 3));
-	const uv = new Float32Array([0, 2, 0, 0, 2, 0]);
-	geometry.setAttribute("uv", new BufferAttribute(uv, 2));
+	geometry.setAttribute( 'position', new Float32BufferAttribute( [ - 1, 3, 0, - 1, - 1, 0, 3, - 1, 0 ], 3 ) );
+	geometry.setAttribute( 'uv', new Float32BufferAttribute( [ 0, 2, 0, 0, 2, 0 ], 2 ) );
 
 	var FullScreenQuad = function ( material ) {