提交 970f47a2 编写于 作者: M Mugen87

WebGLPrograms: Enable uvs only in vertex shader.

上级 117e86ae
export default /* glsl */` export default /* glsl */`
#ifdef USE_UV #if ( defined( USE_UV ) && ! defined( UVS_VERTEX_ONLY ) )
varying vec2 vUv; varying vec2 vUv;
......
export default /* glsl */` export default /* glsl */`
#ifdef USE_UV #ifdef USE_UV
varying vec2 vUv; #ifdef UVS_VERTEX_ONLY
vec2 vUv;
#else
varying vec2 vUv;
#endif
uniform mat3 uvTransform; uniform mat3 uvTransform;
#endif #endif
......
...@@ -470,6 +470,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters ...@@ -470,6 +470,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
parameters.vertexTangents ? '#define USE_TANGENT' : '', parameters.vertexTangents ? '#define USE_TANGENT' : '',
parameters.vertexColors ? '#define USE_COLOR' : '', parameters.vertexColors ? '#define USE_COLOR' : '',
parameters.vertexUvs ? '#define USE_UV' : '', parameters.vertexUvs ? '#define USE_UV' : '',
parameters.uvsVertexOnly ? '#define UVS_VERTEX_ONLY' : '',
parameters.flatShading ? '#define FLAT_SHADED' : '', parameters.flatShading ? '#define FLAT_SHADED' : '',
...@@ -595,6 +596,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters ...@@ -595,6 +596,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters
parameters.vertexTangents ? '#define USE_TANGENT' : '', parameters.vertexTangents ? '#define USE_TANGENT' : '',
parameters.vertexColors ? '#define USE_COLOR' : '', parameters.vertexColors ? '#define USE_COLOR' : '',
parameters.vertexUvs ? '#define USE_UV' : '', parameters.vertexUvs ? '#define USE_UV' : '',
parameters.uvsVertexOnly ? '#define UVS_VERTEX_ONLY' : '',
parameters.gradientMap ? '#define USE_GRADIENTMAP' : '', parameters.gradientMap ? '#define USE_GRADIENTMAP' : '',
......
...@@ -39,7 +39,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) { ...@@ -39,7 +39,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
"map", "mapEncoding", "matcap", "matcapEncoding", "envMap", "envMapMode", "envMapEncoding", "envMapCubeUV", "map", "mapEncoding", "matcap", "matcapEncoding", "envMap", "envMapMode", "envMapEncoding", "envMapCubeUV",
"lightMap", "aoMap", "emissiveMap", "emissiveMapEncoding", "bumpMap", "normalMap", "objectSpaceNormalMap", "tangentSpaceNormalMap", "clearcoatNormalMap", "displacementMap", "specularMap", "lightMap", "aoMap", "emissiveMap", "emissiveMapEncoding", "bumpMap", "normalMap", "objectSpaceNormalMap", "tangentSpaceNormalMap", "clearcoatNormalMap", "displacementMap", "specularMap",
"roughnessMap", "metalnessMap", "gradientMap", "roughnessMap", "metalnessMap", "gradientMap",
"alphaMap", "combine", "vertexColors", "vertexTangents", "vertexUvs", "fog", "useFog", "fogExp2", "alphaMap", "combine", "vertexColors", "vertexTangents", "vertexUvs", "uvsVertexOnly", "fog", "useFog", "fogExp2",
"flatShading", "sizeAttenuation", "logarithmicDepthBuffer", "skinning", "flatShading", "sizeAttenuation", "logarithmicDepthBuffer", "skinning",
"maxBones", "useVertexTexture", "morphTargets", "morphNormals", "maxBones", "useVertexTexture", "morphTargets", "morphNormals",
"maxMorphTargets", "maxMorphNormals", "premultipliedAlpha", "maxMorphTargets", "maxMorphNormals", "premultipliedAlpha",
...@@ -186,6 +186,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) { ...@@ -186,6 +186,7 @@ function WebGLPrograms( renderer, extensions, capabilities ) {
vertexTangents: ( material.normalMap && material.vertexTangents ), vertexTangents: ( material.normalMap && material.vertexTangents ),
vertexColors: material.vertexColors, vertexColors: material.vertexColors,
vertexUvs: !! material.map || !! material.bumpMap || !! material.normalMap || !! material.specularMap || !! material.alphaMap || !! material.emissiveMap || !! material.roughnessMap || !! material.metalnessMap || !! material.clearcoatNormalMap || !! material.displacementMap, vertexUvs: !! material.map || !! material.bumpMap || !! material.normalMap || !! material.specularMap || !! material.alphaMap || !! material.emissiveMap || !! material.roughnessMap || !! material.metalnessMap || !! material.clearcoatNormalMap || !! material.displacementMap,
uvsVertexOnly: ! ( !! material.map || !! material.bumpMap || !! material.normalMap || !! material.specularMap || !! material.alphaMap || !! material.emissiveMap || !! material.roughnessMap || !! material.metalnessMap || !! material.clearcoatNormalMap ) && !! material.displacementMap,
fog: !! fog, fog: !! fog,
useFog: material.fog, useFog: material.fog,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册