diff --git a/src/materials/MeshStandardMaterial.js b/src/materials/MeshStandardMaterial.js index fd07648311fa86df0b46548ac1cb8bd8c2b0887b..762bbbfdea862075ba094d44fbacbc4bcdd5133d 100644 --- a/src/materials/MeshStandardMaterial.js +++ b/src/materials/MeshStandardMaterial.js @@ -4,7 +4,6 @@ * parameters = { * color: , * roughness: , - * reflectivity: , * metalness: , * emissive: , @@ -32,8 +31,6 @@ * * roughnessMap: new THREE.Texture( ), * - * reflectivityMap: new THREE.Texture( ), - * * metalnessMap: new THREE.Texture( ), * * alphaMap: new THREE.Texture( ), @@ -69,7 +66,6 @@ THREE.MeshStandardMaterial = function ( parameters ) { this.color = new THREE.Color( 0xffffff ); // diffuse this.roughness = 0.5; - this.reflectivity = 1; this.metalness = 0; this.emissive = new THREE.Color( 0x000000 ); @@ -96,8 +92,6 @@ THREE.MeshStandardMaterial = function ( parameters ) { this.roughnessMap = null; - this.reflectivityMap = null; - this.metalnessMap = null; this.alphaMap = null; @@ -135,7 +129,6 @@ THREE.MeshStandardMaterial.prototype.copy = function ( source ) { this.color.copy( source.color ); this.roughness = source.roughness; - this.reflectivity = source.reflectivity; this.metalness = source.metalness; this.emissive.copy( source.emissive ); @@ -162,8 +155,6 @@ THREE.MeshStandardMaterial.prototype.copy = function ( source ) { this.roughnessMap = source.roughnessMap; - this.reflectivityMap = source.reflectivityMap; - this.metalnessMap = source.metalnessMap; this.alphaMap = source.alphaMap; diff --git a/src/renderers/WebGLRenderer.js b/src/renderers/WebGLRenderer.js index 6d977dad9455cfe456052a457aa6015d5aecf8e2..9ce1907d2530f51b05713a25703fe440efd44591 100644 --- a/src/renderers/WebGLRenderer.js +++ b/src/renderers/WebGLRenderer.js @@ -2042,7 +2042,6 @@ THREE.WebGLRenderer = function ( parameters ) { function refreshUniformsStandard ( uniforms, material ) { uniforms.roughness.value = material.roughness; - //uniforms.reflectivity.value = material.reflectivity; // part of uniforms common uniforms.metalness.value = material.metalness; if ( material.roughnessMap ) { @@ -2051,12 +2050,6 @@ THREE.WebGLRenderer = function ( parameters ) { } - if ( material.reflectivityMap ) { - - uniforms.reflectivityMap.value = material.reflectivityMap; - - } - if ( material.metalnessMap ) { uniforms.metalnessMap.value = material.metalnessMap; diff --git a/src/renderers/shaders/ShaderChunk/lights_standard_fragment.glsl b/src/renderers/shaders/ShaderChunk/lights_standard_fragment.glsl index 75cbe1bf47e728c468f6e14211d6e6b0b186689b..66f6591150b329f54aae2c106130544a66aa0aea 100644 --- a/src/renderers/shaders/ShaderChunk/lights_standard_fragment.glsl +++ b/src/renderers/shaders/ShaderChunk/lights_standard_fragment.glsl @@ -1,4 +1,4 @@ PhysicalMaterial material; material.diffuseColor = diffuseColor.rgb * ( 1.0 - metalnessFactor ); material.specularRoughness = roughnessFactor * 0.5 + 0.5; // disney's remapping of [ 0, 1 ] roughness to [ 0.5, 1 ] -material.specularColor = mix( vec3( 0.08 ) * reflectivity, diffuseColor.rgb, metalnessFactor ); +material.specularColor = mix( vec3( 0.04 ), diffuseColor.rgb, metalnessFactor ); diff --git a/src/renderers/shaders/ShaderChunk/uv_pars_fragment.glsl b/src/renderers/shaders/ShaderChunk/uv_pars_fragment.glsl index 7be6e748583c78c29c0e2eac20de8c6fb7072d4a..d1bb9548cb14f08f74bda188b3be92030abf9edd 100644 --- a/src/renderers/shaders/ShaderChunk/uv_pars_fragment.glsl +++ b/src/renderers/shaders/ShaderChunk/uv_pars_fragment.glsl @@ -1,4 +1,4 @@ -#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_REFLECTIVITYMAP ) || defined( USE_METALNESSMAP ) +#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_METALNESSMAP ) varying vec2 vUv; diff --git a/src/renderers/shaders/ShaderChunk/uv_pars_vertex.glsl b/src/renderers/shaders/ShaderChunk/uv_pars_vertex.glsl index 4082711123d62db912f6565ceb28640984627791..d2e81dd526c1cc7331bc31e5f2616d74d4add461 100644 --- a/src/renderers/shaders/ShaderChunk/uv_pars_vertex.glsl +++ b/src/renderers/shaders/ShaderChunk/uv_pars_vertex.glsl @@ -1,4 +1,4 @@ -#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_REFLECTIVITYMAP ) || defined( USE_METALNESSMAP ) +#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_METALNESSMAP ) varying vec2 vUv; uniform vec4 offsetRepeat; diff --git a/src/renderers/shaders/ShaderChunk/uv_vertex.glsl b/src/renderers/shaders/ShaderChunk/uv_vertex.glsl index 89a62f98a97a034c9730232910ed9beca267928f..cbcdf48b47a351b12f7fa396f187afc9ab84baff 100644 --- a/src/renderers/shaders/ShaderChunk/uv_vertex.glsl +++ b/src/renderers/shaders/ShaderChunk/uv_vertex.glsl @@ -1,4 +1,4 @@ -#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_REFLECTIVITYMAP ) || defined( USE_METALNESSMAP ) +#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP ) || defined( USE_ALPHAMAP ) || defined( USE_EMISSIVEMAP ) || defined( USE_ROUGHNESSMAP ) || defined( USE_METALNESSMAP ) vUv = uv * offsetRepeat.zw + offsetRepeat.xy; diff --git a/src/renderers/shaders/ShaderLib.js b/src/renderers/shaders/ShaderLib.js index beeb523cf36fae1315239caf80dc5a1f3aead7e6..54e98d463528949de6c8640f1e45b218b9a2eeba 100644 --- a/src/renderers/shaders/ShaderLib.js +++ b/src/renderers/shaders/ShaderLib.js @@ -421,7 +421,6 @@ THREE.ShaderLib = { THREE.UniformsLib[ "normalmap" ], THREE.UniformsLib[ "displacementmap" ], THREE.UniformsLib[ "roughnessmap" ], - THREE.UniformsLib[ "reflectivitymap" ], THREE.UniformsLib[ "metalnessmap" ], THREE.UniformsLib[ "fog" ], THREE.UniformsLib[ "lights" ], @@ -535,7 +534,6 @@ THREE.ShaderLib = { THREE.ShaderChunk[ "bumpmap_pars_fragment" ], THREE.ShaderChunk[ "normalmap_pars_fragment" ], THREE.ShaderChunk[ "roughnessmap_pars_fragment" ], - //THREE.ShaderChunk[ "reflectivitymap_pars_fragment" ], THREE.ShaderChunk[ "metalnessmap_pars_fragment" ], THREE.ShaderChunk[ "logdepthbuf_pars_fragment" ], @@ -552,7 +550,6 @@ THREE.ShaderLib = { THREE.ShaderChunk[ "alphatest_fragment" ], THREE.ShaderChunk[ "specularmap_fragment" ], THREE.ShaderChunk[ "roughnessmap_fragment" ], - //THREE.ShaderChunk[ "reflectivitymap_fragment" ], THREE.ShaderChunk[ "metalnessmap_fragment" ], THREE.ShaderChunk[ "normal_fragment" ], THREE.ShaderChunk[ "emissivemap_fragment" ], diff --git a/src/renderers/shaders/UniformsLib.js b/src/renderers/shaders/UniformsLib.js index 98989f0618383ca263619f3d3366ab07631d6cb0..19298724d399588f222f01ad2497347593d70ea6 100644 --- a/src/renderers/shaders/UniformsLib.js +++ b/src/renderers/shaders/UniformsLib.js @@ -70,12 +70,6 @@ THREE.UniformsLib = { }, - reflectivitymap: { - - "reflectivityMap" : { type: "t", value: null } - - }, - metalnessmap: { "metalnessMap" : { type: "t", value: null } diff --git a/src/renderers/webgl/WebGLProgram.js b/src/renderers/webgl/WebGLProgram.js index 5945199ebe5d567248460c73ab6291e59f94c44e..c784dafa05a9eb7016e8629dddcad62129605bc4 100644 --- a/src/renderers/webgl/WebGLProgram.js +++ b/src/renderers/webgl/WebGLProgram.js @@ -265,7 +265,6 @@ THREE.WebGLProgram = ( function () { parameters.displacementMap && parameters.supportsVertexTextures ? '#define USE_DISPLACEMENTMAP' : '', parameters.specularMap ? '#define USE_SPECULARMAP' : '', parameters.roughnessMap ? '#define USE_ROUGHNESSMAP' : '', - parameters.reflectivityMap ? '#define USE_REFLECTIVITYMAP' : '', parameters.metalnessMap ? '#define USE_METALNESSMAP' : '', parameters.alphaMap ? '#define USE_ALPHAMAP' : '', parameters.vertexColors ? '#define USE_COLOR' : '', @@ -384,7 +383,6 @@ THREE.WebGLProgram = ( function () { parameters.normalMap ? '#define USE_NORMALMAP' : '', parameters.specularMap ? '#define USE_SPECULARMAP' : '', parameters.roughnessMap ? '#define USE_ROUGHNESSMAP' : '', - parameters.reflectivityMap ? '#define USE_REFLECTIVITYMAP' : '', parameters.metalnessMap ? '#define USE_METALNESSMAP' : '', parameters.alphaMap ? '#define USE_ALPHAMAP' : '', parameters.vertexColors ? '#define USE_COLOR' : '', diff --git a/src/renderers/webgl/WebGLPrograms.js b/src/renderers/webgl/WebGLPrograms.js index 561311ec25aed37808cf802a7f060bd14f733f9e..b2722f30e713ef7a32587fcd4d57203a83f4d3ab 100644 --- a/src/renderers/webgl/WebGLPrograms.js +++ b/src/renderers/webgl/WebGLPrograms.js @@ -17,7 +17,7 @@ THREE.WebGLPrograms = function ( renderer, capabilities ) { var parameterNames = [ "precision", "supportsVertexTextures", "map", "envMap", "envMapMode", "lightMap", "aoMap", "emissiveMap", "bumpMap", "normalMap", "displacementMap", "specularMap", - "roughnessMap", "reflectivityMap", "metalnessMap", + "roughnessMap", "metalnessMap", "alphaMap", "combine", "vertexColors", "fog", "useFog", "fogExp", "flatShading", "sizeAttenuation", "logarithmicDepthBuffer", "skinning", "maxBones", "useVertexTexture", "morphTargets", "morphNormals", @@ -105,7 +105,6 @@ THREE.WebGLPrograms = function ( renderer, capabilities ) { normalMap: !! material.normalMap, displacementMap: !! material.displacementMap, roughnessMap: !! material.roughnessMap, - reflectivityMap: !! material.reflectivityMap, metalnessMap: !! material.metalnessMap, specularMap: !! material.specularMap, alphaMap: !! material.alphaMap,