From 32f4b79893bab575c1358bb81746ad6c9590a685 Mon Sep 17 00:00:00 2001 From: Spoike Date: Fri, 7 Jan 2005 02:54:59 +0000 Subject: [PATCH] Added support for deluxmaps. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@754 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/gl/gl_backend.c | 5 +++-- engine/gl/shader.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/engine/gl/gl_backend.c b/engine/gl/gl_backend.c index a2137ca55..6129fd60d 100644 --- a/engine/gl/gl_backend.c +++ b/engine/gl/gl_backend.c @@ -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; } diff --git a/engine/gl/shader.h b/engine/gl/shader.h index 44ec86645..100333005 100644 --- a/engine/gl/shader.h +++ b/engine/gl/shader.h @@ -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;