From a0db9814e6b34e85c4341c8cd137a73c422017b4 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Thu, 12 Nov 2015 15:04:19 -0500 Subject: [PATCH] Renamed normal_phong_fragment.glsl to normal_fragment.glsl --- .../{normal_phong_fragment.glsl => normal_fragment.glsl} | 0 src/renderers/shaders/ShaderLib.js | 4 ++-- utils/build/includes/common.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/renderers/shaders/ShaderChunk/{normal_phong_fragment.glsl => normal_fragment.glsl} (100%) diff --git a/src/renderers/shaders/ShaderChunk/normal_phong_fragment.glsl b/src/renderers/shaders/ShaderChunk/normal_fragment.glsl similarity index 100% rename from src/renderers/shaders/ShaderChunk/normal_phong_fragment.glsl rename to src/renderers/shaders/ShaderChunk/normal_fragment.glsl diff --git a/src/renderers/shaders/ShaderLib.js b/src/renderers/shaders/ShaderLib.js index 0343f22640..beeb523cf3 100644 --- a/src/renderers/shaders/ShaderLib.js +++ b/src/renderers/shaders/ShaderLib.js @@ -381,7 +381,7 @@ THREE.ShaderLib = { THREE.ShaderChunk[ "alphamap_fragment" ], THREE.ShaderChunk[ "alphatest_fragment" ], THREE.ShaderChunk[ "specularmap_fragment" ], - THREE.ShaderChunk[ "normal_phong_fragment" ], + THREE.ShaderChunk[ "normal_fragment" ], THREE.ShaderChunk[ "emissivemap_fragment" ], THREE.ShaderChunk[ "shadowmap_fragment" ], @@ -554,7 +554,7 @@ THREE.ShaderLib = { THREE.ShaderChunk[ "roughnessmap_fragment" ], //THREE.ShaderChunk[ "reflectivitymap_fragment" ], THREE.ShaderChunk[ "metalnessmap_fragment" ], - THREE.ShaderChunk[ "normal_phong_fragment" ], // use phong chunk for now + THREE.ShaderChunk[ "normal_fragment" ], THREE.ShaderChunk[ "emissivemap_fragment" ], THREE.ShaderChunk[ "shadowmap_fragment" ], diff --git a/utils/build/includes/common.json b/utils/build/includes/common.json index 4584ee51cc..4af6b1a3a2 100644 --- a/utils/build/includes/common.json +++ b/utils/build/includes/common.json @@ -164,7 +164,7 @@ "src/renderers/shaders/ShaderChunk/morphnormal_vertex.glsl", "src/renderers/shaders/ShaderChunk/morphtarget_pars_vertex.glsl", "src/renderers/shaders/ShaderChunk/morphtarget_vertex.glsl", - "src/renderers/shaders/ShaderChunk/normal_phong_fragment.glsl", + "src/renderers/shaders/ShaderChunk/normal_fragment.glsl", "src/renderers/shaders/ShaderChunk/normalmap_pars_fragment.glsl", "src/renderers/shaders/ShaderChunk/project_vertex.glsl", "src/renderers/shaders/ShaderChunk/roughnessmap_fragment.glsl", -- GitLab