Temporarily disable cubemap part of frag shaders

ousnius · Dec 24, 2016 · a72dabc · a72dabc
1 parent f250115
commit a72dabc
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/res/shaders/default.frag b/res/shaders/default.frag
@@ -177,21 +177,21 @@ void directionalLight(in DirectionalLight light, in vec3 inNormal, inout vec3 di
 
 	if (bCubemap)
 	{
-		vec3 reflected = mat3(inverse(matModelView)) * reflect(lightDir, normal);
-		vec4 cubeMap = texture(texCubemap, reflected);
-		cubeMap.rgb *= prop.envReflection;
-
-		if (bEnvMask)
-		{
-			cubeMap.rgb *= envMask.r;
-		}
-		else
-		{
-			// No env mask, use specular factor (0.0 if no normal map either)
-			cubeMap.rgb *= specFactor;
-		}
-
-		cube += cubeMap.rgb;
+		//vec3 reflected = mat3(inverse(matModelView)) * reflect(lightDir, normal);
+		//vec4 cubeMap = texture(texCubemap, reflected);
+		//cubeMap.rgb *= prop.envReflection;
+		//
+		//if (bEnvMask)
+		//{
+		//	cubeMap.rgb *= envMask.r;
+		//}
+		//else
+		//{
+		//	// No env mask, use specular factor (0.0 if no normal map either)
+		//	cubeMap.rgb *= specFactor;
+		//}
+		//
+		//cube += cubeMap.rgb;
 	}
 }
 

diff --git a/res/shaders/fo4_default.frag b/res/shaders/fo4_default.frag
@@ -179,21 +179,21 @@ void directionalLight(in DirectionalLight light, in vec3 inNormal, inout vec3 di
 
 	if (bCubemap)
 	{
-		vec3 reflected = mat3(inverse(matModelView)) * reflect(lightDir, normal);
-		vec4 cubeMap = texture(texCubemap, reflected);
-		cubeMap.rgb *= prop.envReflection;
-
-		if (bEnvMask)
-		{
-			cubeMap.rgb *= envMask.r;
-		}
-		else
-		{
-			// No env mask, use specular factor (0.0 if no normal map either)
-			cubeMap.rgb *= specFactor;
-		}
-
-		cube += cubeMap.rgb;
+		//vec3 reflected = mat3(inverse(matModelView)) * reflect(lightDir, normal);
+		//vec4 cubeMap = texture(texCubemap, reflected);
+		//cubeMap.rgb *= prop.envReflection;
+		//
+		//if (bEnvMask)
+		//{
+		//	cubeMap.rgb *= envMask.r;
+		//}
+		//else
+		//{
+		//	// No env mask, use specular factor (0.0 if no normal map either)
+		//	cubeMap.rgb *= specFactor;
+		//}
+		//
+		//cube += cubeMap.rgb;
 	}
 }