From b5a6ae70f684306a1baf6414a6e04efe563da2ad Mon Sep 17 00:00:00 2001
From: WestLangley <dat1234@gmail.com>
Date: Sun, 9 Jul 2017 22:08:47 -0400
Subject: [PATCH] Merge <normal_flip> into <normal_fragment>

---
 examples/js/nodes/materials/PhongNode.js               | 1 -
 examples/js/nodes/materials/StandardNode.js            | 1 -
 src/renderers/shaders/ShaderChunk.js                   | 2 --
 src/renderers/shaders/ShaderChunk/normal_flip.glsl     | 5 -----
 src/renderers/shaders/ShaderChunk/normal_fragment.glsl | 8 +++++++-
 src/renderers/shaders/ShaderLib/meshphong_frag.glsl    | 1 -
 src/renderers/shaders/ShaderLib/meshphysical_frag.glsl | 1 -
 src/renderers/shaders/ShaderLib/normal_frag.glsl       | 1 -
 8 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 src/renderers/shaders/ShaderChunk/normal_flip.glsl

diff --git a/examples/js/nodes/materials/PhongNode.js b/examples/js/nodes/materials/PhongNode.js
index dce7b040a8..33b1dbedda 100644
--- a/examples/js/nodes/materials/PhongNode.js
+++ b/examples/js/nodes/materials/PhongNode.js
@@ -151,7 +151,6 @@ THREE.PhongNode.prototype.build = function ( builder ) {
 
 		var output = [
 			// prevent undeclared normal
-			"#include <normal_flip>",
 			"#include <normal_fragment>",
 
 			// prevent undeclared material
diff --git a/examples/js/nodes/materials/StandardNode.js b/examples/js/nodes/materials/StandardNode.js
index 62c0d097fc..e674a95cab 100644
--- a/examples/js/nodes/materials/StandardNode.js
+++ b/examples/js/nodes/materials/StandardNode.js
@@ -190,7 +190,6 @@ THREE.StandardNode.prototype.build = function ( builder ) {
 
 		var output = [
 				// prevent undeclared normal
-			"	#include <normal_flip>",
 			"	#include <normal_fragment>",
 
 				// prevent undeclared material
diff --git a/src/renderers/shaders/ShaderChunk.js b/src/renderers/shaders/ShaderChunk.js
index 97583490a5..92b3840d78 100644
--- a/src/renderers/shaders/ShaderChunk.js
+++ b/src/renderers/shaders/ShaderChunk.js
@@ -55,7 +55,6 @@ import metalnessmap_pars_fragment from './ShaderChunk/metalnessmap_pars_fragment
 import morphnormal_vertex from './ShaderChunk/morphnormal_vertex.glsl';
 import morphtarget_pars_vertex from './ShaderChunk/morphtarget_pars_vertex.glsl';
 import morphtarget_vertex from './ShaderChunk/morphtarget_vertex.glsl';
-import normal_flip from './ShaderChunk/normal_flip.glsl';
 import normal_fragment from './ShaderChunk/normal_fragment.glsl';
 import normalmap_pars_fragment from './ShaderChunk/normalmap_pars_fragment.glsl';
 import packing from './ShaderChunk/packing.glsl';
@@ -168,7 +167,6 @@ export var ShaderChunk = {
 	morphnormal_vertex: morphnormal_vertex,
 	morphtarget_pars_vertex: morphtarget_pars_vertex,
 	morphtarget_vertex: morphtarget_vertex,
-	normal_flip: normal_flip,
 	normal_fragment: normal_fragment,
 	normalmap_pars_fragment: normalmap_pars_fragment,
 	packing: packing,
diff --git a/src/renderers/shaders/ShaderChunk/normal_flip.glsl b/src/renderers/shaders/ShaderChunk/normal_flip.glsl
deleted file mode 100644
index 7474ec2256..0000000000
--- a/src/renderers/shaders/ShaderChunk/normal_flip.glsl
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef DOUBLE_SIDED
-	float flipNormal = ( float( gl_FrontFacing ) * 2.0 - 1.0 );
-#else
-	float flipNormal = 1.0;
-#endif
diff --git a/src/renderers/shaders/ShaderChunk/normal_fragment.glsl b/src/renderers/shaders/ShaderChunk/normal_fragment.glsl
index 7baeb096e7..0511dd5c97 100644
--- a/src/renderers/shaders/ShaderChunk/normal_fragment.glsl
+++ b/src/renderers/shaders/ShaderChunk/normal_fragment.glsl
@@ -8,7 +8,13 @@
 
 #else
 
-	vec3 normal = normalize( vNormal ) * flipNormal;
+	vec3 normal = normalize( vNormal );
+
+	#ifdef DOUBLE_SIDED
+
+		normal = normal * ( float( gl_FrontFacing ) * 2.0 - 1.0 );
+
+	#endif
 
 #endif
 
diff --git a/src/renderers/shaders/ShaderLib/meshphong_frag.glsl b/src/renderers/shaders/ShaderLib/meshphong_frag.glsl
index 5b4f25a775..0bf233740a 100644
--- a/src/renderers/shaders/ShaderLib/meshphong_frag.glsl
+++ b/src/renderers/shaders/ShaderLib/meshphong_frag.glsl
@@ -44,7 +44,6 @@ void main() {
 	#include <alphamap_fragment>
 	#include <alphatest_fragment>
 	#include <specularmap_fragment>
-	#include <normal_flip>
 	#include <normal_fragment>
 	#include <emissivemap_fragment>
 
diff --git a/src/renderers/shaders/ShaderLib/meshphysical_frag.glsl b/src/renderers/shaders/ShaderLib/meshphysical_frag.glsl
index b11b90403d..a66b04c764 100644
--- a/src/renderers/shaders/ShaderLib/meshphysical_frag.glsl
+++ b/src/renderers/shaders/ShaderLib/meshphysical_frag.glsl
@@ -59,7 +59,6 @@ void main() {
 	#include <alphatest_fragment>
 	#include <roughnessmap_fragment>
 	#include <metalnessmap_fragment>
-	#include <normal_flip>
 	#include <normal_fragment>
 	#include <emissivemap_fragment>
 
diff --git a/src/renderers/shaders/ShaderLib/normal_frag.glsl b/src/renderers/shaders/ShaderLib/normal_frag.glsl
index 11c2144a4b..705efad909 100644
--- a/src/renderers/shaders/ShaderLib/normal_frag.glsl
+++ b/src/renderers/shaders/ShaderLib/normal_frag.glsl
@@ -23,7 +23,6 @@ uniform float opacity;
 void main() {
 
 	#include <logdepthbuf_fragment>
-	#include <normal_flip>
 	#include <normal_fragment>
 
 	gl_FragColor = vec4( packNormalToRGB( normal ), opacity );
-- 
GitLab