make SPR_LABEL use neither depth test nor fog; make R_Draw_Sprite not fog nodepthtest...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7876 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/gl_rmain.c b/gl_rmain.c
index 65d3375723c3fa05dab822f3115087b7c2378af0..380c7bec1ae0879ba97915ce4fb4ee23e2f47a08 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -3843,7 +3843,7 @@ void R_DrawSprite(int blendfunc1, int blendfunc2, rtexture_t *texture, rtexture_
        float fog = 1.0f;
        float vertex3f[12];
 
-       if (r_refdef.fogenabled)
+       if (r_refdef.fogenabled && !depthdisable) // TODO maybe make the unfog effect a separate flag?
                fog = FogPoint_World(origin);
 
        R_Mesh_Matrix(&identitymatrix);

diff --git a/r_sprites.c b/r_sprites.c
index 6bfe4737e5db29496a791b634c4dc482606fb913..649bf2b7ee195c96f7168a1c263daece1016d532 100644 (file)
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -330,6 +330,12 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r
                        vec3_t o, l, u;
 #endif
                        R_UpdateTextureInfo(ent, texture);
+
+                       // SPR_LABEL should not use depth test AT ALL
+                       if(model->sprite.sprnum_type == SPR_LABEL || model->sprite.sprnum_type == SPR_LABEL_SCALE)
+                               if(texture->currentmaterialflags & MATERIALFLAG_SHORTDEPTHRANGE)
+                                       texture->currentmaterialflags = (texture->currentmaterialflags & ~MATERIALFLAG_SHORTDEPTHRANGE) | MATERIALFLAG_NODEPTHTEST;
+
                        if(edge)
                        {
                                // FIXME:: save vectors/origin and re-rotate? necessary if the hotspot can change per frame