Naming tweaks in builtin shaders

diff --git a/shaderlib/common.glsl b/shaderlib/common.glsl
index 7222b00f4f2439c0739eeff8dec7d3d97c77c0c3..05648e4c0c106f469b63ed0346dc4c8b32c0c9be 100644 (file)
--- a/shaderlib/common.glsl
+++ b/shaderlib/common.glsl
@@ -65,7 +65,7 @@ void main()
 }
 
 #pragma MSP stage(fragment)
-vec3 get_normal_sample()
+vec3 get_fragment_normal()
 {
        if(use_normal_map)
                return texture(normal_map, texcoord.xy).xyz*2.0-1.0;
@@ -75,7 +75,7 @@ vec3 get_normal_sample()
 
 vec4 get_environment_sample(vec3 direction)
 {
-       return texture(environment, direction);
+       return texture(environment_map, direction);
 }
 
 vec3 get_reflection(vec3 normal, vec3 look)

diff --git a/shaderlib/msp_interface.glsl b/shaderlib/msp_interface.glsl
index b1b887ea68a92b3f11a308d0895e503473cf8f61..c90ab5aaac995aabe99f62f43b5a6112fef6746e 100644 (file)
--- a/shaderlib/msp_interface.glsl
+++ b/shaderlib/msp_interface.glsl
@@ -57,7 +57,7 @@ uniform ShadowMap
        mat4 shd_eye_matrix;
 };
 
-uniform samplerCube environment;
+uniform samplerCube environment_map;
 uniform EnvMap
 {
        mat3 env_eye_matrix;

diff --git a/shaderlib/phong.glsl b/shaderlib/phong.glsl
index e3b97f5870d4cb93c2fba04934234af20efd8584..90f0ac8ac51ef65f8ed05bc5b44dccdbf9cf28a6 100644 (file)
--- a/shaderlib/phong.glsl
+++ b/shaderlib/phong.glsl
@@ -101,7 +101,7 @@ void main()
        vec3 look;
        if(use_normal_map)
        {
-               normal = get_normal_sample();
+               normal = get_fragment_normal();
                look = normalize(tbn_look_dir);
        }
        else

diff --git a/shaderlib/singlepass.glsl b/shaderlib/singlepass.glsl
index 2de3f6121c71255f4e4bb04a496951cc454bffe3..eef6a5322aabed050dbfa6272a2337d7fd09bfd1 100644 (file)
--- a/shaderlib/singlepass.glsl
+++ b/shaderlib/singlepass.glsl
@@ -72,7 +72,7 @@ vec3 get_normal_sample()
 
 vec4 get_environment_sample(vec3 direction)
 {
-       return texture(environment, direction);
+       return texture(environment_map, direction);
 }
 
 vec3 normal;