Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Examples: Update from GammaCorrectionShader to OutputPass #26129

Merged
merged 3 commits into from
Jun 14, 2023
Merged

Examples: Update from GammaCorrectionShader to OutputPass #26129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4235c64
GammaCorrectionShader: Deprecate in favor of OutputPass
donmccurdy May 24, 2023
008701f
Update more examples, remove GammaCorrectionShader deprecation
donmccurdy May 24, 2023
3c5bf85
Examples: Revert OutputPass in failing examples.
donmccurdy Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions examples/misc_controls_fly.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@
import { EffectComposer } from 'three/addons/postprocessing/EffectComposer.js';
import { RenderPass } from 'three/addons/postprocessing/RenderPass.js';
import { FilmPass } from 'three/addons/postprocessing/FilmPass.js';
import { ShaderPass } from 'three/addons/postprocessing/ShaderPass.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';

const radius = 6371;
const tilt = 0.41;
Expand Down Expand Up @@ -229,13 +228,13 @@

const renderModel = new RenderPass( scene, camera );
const effectFilm = new FilmPass( 0.35, 0.75, 2048, false );
const gammaCorrection = new ShaderPass( GammaCorrectionShader );
const outputPass = new OutputPass();

composer = new EffectComposer( renderer );

composer.addPass( renderModel );
composer.addPass( effectFilm );
composer.addPass( gammaCorrection );
composer.addPass( outputPass );

}

Expand Down
5 changes: 2 additions & 3 deletions examples/webgl2_multisampled_renderbuffers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@

import { EffectComposer } from 'three/addons/postprocessing/EffectComposer.js';
import { RenderPass } from 'three/addons/postprocessing/RenderPass.js';
import { ShaderPass } from 'three/addons/postprocessing/ShaderPass.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';
import WebGL from 'three/addons/capabilities/WebGL.js';
import { GUI } from 'three/addons/libs/lil-gui.module.min.js';

Expand Down Expand Up @@ -142,7 +141,7 @@
const renderTarget = new THREE.WebGLRenderTarget( size.width, size.height, { samples: 4 } );

const renderPass = new RenderPass( scene, camera );
const outputPass = new ShaderPass( GammaCorrectionShader );
const outputPass = new OutputPass();

//

Expand Down
6 changes: 3 additions & 3 deletions examples/webgl_materials_normalmap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import { BleachBypassShader } from 'three/addons/shaders/BleachBypassShader.js';
import { ColorCorrectionShader } from 'three/addons/shaders/ColorCorrectionShader.js';
import { FXAAShader } from 'three/addons/shaders/FXAAShader.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';

let container, stats, loader;

Expand Down Expand Up @@ -133,7 +133,7 @@

const effectBleach = new ShaderPass( BleachBypassShader );
const effectColor = new ShaderPass( ColorCorrectionShader );
const gammaCorrection = new ShaderPass( GammaCorrectionShader );
const outputPass = new OutputPass();
effectFXAA = new ShaderPass( FXAAShader );

effectFXAA.uniforms[ 'resolution' ].value.set( 1 / window.innerWidth, 1 / window.innerHeight );
Expand All @@ -150,7 +150,7 @@
composer.addPass( renderModel );
composer.addPass( effectBleach );
composer.addPass( effectColor );
composer.addPass( gammaCorrection );
composer.addPass( outputPass );
composer.addPass( effectFXAA );

// EVENTS
Expand Down
4 changes: 2 additions & 2 deletions examples/webgl_materials_video.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
import { RenderPass } from 'three/addons/postprocessing/RenderPass.js';
import { ShaderPass } from 'three/addons/postprocessing/ShaderPass.js';
import { BloomPass } from 'three/addons/postprocessing/BloomPass.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';

let container;

Expand Down Expand Up @@ -172,7 +172,7 @@

const renderPass = new RenderPass( scene, camera );
const bloomPass = new BloomPass( 1.3 );
const outputPass = new ShaderPass( GammaCorrectionShader );
const outputPass = new OutputPass();

composer = new EffectComposer( renderer );

