okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support more tcgens in lightall shader.

Browse source
This commit is contained in:
SmileTheory 2013-03-14 23:11:27 -07:00
parent 369956eb63
commit e14a814ba2
2 changed files with 38 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
code/renderergl2/tr_shader.c
View file

@ -2163,7 +2163,7 @@ static qboolean CollapseMultitexture( void ) {
static void CollapseStagesToLightall(shaderStage_t *diffuse,
shaderStage_t *normal, shaderStage_t *specular, shaderStage_t *lightmap,
qboolean useLightVector, qboolean useLightVertex, qboolean parallax, qboolean environment)
qboolean useLightVector, qboolean useLightVertex, qboolean parallax, qboolean tcgen)
{
int defs = 0;
@ -2241,7 +2241,7 @@ static void CollapseStagesToLightall(shaderStage_t *diffuse,
}
}
if (environment || diffuse->bundle[0].numTexMods)
if (tcgen || diffuse->bundle[0].numTexMods)
{
defs |= LIGHTDEF_USE_TCGEN_AND_TCMOD;
}
@ -2347,7 +2347,7 @@ static qboolean CollapseStagesToGLSL(void)
{
shaderStage_t *pStage = &stages[i];
shaderStage_t *diffuse, *normal, *specular, *lightmap;
qboolean parallax, environment, diffuselit, vertexlit;
qboolean parallax, tcgen, diffuselit, vertexlit;
if (!pStage->active)
continue;
@ -2410,10 +2410,12 @@ static qboolean CollapseStagesToGLSL(void)
}
}
environment = qfalse;
if (diffuse->bundle[0].tcGen == TCGEN_ENVIRONMENT_MAPPED)
tcgen = qfalse;
if (diffuse->bundle[0].tcGen == TCGEN_ENVIRONMENT_MAPPED
|| diffuse->bundle[0].tcGen == TCGEN_LIGHTMAP
|| diffuse->bundle[0].tcGen == TCGEN_VECTOR)
{
environment = qtrue;
tcgen = qtrue;
}
diffuselit = qfalse;
@ -2428,7 +2430,7 @@ static qboolean CollapseStagesToGLSL(void)
vertexlit = qtrue;
}
CollapseStagesToLightall(diffuse, normal, specular, lightmap, diffuselit, vertexlit, parallax, environment);
CollapseStagesToLightall(diffuse, normal, specular, lightmap, diffuselit, vertexlit, parallax, tcgen);
}
// deactivate lightmap stages