Skip to content

Commit 8da85fa

Browse files
committed
ShaderChunks: Moved logic from shaders to javascript.
1 parent f6aae66 commit 8da85fa

File tree

5 files changed

+6
-3
lines changed

5 files changed

+6
-3
lines changed

src/renderers/shaders/ShaderChunk/uv_pars_fragment.glsl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default /* glsl */`
2-
#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_CLEARCOAT_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_METALNESSMAP )
2+
#ifdef USE_UV
33
44
varying vec2 vUv;
55

src/renderers/shaders/ShaderChunk/uv_pars_vertex.glsl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default /* glsl */`
2-
#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_CLEARCOAT_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_METALNESSMAP )
2+
#ifdef USE_UV
33
44
varying vec2 vUv;
55
uniform mat3 uvTransform;

src/renderers/shaders/ShaderChunk/uv_vertex.glsl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default /* glsl */`
2-
#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_CLEARCOAT_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_METALNESSMAP )
2+
#ifdef USE_UV
33
44
vUv = ( uvTransform * vec3( uv, 1 ) ).xy;
55

src/renderers/webgl/WebGLProgram.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
400400

401401
parameters.vertexTangents ? '#define USE_TANGENT' : '',
402402
parameters.vertexColors ? '#define USE_COLOR' : '',
403+
parameters.vertexUvs ? '#define USE_UV' : '',
403404

404405
parameters.flatShading ? '#define FLAT_SHADED' : '',
405406

@@ -516,6 +517,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
516517

517518
parameters.vertexTangents ? '#define USE_TANGENT' : '',
518519
parameters.vertexColors ? '#define USE_COLOR' : '',
520+
parameters.vertexUvs ? '#define USE_UV' : '',
519521

520522
parameters.gradientMap ? '#define USE_GRADIENTMAP' : '',
521523

src/renderers/webgl/WebGLPrograms.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
166166

167167
vertexTangents: ( material.normalMap && material.vertexTangents ),
168168
vertexColors: material.vertexColors,
169+
vertexUvs: !! material.map || !! material.bumpMap || !! material.normalMap || !! material.specularMap || !! material.alphaMap || !! material.emissiveMap || !! material.roughnessMap || !! material.metalnessMap || !! material.clearCoatNormalMap,
169170

170171
fog: !! fog,
171172
useFog: material.fog,

0 commit comments

Comments
 (0)