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

WebGLRenderer: Ensure program properties are booleans. #22244

Merged
merged 1 commit into from
Aug 3, 2021
+8 −8
Merged

WebGLRenderer: Ensure program properties are booleans. #22244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/renderers/WebGLRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1516,10 +1516,10 @@ function WebGLRenderer( parameters = {} ) {
const environment = material.isMeshStandardMaterial ? scene.environment : null;
const encoding = ( _currentRenderTarget === null ) ? _this.outputEncoding : _currentRenderTarget.texture.encoding;
const envMap = ( material.isMeshStandardMaterial ? cubeuvmaps : cubemaps ).get( material.envMap || environment );
const vertexAlphas = material.vertexColors === true && object.geometry && object.geometry.attributes.color && object.geometry.attributes.color.itemSize === 4;
const vertexTangents = object.geometry && object.geometry.attributes.tangent;
const morphTargets = object.geometry && object.geometry.morphAttributes.position;
const morphNormals = object.geometry && object.geometry.morphAttributes.normal;
const vertexAlphas = material.vertexColors === true && !! object.geometry && !! object.geometry.attributes.color && object.geometry.attributes.color.itemSize === 4;
const vertexTangents = !! object.geometry && !! object.geometry.attributes.tangent;
const morphTargets = !! object.geometry && !! object.geometry.morphAttributes.position;
const morphNormals = !! object.geometry && !! object.geometry.morphAttributes.normal;

const materialProperties = properties.get( material );
const lights = currentRenderState.state.lights;
Expand Down
8 changes: 4 additions & 4 deletions src/renderers/webgl/WebGLPrograms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities

combine: material.combine,

vertexTangents: ( material.normalMap && object.geometry && object.geometry.attributes.tangent ),
vertexTangents: ( !! material.normalMap && !! object.geometry && !! object.geometry.attributes.tangent ),
vertexColors: material.vertexColors,
vertexAlphas: material.vertexColors === true && object.geometry && object.geometry.attributes.color && object.geometry.attributes.color.itemSize === 4,
vertexAlphas: material.vertexColors === true && !! object.geometry && !! object.geometry.attributes.color && object.geometry.attributes.color.itemSize === 4,
vertexUvs: !! material.map || !! material.bumpMap || !! material.normalMap || !! material.specularMap || !! material.alphaMap || !! material.emissiveMap || !! material.roughnessMap || !! material.metalnessMap || !! material.clearcoatMap || !! material.clearcoatRoughnessMap || !! material.clearcoatNormalMap || !! material.displacementMap || !! material.transmissionMap || !! material.thicknessMap || !! material.specularIntensityMap || !! material.specularTintMap,
uvsVertexOnly: ! ( !! material.map || !! material.bumpMap || !! material.normalMap || !! material.specularMap || !! material.alphaMap || !! material.emissiveMap || !! material.roughnessMap || !! material.metalnessMap || !! material.clearcoatNormalMap || !! material.transmission || !! material.transmissionMap || !! material.thicknessMap || !! material.specularIntensityMap || !! material.specularTintMap ) && !! material.displacementMap,

Expand All @@ -231,8 +231,8 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
maxBones: maxBones,
useVertexTexture: floatVertexTextures,

morphTargets: object.geometry && object.geometry.morphAttributes.position !== undefined,
morphNormals: object.geometry && object.geometry.morphAttributes.normal !== undefined,
morphTargets: !! object.geometry && !! object.geometry.morphAttributes.position,
morphNormals: !! object.geometry && !! object.geometry.morphAttributes.normal,

numDirLights: lights.directional.length,
numPointLights: lights.point.length,
Expand Down