Expand Down
4 changes: 2 additions & 2 deletions examples/webgl_points_dynamic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import { FilmPass } from 'three/addons/postprocessing/FilmPass.js';
import { FocusShader } from 'three/addons/shaders/FocusShader.js';
import { OBJLoader } from 'three/addons/loaders/OBJLoader.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';

let camera, scene, renderer, mesh;

Expand Down Expand Up @@ -122,7 +122,7 @@
effectFocus.uniforms[ 'screenWidth' ].value = window.innerWidth * window.devicePixelRatio;
effectFocus.uniforms[ 'screenHeight' ].value = window.innerHeight * window.devicePixelRatio;

const outputPass = new ShaderPass( GammaCorrectionShader );
const outputPass = new OutputPass();

composer = new EffectComposer( renderer );

Expand Down
4 changes: 2 additions & 2 deletions examples/webgl_postprocessing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

import { RGBShiftShader } from 'three/addons/shaders/RGBShiftShader.js';
import { DotScreenShader } from 'three/addons/shaders/DotScreenShader.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';

let camera, renderer, composer;
let object;
Expand Down Expand Up @@ -90,7 +90,7 @@
effect2.uniforms[ 'amount' ].value = 0.0015;
composer.addPass( effect2 );

const effect3 = new ShaderPass( GammaCorrectionShader );
const effect3 = new OutputPass();
composer.addPass( effect3 );

//
Expand Down
5 changes: 2 additions & 3 deletions examples/webgl_postprocessing_afterimage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
import { EffectComposer } from 'three/addons/postprocessing/EffectComposer.js';
import { RenderPass } from 'three/addons/postprocessing/RenderPass.js';
import { AfterimagePass } from 'three/addons/postprocessing/AfterimagePass.js';
import { ShaderPass } from 'three/addons/postprocessing/ShaderPass.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';

let camera, scene, renderer, composer;
let mesh;
Expand Down Expand Up @@ -74,7 +73,7 @@
afterimagePass = new AfterimagePass();
composer.addPass( afterimagePass );

const outputPass = new ShaderPass( GammaCorrectionShader );
const outputPass = new OutputPass();
composer.addPass( outputPass );

window.addEventListener( 'resize', onWindowResize );
Expand Down
5 changes: 2 additions & 3 deletions examples/webgl_postprocessing_backgrounds.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@
import { RenderPass } from 'three/addons/postprocessing/RenderPass.js';
import { TexturePass } from 'three/addons/postprocessing/TexturePass.js';
import { CubeTexturePass } from 'three/addons/postprocessing/CubeTexturePass.js';
import { ShaderPass } from 'three/addons/postprocessing/ShaderPass.js';
import { ClearPass } from 'three/addons/postprocessing/ClearPass.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';
import { OrbitControls } from 'three/addons/controls/OrbitControls.js';

let scene, renderer, composer;
Expand Down Expand Up @@ -187,7 +186,7 @@
renderPass.clear = false;
composer.addPass( renderPass );

const outputPass = new ShaderPass( GammaCorrectionShader );
const outputPass = new OutputPass();
composer.addPass( outputPass );

const controls = new OrbitControls( cameraP, renderer.domElement );
Expand Down
5 changes: 2 additions & 3 deletions examples/webgl_postprocessing_dof.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
import { EffectComposer } from 'three/addons/postprocessing/EffectComposer.js';
import { RenderPass } from 'three/addons/postprocessing/RenderPass.js';
import { BokehPass } from 'three/addons/postprocessing/BokehPass.js';
import { ShaderPass } from 'three/addons/postprocessing/ShaderPass.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';

let camera, scene, renderer, stats,
singleMaterial, zmaterial,
Expand Down Expand Up @@ -212,7 +211,7 @@
maxblur: 0.01
} );

const outputPass = new ShaderPass( GammaCorrectionShader );
const outputPass = new OutputPass();

const composer = new EffectComposer( renderer );

Expand Down
5 changes: 2 additions & 3 deletions examples/webgl_postprocessing_glitch.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ <h2>WARNING</h2>
import { EffectComposer } from 'three/addons/postprocessing/EffectComposer.js';
import { RenderPass } from 'three/addons/postprocessing/RenderPass.js';
import { GlitchPass } from 'three/addons/postprocessing/GlitchPass.js';
import { ShaderPass } from 'three/addons/postprocessing/ShaderPass.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';

