bikeshedding: unify a bit the lining in glsl

Author: illwieckz

src/engine/renderer/glsl_source/forwardLighting_fp.glsl

@@ -947,16 +947,15 @@ void	main()
 	vec3 L = normalize(u_LightOrigin - var_Position);
 #endif
 
-	vec2 texDiffuse = var_TexDiffuse.st;
+	// compute view direction in world space
+	vec3 viewDir = normalize(u_ViewOrigin - var_Position.xyz);
 
 	mat3 tangentToWorldMatrix = mat3(var_Tangent.xyz, var_Binormal.xyz, var_Normal.xyz);
 
+	vec2 texDiffuse = var_TexDiffuse.st;
 	vec2 texNormal = var_TexNormal.st;
 	vec2 texSpecular = var_TexSpecular.st;
 
-	// compute view direction in world space
-	vec3 viewDir = normalize(u_ViewOrigin - var_Position.xyz);
-
 #if defined(USE_PARALLAX_MAPPING)
 	// compute texcoords offset from heightmap
 	vec2 texOffset = ParallaxTexOffset(u_NormalMap, texNormal, u_DepthScale, u_OffsetBias, viewDir, tangentToWorldMatrix);

src/engine/renderer/glsl_source/lightMapping_fp.glsl

@@ -50,13 +50,13 @@ void	main()
 	// compute view direction in world space
 	vec3 viewDir = normalize(u_ViewOrigin - var_Position);
 
+	mat3 tangentToWorldMatrix = mat3(var_Tangent.xyz, var_Binormal.xyz, var_Normal.xyz);
+
 	vec2 texDiffuse = var_TexDiffuseGlow.st;
 	vec2 texGlow = var_TexDiffuseGlow.pq;
 	vec2 texNormal = var_TexNormalSpecular.st;
 	vec2 texSpecular = var_TexNormalSpecular.pq;
 
-	mat3 tangentToWorldMatrix = mat3(var_Tangent.xyz, var_Binormal.xyz, var_Normal.xyz);
-
 #if defined(USE_PARALLAX_MAPPING)
 	// compute texcoords offset from heightmap
 	vec2 texOffset = ParallaxTexOffset(u_NormalMap, texNormal, u_DepthScale, u_OffsetBias, viewDir, tangentToWorldMatrix);

src/engine/renderer/glsl_source/liquid_fp.glsl

@@ -82,7 +82,7 @@ void ReadLightGrid(in vec3 pos, out vec3 lgtDir,
 
 void	main()
 {
-	// compute incident ray
+	// compute view direction in world space
 	vec3 viewDir = normalize(u_ViewOrigin - var_Position);
 
 	mat3 tangentToWorldMatrix = mat3(var_Tangent.xyz, var_Binormal.xyz, var_Normal.xyz);
@@ -96,17 +96,14 @@ void	main()
 	vec2 texNormal = var_TexNormal.st;
 
 #if defined(USE_PARALLAX_MAPPING)
-	// ray intersect in view direction
-
 	// compute texcoords offset from heightmap
 	vec2 texOffset = ParallaxTexOffset(u_NormalMap, texNormal, u_DepthScale, u_OffsetBias, viewDir, tangentToWorldMatrix);
 
 	texScreen += texOffset;
 	texNormal += texOffset;
-#endif
+#endif // USE_PARALLAX_MAPPING
 
 	// compute normals
-
 	vec3 N = normalize(var_Normal);
 
 	// compute normal in world space from normalmap

src/engine/renderer/glsl_source/reliefMapping_fp.glsl

@@ -284,4 +284,4 @@ vec2 ParallaxTexOffset(sampler2D normalMap, vec2 texCoords, float depthScale, fl
 
 	return bestDepth * ds;
 }
-#endif
+#endif // USE_PARALLAX_MAPPING

src/engine/renderer/glsl_source/vertexLighting_DBS_entity_fp.glsl

@@ -85,11 +85,10 @@ void	main()
 	// compute view direction in world space
 	vec3 viewDir = normalize(u_ViewOrigin - var_Position);
 
-	vec2 texDiffuse = var_TexDiffuse.st;
-	vec2 texGlow = var_TexGlow;
-
 	mat3 tangentToWorldMatrix = mat3(var_Tangent.xyz, var_Binormal.xyz, var_Normal.xyz);
 
+	vec2 texDiffuse = var_TexDiffuse.st;
+	vec2 texGlow = var_TexGlow;
 	vec2 texNormal = var_TexNormalSpecular.xy;
 	vec2 texSpecular = var_TexNormalSpecular.zw;
 
@@ -108,18 +107,15 @@ void	main()
 
 	// compute the specular term
 #if defined(USE_REFLECTIVE_SPECULAR)
-
 	vec4 specBase = texture2D(u_SpecularMap, texSpecular).rgba;
 
 	vec4 envColor0 = textureCube(u_EnvironmentMap0, reflect(-viewDir, N)).rgba;
 	vec4 envColor1 = textureCube(u_EnvironmentMap1, reflect(-viewDir, N)).rgba;
 
 	specBase.rgb *= mix(envColor0, envColor1, u_EnvironmentInterpolation).rgb;
-
 #else
 	// simple Blinn-Phong
 	vec4 specBase = texture2D(u_SpecularMap, texSpecular).rgba;
-
 #endif // USE_REFLECTIVE_SPECULAR
 
 	// compute the diffuse term

src/engine/renderer/glsl_source/vertexLighting_DBS_world_fp.glsl

@@ -73,18 +73,17 @@ void ReadLightGrid(in vec3 pos, out vec3 lgtDir,
 
 void	main()
 {
-	vec2 texDiffuse = var_TexDiffuseGlow.st;
-	vec2 texGlow = var_TexDiffuseGlow.pq;
-
 	// compute view direction in world space
 	vec3 viewDir = normalize(u_ViewOrigin - var_Position);
 
-	mat3 tangentToWorldMatrix = mat3(var_Tangent.xyz, var_Binormal.xyz, var_Normal.xyx);
-
 	vec3 L, ambCol, dirCol;
 	ReadLightGrid( (var_Position - u_LightGridOrigin) * u_LightGridScale,
 		       L, ambCol, dirCol);
 
+	mat3 tangentToWorldMatrix = mat3(var_Tangent.xyz, var_Binormal.xyz, var_Normal.xyx);
+
+	vec2 texDiffuse = var_TexDiffuseGlow.st;
+	vec2 texGlow = var_TexDiffuseGlow.pq;
 	vec2 texNormal = var_TexNormalSpecular.st;
 	vec2 texSpecular = var_TexNormalSpecular.pq;