home/three.js
2
0
Fork 0
mirror of https://github.com/wahyd4/three.js.git synced 2026-08-24 20:36:00 +10:00
Code Issues Packages Projects Releases Wiki Activity

Renamed MeshShaderMaterial => ShaderMaterial

Browse Source
This commit is contained in:
alteredq
2011-09-12 19:17:20 +02:00
parent fe1ed04b02
commit e298ac6814
42 changed files with 173 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/js/postprocessing/BloomPass.js
+2 -2
View File
@@ -24,7 +24,7 @@ THREE.BloomPass = function( strength, kernelSize, sigma, resolution ) {
this.screenUniforms[ "opacity" ].value = strength;
this.materialScreen = new THREE.MeshShaderMaterial( {
this.materialScreen = new THREE.ShaderMaterial( {
uniforms: this.screenUniforms,
vertexShader: screenShader.vertexShader,
@@ -43,7 +43,7 @@ THREE.BloomPass = function( strength, kernelSize, sigma, resolution ) {
this.convolutionUniforms[ "uImageIncrement" ].value = THREE.BloomPass.blurx;
this.convolutionUniforms[ "cKernel" ].value = THREE.ShaderExtras.buildKernel( sigma );
this.materialConvolution = new THREE.MeshShaderMaterial( {
this.materialConvolution = new THREE.ShaderMaterial( {
uniforms: this.convolutionUniforms,
vertexShader: "#define KERNEL_SIZE " + kernelSize + ".0\n" + convolutionShader.vertexShader,
examples/js/postprocessing/DotScreenPass.js
+1 -1
View File
@@ -14,7 +14,7 @@ THREE.DotScreenPass = function( center, angle, scale ) {
if ( angle !== undefined ) this.uniforms[ "angle"].value = angle;
if ( scale !== undefined ) this.uniforms[ "scale"].value = scale;
this.material = new THREE.MeshShaderMaterial( {
this.material = new THREE.ShaderMaterial( {
uniforms: this.uniforms,
vertexShader: shader.vertexShader,
examples/js/postprocessing/FilmPass.js
+1 -1
View File
@@ -8,7 +8,7 @@ THREE.FilmPass = function( noiseIntensity, scanlinesIntensity, scanlinesCount, g
this.uniforms = THREE.UniformsUtils.clone( shader.uniforms );
this.material = new THREE.MeshShaderMaterial( {
this.material = new THREE.ShaderMaterial( {
uniforms: this.uniforms,
vertexShader: shader.vertexShader,
examples/js/postprocessing/ShaderPass.js
+1 -1
View File
@@ -8,7 +8,7 @@ THREE.ShaderPass = function( shader, textureID ) {
this.uniforms = THREE.UniformsUtils.clone( shader.uniforms );
this.material = new THREE.MeshShaderMaterial( {
this.material = new THREE.ShaderMaterial( {
uniforms: this.uniforms,
vertexShader: shader.vertexShader,
examples/js/postprocessing/TexturePass.js
+1 -1
View File
@@ -11,7 +11,7 @@ THREE.TexturePass = function( texture, opacity ) {
this.uniforms[ "opacity" ].value = ( opacity !== undefined ) ? opacity : 1.0;
this.uniforms[ "tDiffuse" ].texture = texture;
this.material = new THREE.MeshShaderMaterial( {
this.material = new THREE.ShaderMaterial( {
uniforms: this.uniforms,
vertexShader: shader.vertexShader,