track if a cachepic has alpha, and turn off depth write if it does; also use alpha...

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

diff --git a/clvm_cmds.c b/clvm_cmds.c
index db6e5f190ebd5618752f6e0bfc45329cdbcc8133..be1f04d851e6392fd908e81cf28e635fda28e9a4 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -2954,6 +2954,7 @@ typedef struct vmpolygons_triangle_s
 {
        rtexture_t              *texture;
        int                             drawflag;
 {
        rtexture_t              *texture;
        int                             drawflag;

+       qboolean hasalpha;

        unsigned short  elements[3];
 }vmpolygons_triangle_t;
 
        unsigned short  elements[3];
 }vmpolygons_triangle_t;
 


@@ -2981,6 +2982,7 @@ typedef struct vmpolygons_s
        float                   begin_vertex[VMPOLYGONS_MAXPOINTS][3];
        float                   begin_color[VMPOLYGONS_MAXPOINTS][4];
        float                   begin_texcoord[VMPOLYGONS_MAXPOINTS][2];
        float                   begin_vertex[VMPOLYGONS_MAXPOINTS][3];
        float                   begin_color[VMPOLYGONS_MAXPOINTS][4];
        float                   begin_texcoord[VMPOLYGONS_MAXPOINTS][2];

+       qboolean                begin_texture_hasalpha;

 } vmpolygons_t;
 
 // FIXME: make VM_CL_R_Polygon functions use Debug_Polygon functions?
 } vmpolygons_t;
 
 // FIXME: make VM_CL_R_Polygon functions use Debug_Polygon functions?


@@ -3070,18 +3072,7 @@ static void VM_DrawPolygonCallback (const entity_render_t *ent, const rtlight_t
                int numtriangles = 0;
                rtexture_t *tex = polys->data_triangles[surfacelist[surfacelistindex]].texture;
                int drawflag = polys->data_triangles[surfacelist[surfacelistindex]].drawflag;
                int numtriangles = 0;
                rtexture_t *tex = polys->data_triangles[surfacelist[surfacelistindex]].texture;
                int drawflag = polys->data_triangles[surfacelist[surfacelistindex]].drawflag;

-               // this can't call _DrawQ_ProcessDrawFlag, but should be in sync with it
-               // FIXME factor this out
-               if(drawflag == DRAWFLAG_ADDITIVE)
-                       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
-               else if(drawflag == DRAWFLAG_MODULATE)
-                       GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
-               else if(drawflag == DRAWFLAG_2XMODULATE)
-                       GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
-               else if(drawflag == DRAWFLAG_SCREEN)
-                       GL_BlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE);
-               else
-                       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+               DrawQ_ProcessDrawFlag(drawflag, polys->data_triangles[surfacelist[surfacelistindex]].hasalpha);

                R_SetupShader_Generic(tex, NULL, GL_MODULATE, 1);
                numtriangles = 0;
                for (;surfacelistindex < numsurfaces;surfacelistindex++)
                R_SetupShader_Generic(tex, NULL, GL_MODULATE, 1);
                numtriangles = 0;
                for (;surfacelistindex < numsurfaces;surfacelistindex++)


