diff options
| author | SmileTheory <SmileTheory@gmail.com> | 2013-10-10 03:41:31 -0700 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2014-06-17 17:43:34 +0100 |
| commit | d3de16e2c53104de6364a280e8970c9fea379042 (patch) | |
| tree | 3c5135de7c6b62e5adc0208c7b3498dbe863e1f6 /src/renderergl2/glsl/generic_vp.glsl | |
| parent | 5c678ec30b0b83c4ed216d06b7b38c77f96e4b77 (diff) | |
OpenGL2: Fix TCGEN_ENVIRONMENT stages not rendering correctly.
Diffstat (limited to 'src/renderergl2/glsl/generic_vp.glsl')
| -rw-r--r-- | src/renderergl2/glsl/generic_vp.glsl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/renderergl2/glsl/generic_vp.glsl b/src/renderergl2/glsl/generic_vp.glsl index 429d62f5..94e3c83e 100644 --- a/src/renderergl2/glsl/generic_vp.glsl +++ b/src/renderergl2/glsl/generic_vp.glsl @@ -17,7 +17,7 @@ uniform vec4 u_DiffuseTexMatrix; uniform vec4 u_DiffuseTexOffTurb; #if defined(USE_TCGEN) || defined(USE_RGBAGEN) -uniform vec3 u_ViewOrigin; +uniform vec3 u_LocalViewOrigin; #endif #if defined(USE_TCGEN) @@ -48,7 +48,7 @@ uniform int u_ColorGen; uniform int u_AlphaGen; uniform vec3 u_AmbientLight; uniform vec3 u_DirectedLight; -uniform vec4 u_LightOrigin; +uniform vec3 u_ModelLightDir; uniform float u_PortalRange; #endif @@ -123,7 +123,7 @@ vec2 GenTexCoords(int TCGen, vec3 position, vec3 normal, vec3 TCGenVector0, vec3 } else if (TCGen == TCGEN_ENVIRONMENT_MAPPED) { - vec3 viewer = normalize(u_ViewOrigin - position); + vec3 viewer = normalize(u_LocalViewOrigin - position); tex = -reflect(viewer, normal).yz * vec2(0.5, -0.5) + 0.5; } else if (TCGen == TCGEN_VECTOR) @@ -158,12 +158,12 @@ vec4 CalcColor(vec3 position, vec3 normal) if (u_ColorGen == CGEN_LIGHTING_DIFFUSE) { - float incoming = clamp(dot(normal, u_LightOrigin.xyz), 0.0, 1.0); + float incoming = clamp(dot(normal, u_ModelLightDir), 0.0, 1.0); color.rgb = clamp(u_DirectedLight * incoming + u_AmbientLight, 0.0, 1.0); } - vec3 viewer = u_ViewOrigin - position; + vec3 viewer = u_LocalViewOrigin - position; if (u_AlphaGen == AGEN_LIGHTING_SPECULAR) { |