From 5328b516238ed27ada45e1ab87fbb18bd2d8f312 Mon Sep 17 00:00:00 2001 From: arobertson0 Date: Wed, 21 Aug 2019 09:38:55 -0400 Subject: [PATCH] Corrected defines for glTF loaders --- examples/js/loaders/GLTFLoader.js | 2 +- examples/jsm/loaders/GLTFLoader.js | 2 +- src/renderers/webgl/WebGLProgram.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/js/loaders/GLTFLoader.js b/examples/js/loaders/GLTFLoader.js index 0968d24cac..e1aca10c55 100644 --- a/examples/js/loaders/GLTFLoader.js +++ b/examples/js/loaders/GLTFLoader.js @@ -726,7 +726,7 @@ THREE.GLTFLoader = ( function () { materialParams.vertexShader = shader.vertexShader; materialParams.fragmentShader = fragmentShader; materialParams.uniforms = uniforms; - materialParams.defines = { 'STANDARD': '' }; + materialParams.defines = { 'PHYSICAL': '' } materialParams.color = new THREE.Color( 1.0, 1.0, 1.0 ); materialParams.opacity = 1.0; diff --git a/examples/jsm/loaders/GLTFLoader.js b/examples/jsm/loaders/GLTFLoader.js index 2fede81a23..239fc574de 100644 --- a/examples/jsm/loaders/GLTFLoader.js +++ b/examples/jsm/loaders/GLTFLoader.js @@ -791,7 +791,7 @@ var GLTFLoader = ( function () { materialParams.vertexShader = shader.vertexShader; materialParams.fragmentShader = fragmentShader; materialParams.uniforms = uniforms; - materialParams.defines = { 'STANDARD': '' }; + materialParams.defines = { 'PHYSICAL': '' } materialParams.color = new Color( 1.0, 1.0, 1.0 ); materialParams.opacity = 1.0; diff --git a/src/renderers/webgl/WebGLProgram.js b/src/renderers/webgl/WebGLProgram.js index d3a10c4584..de86d3c9ee 100644 --- a/src/renderers/webgl/WebGLProgram.js +++ b/src/renderers/webgl/WebGLProgram.js @@ -392,7 +392,7 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters, parameters.normalMap ? '#define USE_NORMALMAP' : '', ( parameters.normalMap && parameters.objectSpaceNormalMap ) ? '#define OBJECTSPACE_NORMALMAP' : '', ( parameters.normalMap && parameters.tangentSpaceNormalMap ) ? '#define TANGENTSPACE_NORMALMAP' : '', - + parameters.clearcoatNormalMap ? '#define USE_CLEARCOAT_NORMALMAP' : '', parameters.displacementMap && parameters.supportsVertexTextures ? '#define USE_DISPLACEMENTMAP' : '', parameters.specularMap ? '#define USE_SPECULARMAP' : '', -- GitLab