@@ -3097,6 +3088,15 @@ static void VM_DrawPolygonCallback (const entity_render_t *ent, const rtlight_t
 
 void VMPolygons_Store(vmpolygons_t *polys)
 {
 
 void VMPolygons_Store(vmpolygons_t *polys)
 {

+       qboolean hasalpha;
+       int i;
+
+       // detect if we have alpha
+       hasalpha = polys->begin_texture_hasalpha;
+       for(i = 0; !hasalpha && (i < polys->begin_vertices); ++i)
+               if(polys->begin_color[i][3] < 1)
+                       hasalpha = true;
+

        if (r_refdef.draw2dstage)
        {
                // draw the polygon as 2D immediately
        if (r_refdef.draw2dstage)
        {
                // draw the polygon as 2D immediately


@@ -3109,7 +3109,7 @@ void VMPolygons_Store(vmpolygons_t *polys)
                mesh.data_vertex3f = polys->begin_vertex[0];
                mesh.data_color4f = polys->begin_color[0];
                mesh.data_texcoord2f = polys->begin_texcoord[0];
                mesh.data_vertex3f = polys->begin_vertex[0];
                mesh.data_color4f = polys->begin_color[0];
                mesh.data_texcoord2f = polys->begin_texcoord[0];

-               DrawQ_Mesh(&mesh, polys->begin_drawflag);
+               DrawQ_Mesh(&mesh, polys->begin_drawflag, hasalpha);

        }
        else
        {
        }
        else
        {


@@ -3136,6 +3136,7 @@ void VMPolygons_Store(vmpolygons_t *polys)
                                polys->data_triangles[polys->num_triangles].elements[0] = polys->num_vertices;
                                polys->data_triangles[polys->num_triangles].elements[1] = polys->num_vertices + i+1;
                                polys->data_triangles[polys->num_triangles].elements[2] = polys->num_vertices + i+2;
                                polys->data_triangles[polys->num_triangles].elements[0] = polys->num_vertices;
                                polys->data_triangles[polys->num_triangles].elements[1] = polys->num_vertices + i+1;
                                polys->data_triangles[polys->num_triangles].elements[2] = polys->num_vertices + i+2;

+                               polys->data_triangles[polys->num_triangles].hasalpha = hasalpha;

                                polys->num_triangles++;
                        }
                        polys->num_vertices += polys->begin_vertices;
                                polys->num_triangles++;
                        }
                        polys->num_vertices += polys->begin_vertices;


@@ -3219,6 +3220,7 @@ void VM_CL_R_PolygonBegin (void)
        }
 
        polys->begin_texture = (sf && sf->base) ? sf->base : r_texture_white;
        }
 
        polys->begin_texture = (sf && sf->base) ? sf->base : r_texture_white;

+       polys->begin_texture_hasalpha = (sf && sf->base) ? sf->hasalpha : false;

        polys->begin_drawflag = (int)PRVM_G_FLOAT(OFS_PARM1) & DRAWFLAG_MASK;
        polys->begin_vertices = 0;
        polys->begin_active = true;
        polys->begin_drawflag = (int)PRVM_G_FLOAT(OFS_PARM1) & DRAWFLAG_MASK;
        polys->begin_vertices = 0;
        polys->begin_active = true;

diff --git a/draw.h b/draw.h
index 2c9ceb31cac658d025630dc253f0f3479457aaac..5a8f6137d7b97f97903aeb8d8a81f2f812e3f418 100644 (file)
--- a/draw.h
+++ b/draw.h
@@ -39,6 +39,8 @@ typedef struct cachepic_s
        rtexture_t *tex;
        // used for hash lookups
        struct cachepic_s *chain;
        rtexture_t *tex;
        // used for hash lookups
        struct cachepic_s *chain;

+       // has alpha?
+       qboolean hasalpha;

        // name of pic
        char name[MAX_QPATH];
 }
        // name of pic
        char name[MAX_QPATH];
 }


@@ -169,7 +171,7 @@ float DrawQ_TextWidth_UntilWidth_TrackColors_Scale(const char *text, size_t *max
 // draw a very fancy pic (per corner texcoord/color control), the order is tl, tr, bl, br
 void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height, float s1, float t1, float r1, float g1, float b1, float a1, float s2, float t2, float r2, float g2, float b2, float a2, float s3, float t3, float r3, float g3, float b3, float a3, float s4, float t4, float r4, float g4, float b4, float a4, int flags);
 // draw a triangle mesh
 // draw a very fancy pic (per corner texcoord/color control), the order is tl, tr, bl, br
 void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height, float s1, float t1, float r1, float g1, float b1, float a1, float s2, float t2, float r2, float g2, float b2, float a2, float s3, float t3, float r3, float g3, float b3, float a3, float s4, float t4, float r4, float g4, float b4, float a4, int flags);
 // draw a triangle mesh

