1
0
Fork 0
forked from fte/fteqw

Added support for deluxmaps.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@754 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-01-07 02:54:59 +00:00
parent 9528e73c96
commit 32f4b79893
2 changed files with 6 additions and 4 deletions

View file

@ -17,6 +17,7 @@ typedef struct {
gl_state_t gl_state;
extern int *lightmap_textures;
extern int *deluxmap_textures;
void GL_SelectTexture (GLenum target)
{
@ -1755,10 +1756,10 @@ int R_ShaderpassTex ( shaderpass_t *pass )
{
return lightmap_textures[r_lmtex];
}
/* else if ( (pass->flags & SHADER_PASS_DELUXMAP) && r_lmtex >= 0 )
else if ( (pass->flags & SHADER_PASS_DELUXMAP) && r_lmtex >= 0 )
{
return deluxmap_textures[r_lmtex];
}*/
}
return pass->anim_frames[0] ? pass->anim_frames[0] : 0;
}

View file

@ -168,8 +168,9 @@ typedef struct shaderpass_s {
SHADER_PASS_VIDEOMAP = 1 << 3,
SHADER_PASS_DETAIL = 1 << 4,
SHADER_PASS_LIGHTMAP = 1 << 5,
SHADER_PASS_NOCOLORARRAY = 1<< 6,
SHADER_PASS_ANIMMAP = 1 << 7
SHADER_PASS_DELUXMAP = 1 << 6,
SHADER_PASS_NOCOLORARRAY = 1<< 7,
SHADER_PASS_ANIMMAP = 1 << 8
} flags;
} shaderpass_t;