fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: don't normalize spot light direction until validation time

Browse source 
In glLight() we're only supposed to transform the direction by the modelview
matrix, not normalized it too.
This commit is contained in:
Brian Paul 2009-04-03 09:55:10 -06:00
parent be4c2d9a33
commit 650d147289
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/mesa/main/light.c
View file

@ -209,7 +209,6 @@ _mesa_Lightfv( GLenum light, GLenum pname, const GLfloat *params )
_math_matrix_analyse(ctx->ModelviewMatrixStack.Top); _math_matrix_analyse(ctx->ModelviewMatrixStack.Top);
} }
TRANSFORM_DIRECTION(temp, params, ctx->ModelviewMatrixStack.Top->m); TRANSFORM_DIRECTION(temp, params, ctx->ModelviewMatrixStack.Top->m);
NORMALIZE_3FV(temp);
params = temp; params = temp;
break; break;
case GL_SPOT_EXPONENT: case GL_SPOT_EXPONENT:
@ -1137,12 +1136,18 @@ compute_light_positions( GLcontext *ctx )
} }
if (light->_Flags & LIGHT_SPOT) { if (light->_Flags & LIGHT_SPOT) {
/* Note: we normalize the spot direction now */
if (ctx->_NeedEyeCoords) { if (ctx->_NeedEyeCoords) {
COPY_3V( light->_NormDirection, light->EyeDirection ); COPY_3V( light->_NormDirection, light->EyeDirection );
NORMALIZE_3FV( light->_NormDirection );
} }
else { else {
GLfloat spotDir[3];
COPY_3V(spotDir, light->EyeDirection);
NORMALIZE_3FV(spotDir);
TRANSFORM_NORMAL( light->_NormDirection, TRANSFORM_NORMAL( light->_NormDirection,
light->EyeDirection, spotDir,
ctx->ModelviewMatrixStack.Top->m); ctx->ModelviewMatrixStack.Top->m);
} }