-void DrawQ_Mesh(drawqueuemesh_t *mesh, int flags);
+void DrawQ_Mesh(drawqueuemesh_t *mesh, int flags, qboolean hasalpha);

 // set the clipping area
 void DrawQ_SetClipArea(float x, float y, float width, float height);
 // reset the clipping area
 // set the clipping area
 void DrawQ_SetClipArea(float x, float y, float width, float height);
 // reset the clipping area


@@ -180,6 +182,7 @@ void DrawQ_Line(float width, float x1, float y1, float x2, float y2, float r, fl
 void DrawQ_LineLoop(drawqueuemesh_t *mesh, int flags);
 // resets r_refdef.draw2dstage
 void DrawQ_Finish(void);
 void DrawQ_LineLoop(drawqueuemesh_t *mesh, int flags);
 // resets r_refdef.draw2dstage
 void DrawQ_Finish(void);

+void DrawQ_ProcessDrawFlag(int flags, qboolean alpha); // sets GL_DepthMask and GL_BlendFunc

 
 void R_DrawGamma(void);
 
 
 void R_DrawGamma(void);
 

diff --git a/gl_draw.c b/gl_draw.c
index 16eb6069ae1d2a080f8beaa21c3d3c41034446a8..3161e7fa73ad32bb571fc1290f43f8b19f3e1c92 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -318,6 +318,7 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
        unsigned char *lmpdata;
        char lmpname[MAX_QPATH];
        int texflags;
        unsigned char *lmpdata;
        char lmpname[MAX_QPATH];
        int texflags;

+       int j;

 
        texflags = TEXF_ALPHA;
        if (!(cachepicflags & CACHEPICFLAG_NOCLAMP))
 
        texflags = TEXF_ALPHA;
        if (!(cachepicflags & CACHEPICFLAG_NOCLAMP))


@@ -359,6 +360,7 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
                return pic;
        }
 
                return pic;
        }
 

+       pic->hasalpha = true; // assume alpha unless we know it has none

        pic->texflags = texflags;
        pic->autoload = (cachepicflags & CACHEPICFLAG_NOTPERSISTENT);
 
        pic->texflags = texflags;
        pic->autoload = (cachepicflags & CACHEPICFLAG_NOTPERSISTENT);
 


@@ -368,10 +370,23 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
                pixels = loadimagepixelsbgra(path+4, false, true, r_texture_convertsRGB_2d.integer != 0, NULL);
        if (pixels)
        {
                pixels = loadimagepixelsbgra(path+4, false, true, r_texture_convertsRGB_2d.integer != 0, NULL);
        if (pixels)
        {

+               pic->hasalpha = false;
+               if (pic->texflags & TEXF_ALPHA)
+               {
+                       for (j = 3;j < image_width * image_height * 4;j += 4)
+                       {
+                               if (pixels[j] < 255)
+                               {
+                                       pic->hasalpha = true;
+                                       break;
+                               }
+                       }
+               }
+

                pic->width = image_width;
                pic->height = image_height;
                if (!pic->autoload)
                pic->width = image_width;
                pic->height = image_height;
                if (!pic->autoload)

-                       pic->tex = R_LoadTexture2D(drawtexturepool, path, image_width, image_height, pixels, TEXTYPE_BGRA, pic->texflags, -1, NULL);
+                       pic->tex = R_LoadTexture2D(drawtexturepool, path, image_width, image_height, pixels, TEXTYPE_BGRA, pic->texflags & (pic->hasalpha ? ~0 : ~TEXF_ALPHA), -1, NULL);

        }
        else
        {
        }
        else
        {


@@ -964,7 +979,7 @@ void GL_Draw_Init (void)
        R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap, NULL, NULL);
 }
 
        R_RegisterModule("GL_Draw", gl_draw_start, gl_draw_shutdown, gl_draw_newmap, NULL, NULL);
 }
 

