From 2a67d081e0d0d53c0cde377bd9af8ddd2ccccab9 Mon Sep 17 00:00:00 2001
From: liteng <930372551@qq.com>
Date: Thu, 6 Jun 2019 07:32:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ShadowEditor.Web/test/js/EffectComposer.js | 48 ---------------
ShadowEditor.Web/test/js/ShaderPass.js | 71 ----------------------
ShadowEditor.Web/test/stroke.html | 1 -
3 files changed, 120 deletions(-)
delete mode 100644 ShadowEditor.Web/test/js/ShaderPass.js
diff --git a/ShadowEditor.Web/test/js/EffectComposer.js b/ShadowEditor.Web/test/js/EffectComposer.js
index 034e97c4..7be7c02d 100644
--- a/ShadowEditor.Web/test/js/EffectComposer.js
+++ b/ShadowEditor.Web/test/js/EffectComposer.js
@@ -30,22 +30,6 @@ THREE.EffectComposer = function ( renderer, renderTarget ) {
this.passes = [];
- // dependencies
-
- if ( THREE.CopyShader === undefined ) {
-
- console.error( 'THREE.EffectComposer relies on THREE.CopyShader' );
-
- }
-
- if ( THREE.ShaderPass === undefined ) {
-
- console.error( 'THREE.EffectComposer relies on THREE.ShaderPass' );
-
- }
-
- this.copyPass = new THREE.ShaderPass( THREE.CopyShader );
-
this._previousFrameTime = Date.now();
};
@@ -101,38 +85,6 @@ Object.assign( THREE.EffectComposer.prototype, {
pass.render( this.renderer, this.writeBuffer, this.readBuffer, deltaTime, maskActive );
- if ( pass.needsSwap ) {
-
- if ( maskActive ) {
-
- var context = this.renderer.context;
-
- context.stencilFunc( context.NOTEQUAL, 1, 0xffffffff );
-
- this.copyPass.render( this.renderer, this.writeBuffer, this.readBuffer, deltaTime );
-
- context.stencilFunc( context.EQUAL, 1, 0xffffffff );
-
- }
-
- this.swapBuffers();
-
- }
-
- if ( THREE.MaskPass !== undefined ) {
-
- if ( pass instanceof THREE.MaskPass ) {
-
- maskActive = true;
-
- } else if ( pass instanceof THREE.ClearMaskPass ) {
-
- maskActive = false;
-
- }
-
- }
-
}
this.renderer.setRenderTarget( currentRenderTarget );
diff --git a/ShadowEditor.Web/test/js/ShaderPass.js b/ShadowEditor.Web/test/js/ShaderPass.js
deleted file mode 100644
index 68ad25a0..00000000
--- a/ShadowEditor.Web/test/js/ShaderPass.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * @author alteredq / http://alteredqualia.com/
- */
-
-THREE.ShaderPass = function ( shader, textureID ) {
-
- THREE.Pass.call( this );
-
- this.textureID = ( textureID !== undefined ) ? textureID : "tDiffuse";
-
- if ( shader instanceof THREE.ShaderMaterial ) {
-
- this.uniforms = shader.uniforms;
-
- this.material = shader;
-
- } else if ( shader ) {
-
- this.uniforms = THREE.UniformsUtils.clone( shader.uniforms );
-
- this.material = new THREE.ShaderMaterial( {
-
- defines: Object.assign( {}, shader.defines ),
- uniforms: this.uniforms,
- vertexShader: shader.vertexShader,
- fragmentShader: shader.fragmentShader
-
- } );
-
- }
-
- this.camera = new THREE.OrthographicCamera( - 1, 1, 1, - 1, 0, 1 );
- this.scene = new THREE.Scene();
-
- this.quad = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ), null );
- this.quad.frustumCulled = false; // Avoid getting clipped
- this.scene.add( this.quad );
-
-};
-
-THREE.ShaderPass.prototype = Object.assign( Object.create( THREE.Pass.prototype ), {
-
- constructor: THREE.ShaderPass,
-
- render: function ( renderer, writeBuffer, readBuffer, deltaTime, maskActive ) {
-
- if ( this.uniforms[ this.textureID ] ) {
-
- this.uniforms[ this.textureID ].value = readBuffer.texture;
-
- }
-
- this.quad.material = this.material;
-
- if ( this.renderToScreen ) {
-
- renderer.setRenderTarget( null );
- renderer.render( this.scene, this.camera );
-
- } else {
-
- renderer.setRenderTarget( writeBuffer );
- // TODO: Avoid using autoClear properties, see https://github.com/mrdoob/three.js/pull/15571#issuecomment-465669600
- if ( this.clear ) renderer.clear( renderer.autoClearColor, renderer.autoClearDepth, renderer.autoClearStencil );
- renderer.render( this.scene, this.camera );
-
- }
-
- }
-
-} );
diff --git a/ShadowEditor.Web/test/stroke.html b/ShadowEditor.Web/test/stroke.html
index 1cb938ba..4cc8eaf2 100644
--- a/ShadowEditor.Web/test/stroke.html
+++ b/ShadowEditor.Web/test/stroke.html
@@ -24,7 +24,6 @@
-