Browse Source

Renamed normal_phong_fragment.glsl to normal_fragment.glsl

Mr.doob 9 years ago
parent
commit
a0db9814e6

+ 0 - 0
src/renderers/shaders/ShaderChunk/normal_phong_fragment.glsl → src/renderers/shaders/ShaderChunk/normal_fragment.glsl


+ 2 - 2
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" ],

+ 1 - 1
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",