-void _DrawQ_Setup(void)
+static void _DrawQ_Setup(void)

 {
        r_viewport_t viewport;
        if (r_refdef.draw2dstage)
 {
        r_viewport_t viewport;
        if (r_refdef.draw2dstage)


@@ -979,39 +994,61 @@ void _DrawQ_Setup(void)
        GL_CullFace(GL_NONE);
        R_EntityMatrix(&identitymatrix);
 
        GL_CullFace(GL_NONE);
        R_EntityMatrix(&identitymatrix);
 

-       GL_DepthMask(true);

        GL_DepthRange(0, 1);
        GL_PolygonOffset(0, 0);
        GL_DepthTest(false);
        GL_Color(1,1,1,1);
        GL_AlphaTest(false);
        GL_DepthRange(0, 1);
        GL_PolygonOffset(0, 0);
        GL_DepthTest(false);
        GL_Color(1,1,1,1);
        GL_AlphaTest(false);

-       GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

 }
 
 qboolean r_draw2d_force = false;
 }
 
 qboolean r_draw2d_force = false;

-static void _DrawQ_ProcessDrawFlag(int flags)
+void _DrawQ_SetupAndProcessDrawFlag(int flags, cachepic_t *pic, float alpha)

 {
        _DrawQ_Setup();
        CHECKGLERROR
        if(!r_draw2d.integer && !r_draw2d_force)
                return;
 {
        _DrawQ_Setup();
        CHECKGLERROR
        if(!r_draw2d.integer && !r_draw2d_force)
                return;

+       DrawQ_ProcessDrawFlag(flags, (alpha < 1) || (pic && pic->hasalpha));
+}
+void DrawQ_ProcessDrawFlag(int flags, qboolean alpha)
+{

        if(flags == DRAWFLAG_ADDITIVE)
        if(flags == DRAWFLAG_ADDITIVE)

-               GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+       {
+               GL_DepthMask(false);
+               GL_BlendFunc(alpha ? GL_SRC_ALPHA : GL_ONE, GL_ONE);
+       }

        else if(flags == DRAWFLAG_MODULATE)
        else if(flags == DRAWFLAG_MODULATE)

+       {
+               GL_DepthMask(false);

                GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
                GL_BlendFunc(GL_DST_COLOR, GL_ZERO);

+       }

        else if(flags == DRAWFLAG_2XMODULATE)
        else if(flags == DRAWFLAG_2XMODULATE)

-               GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
+       {
+               GL_DepthMask(false);
+               GL_BlendFunc(GL_DST_COLOR, GL_SRC_COLOR);
+       }

        else if(flags == DRAWFLAG_SCREEN)
        else if(flags == DRAWFLAG_SCREEN)

-               GL_BlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE);
-       else
+       {
+               GL_DepthMask(false);
+               GL_BlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ONE);
+       }
+       else if(alpha)
+       {
+               GL_DepthMask(false);

                GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
                GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

+       }
+       else
+       {
+               GL_DepthMask(true);
+               GL_BlendFunc(GL_ONE, GL_ZERO);
+       }

 }
 
 void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, float red, float green, float blue, float alpha, int flags)
 {
        float floats[36];
 
 }
 
 void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, float red, float green, float blue, float alpha, int flags)
 {
        float floats[36];
 

-       _DrawQ_ProcessDrawFlag(flags);
+       _DrawQ_SetupAndProcessDrawFlag(flags, pic, alpha);

        if(!r_draw2d.integer && !r_draw2d_force)
                return;
 
        if(!r_draw2d.integer && !r_draw2d_force)
                return;
 


@@ -1068,7 +1105,7 @@ void DrawQ_RotPic(float x, float y, cachepic_t *pic, float width, float height,
        float sinar = sin(ar);
        float cosar = cos(ar);
 
        float sinar = sin(ar);
        float cosar = cos(ar);
 

-       _DrawQ_ProcessDrawFlag(flags);
+       _DrawQ_SetupAndProcessDrawFlag(flags, pic, alpha);

        if(!r_draw2d.integer && !r_draw2d_force)
                return;
 
        if(!r_draw2d.integer && !r_draw2d_force)
                return;
 


@@ -1119,7 +1156,7 @@ void DrawQ_Fill(float x, float y, float width, float height, float red, float gr
 {
        float floats[36];
 
 {
        float floats[36];
 

-       _DrawQ_ProcessDrawFlag(flags);
+       _DrawQ_SetupAndProcessDrawFlag(flags, NULL, alpha);

        if(!r_draw2d.integer && !r_draw2d_force)
                return;
 
        if(!r_draw2d.integer && !r_draw2d_force)
                return;
 


@@ -1444,7 +1481,7 @@ float DrawQ_String_Scale(float startx, float starty, const char *text, size_t ma
        if (maxlen < 1)
                maxlen = 1<<30;
 
        if (maxlen < 1)
                maxlen = 1<<30;
 

-       _DrawQ_ProcessDrawFlag(flags);
+       _DrawQ_SetupAndProcessDrawFlag(flags, NULL, 0);

        if(!r_draw2d.integer && !r_draw2d_force)
                return startx + DrawQ_TextWidth_UntilWidth_TrackColors_Scale(text, &maxlen, w, h, sw, sh, NULL, ignorecolorcodes, fnt, 1000000000);
 
        if(!r_draw2d.integer && !r_draw2d_force)
                return startx + DrawQ_TextWidth_UntilWidth_TrackColors_Scale(text, &maxlen, w, h, sw, sh, NULL, ignorecolorcodes, fnt, 1000000000);
 


@@ -1788,7 +1825,7 @@ void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height
 {
        float floats[36];
 
 {
        float floats[36];
 

-       _DrawQ_ProcessDrawFlag(flags);
+       _DrawQ_SetupAndProcessDrawFlag(flags, pic, a1*a2*a3*a4);

        if(!r_draw2d.integer && !r_draw2d_force)
                return;
 
        if(!r_draw2d.integer && !r_draw2d_force)
                return;
 


@@ -1822,11 +1859,13 @@ void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height
        R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
 }
 
        R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
 }
 

-void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags)
+void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags, qboolean hasalpha)

 {
 {

-       _DrawQ_ProcessDrawFlag(flags);
+       _DrawQ_Setup();
+       CHECKGLERROR

        if(!r_draw2d.integer && !r_draw2d_force)
                return;
        if(!r_draw2d.integer && !r_draw2d_force)
                return;

+       DrawQ_ProcessDrawFlag(flags, hasalpha);

 
        R_Mesh_ResetTextureState();
        R_SetupShader_Generic(mesh->texture, NULL, GL_MODULATE, 1);
 
        R_Mesh_ResetTextureState();
        R_SetupShader_Generic(mesh->texture, NULL, GL_MODULATE, 1);


@@ -1839,7 +1878,7 @@ void DrawQ_LineLoop (drawqueuemesh_t *mesh, int flags)
 {
        int num;
 
 {
        int num;
 

-       _DrawQ_ProcessDrawFlag(flags);
+       _DrawQ_SetupAndProcessDrawFlag(flags, NULL, 1);

        if(!r_draw2d.integer && !r_draw2d_force)
                return;
 
        if(!r_draw2d.integer && !r_draw2d_force)
                return;
 


@@ -1876,7 +1915,7 @@ void DrawQ_LineLoop (drawqueuemesh_t *mesh, int flags)
 //[515]: this is old, delete
 void DrawQ_Line (float width, float x1, float y1, float x2, float y2, float r, float g, float b, float alpha, int flags)
 {
 //[515]: this is old, delete
 void DrawQ_Line (float width, float x1, float y1, float x2, float y2, float r, float g, float b, float alpha, int flags)
 {

-       _DrawQ_ProcessDrawFlag(flags);
+       _DrawQ_SetupAndProcessDrawFlag(flags, NULL, alpha);

        if(!r_draw2d.integer && !r_draw2d_force)
                return;
 
        if(!r_draw2d.integer && !r_draw2d_force)
                return;