let camera, scene, renderer, composer;
let object, light;
Expand Down Expand Up @@ -113,7 +112,7 @@ <h2>WARNING</h2>
glitchPass = new GlitchPass();
composer.addPass( glitchPass );

const outputPass = new ShaderPass( GammaCorrectionShader );
const outputPass = new OutputPass();
composer.addPass( outputPass );


Expand Down
5 changes: 2 additions & 3 deletions examples/webgl_postprocessing_masking.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@
import * as THREE from 'three';

import { EffectComposer } from 'three/addons/postprocessing/EffectComposer.js';
import { ShaderPass } from 'three/addons/postprocessing/ShaderPass.js';
import { TexturePass } from 'three/addons/postprocessing/TexturePass.js';
import { ClearPass } from 'three/addons/postprocessing/ClearPass.js';
import { MaskPass, ClearMaskPass } from 'three/addons/postprocessing/MaskPass.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';

let camera, composer, renderer;
let box, torus;
Expand Down Expand Up @@ -79,7 +78,7 @@
const texturePass1 = new TexturePass( texture1 );
const texturePass2 = new TexturePass( texture2 );

const outputPass = new ShaderPass( GammaCorrectionShader );
const outputPass = new OutputPass();

const parameters = {
stencilBuffer: true
Expand Down
6 changes: 3 additions & 3 deletions examples/webgl_postprocessing_outline.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import { RenderPass } from 'three/addons/postprocessing/RenderPass.js';
import { ShaderPass } from 'three/addons/postprocessing/ShaderPass.js';
import { OutlinePass } from 'three/addons/postprocessing/OutlinePass.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';
import { FXAAShader } from 'three/addons/shaders/FXAAShader.js';

let container, stats;
Expand Down Expand Up @@ -262,8 +262,8 @@

} );

const gammaPass = new ShaderPass( GammaCorrectionShader );
composer.addPass( gammaPass );
const outputPass = new OutputPass();
composer.addPass( outputPass );

effectFXAA = new ShaderPass( FXAAShader );
effectFXAA.uniforms[ 'resolution' ].value.set( 1 / window.innerWidth, 1 / window.innerHeight );
Expand Down
5 changes: 2 additions & 3 deletions examples/webgl_postprocessing_pixel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
import { EffectComposer } from 'three/addons/postprocessing/EffectComposer.js';
import { RenderPixelatedPass } from 'three/addons/postprocessing/RenderPixelatedPass.js';
import { ShaderPass } from 'three/addons/postprocessing/ShaderPass.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';
import { GUI } from 'three/addons/libs/lil-gui.module.min.js';

let camera, scene, renderer, composer, crystalMesh, clock;
Expand Down Expand Up @@ -69,7 +68,7 @@
const renderPixelatedPass = new RenderPixelatedPass( 6, scene, camera );
composer.addPass( renderPixelatedPass );

const outputPass = new ShaderPass( GammaCorrectionShader );
const outputPass = new OutputPass();
composer.addPass( outputPass );

window.addEventListener( 'resize', onWindowResize );
Expand Down
5 changes: 2 additions & 3 deletions examples/webgl_postprocessing_sao.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
import { EffectComposer } from 'three/addons/postprocessing/EffectComposer.js';
import { RenderPass } from 'three/addons/postprocessing/RenderPass.js';
import { SAOPass } from 'three/addons/postprocessing/SAOPass.js';
import { ShaderPass } from 'three/addons/postprocessing/ShaderPass.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';

let container, stats;
let camera, scene, renderer;
Expand Down Expand Up @@ -120,7 +119,7 @@
composer.addPass( renderPass );
saoPass = new SAOPass( scene, camera, false, true );
composer.addPass( saoPass );
const outputPass = new ShaderPass( GammaCorrectionShader );
const outputPass = new OutputPass();
composer.addPass( outputPass );

// Init gui
Expand Down
5 changes: 2 additions & 3 deletions examples/webgl_postprocessing_smaa.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
import { EffectComposer } from 'three/addons/postprocessing/EffectComposer.js';
import { RenderPass } from 'three/addons/postprocessing/RenderPass.js';
import { SMAAPass } from 'three/addons/postprocessing/SMAAPass.js';
import { ShaderPass } from 'three/addons/postprocessing/ShaderPass.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';


let camera, scene, renderer, composer, stats;
Expand Down Expand Up @@ -88,7 +87,7 @@
const pass = new SMAAPass( window.innerWidth * renderer.getPixelRatio(), window.innerHeight * renderer.getPixelRatio() );
composer.addPass( pass );

const outputPass = new ShaderPass( GammaCorrectionShader );
const outputPass = new OutputPass();
composer.addPass( outputPass );

window.addEventListener( 'resize', onWindowResize );
Expand Down
5 changes: 2 additions & 3 deletions examples/webgl_postprocessing_ssaa.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@
import { GUI } from 'three/addons/libs/lil-gui.module.min.js';

import { EffectComposer } from 'three/addons/postprocessing/EffectComposer.js';
import { ShaderPass } from 'three/addons/postprocessing/ShaderPass.js';
import { SSAARenderPass } from 'three/addons/postprocessing/SSAARenderPass.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';

let scene, renderer, composer;
let cameraP, ssaaRenderPassP;
Expand Down Expand Up @@ -172,7 +171,7 @@
composer.addPass( ssaaRenderPassP );
ssaaRenderPassO = new SSAARenderPass( scene, cameraO );
composer.addPass( ssaaRenderPassO );
const outputPass = new ShaderPass( GammaCorrectionShader );
const outputPass = new OutputPass();
composer.addPass( outputPass );

window.addEventListener( 'resize', onWindowResize );
Expand Down
5 changes: 2 additions & 3 deletions examples/webgl_postprocessing_ssao.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@

import { EffectComposer } from 'three/addons/postprocessing/EffectComposer.js';
import { SSAOPass } from 'three/addons/postprocessing/SSAOPass.js';
import { ShaderPass } from 'three/addons/postprocessing/ShaderPass.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';

let container, stats;
let camera, scene, renderer;
Expand Down Expand Up @@ -103,7 +102,7 @@
ssaoPass.kernelRadius = 16;
composer.addPass( ssaoPass );

const outputPass = new ShaderPass( GammaCorrectionShader );
const outputPass = new OutputPass();
composer.addPass( outputPass );

// Init gui
Expand Down
5 changes: 2 additions & 3 deletions examples/webgl_postprocessing_ssr.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@
import { GUI } from 'three/addons/libs/lil-gui.module.min.js';
import { EffectComposer } from 'three/addons/postprocessing/EffectComposer.js';
import { SSRPass } from 'three/addons/postprocessing/SSRPass.js';
import { ShaderPass } from 'three/addons/postprocessing/ShaderPass.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';
import { ReflectorForSSRPass } from 'three/addons/objects/ReflectorForSSRPass.js';

import { DRACOLoader } from 'three/addons/loaders/DRACOLoader.js';
Expand Down Expand Up @@ -190,7 +189,7 @@
} );

composer.addPass( ssrPass );
composer.addPass( new ShaderPass( GammaCorrectionShader ) );
composer.addPass( new OutputPass() );

// GUI

Expand Down
5 changes: 2 additions & 3 deletions examples/webgl_postprocessing_taa.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@

import { EffectComposer } from 'three/addons/postprocessing/EffectComposer.js';
import { RenderPass } from 'three/addons/postprocessing/RenderPass.js';
import { ShaderPass } from 'three/addons/postprocessing/ShaderPass.js';
import { TAARenderPass } from 'three/addons/postprocessing/TAARenderPass.js';
import { GammaCorrectionShader } from 'three/addons/shaders/GammaCorrectionShader.js';
import { OutputPass } from 'three/addons/postprocessing/OutputPass.js';

let camera, scene, renderer, composer, taaRenderPass, renderPass;
let gui, stats;
Expand Down Expand Up @@ -145,7 +144,7 @@
renderPass.enabled = false;
composer.addPass( renderPass );

const outputPass = new ShaderPass( GammaCorrectionShader );
const outputPass = new OutputPass();
composer.addPass( outputPass );

window.addEventListener( 'resize', onWindowResize );
Expand Down
Loading