reworked rtlighting code to handle transparent water lighting and transparent model...

[xonotic/darkplaces.git] / gl_draw.c

diff --git a/gl_draw.c b/gl_draw.c
index 85540ad21b921c32589925eb1bcdc55333ffad0e..cbeefdcfce91a53ee31501c099a6037ace828108 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -31,7 +31,7 @@ static rtexture_t *char_texture;
 /* Support Routines */
 
 #define FONT_FILESIZE 13468
-#define MAX_CACHED_PICS 256
+#define MAX_CACHED_PICS 1024
 #define CACHEPICHASHSIZE 256
 static cachepic_t *cachepichash[CACHEPICHASHSIZE];
 static cachepic_t cachepics[MAX_CACHED_PICS];
@@ -303,7 +303,7 @@ Draw_CachePic
 // FIXME: move this to client somehow
 cachepic_t     *Draw_CachePic (const char *path, qboolean persistent)
 {
-       int i, crc, hashkey;
+       int crc, hashkey;
        cachepic_t *pic;
        qpic_t *p;
        int flags;
@@ -326,7 +326,7 @@ cachepic_t  *Draw_CachePic (const char *path, qboolean persistent)
 
        if (numcachepics == MAX_CACHED_PICS)
        {
-               Con_Printf ("Draw_CachePic: numcachepics == MAX_CACHED_PICS");
+               Con_Printf ("Draw_CachePic: numcachepics == MAX_CACHED_PICS\n");
                // FIXME: support NULL in callers?
                return cachepics; // return the first one
        }
@@ -339,7 +339,7 @@ cachepic_t  *Draw_CachePic (const char *path, qboolean persistent)
        flags = TEXF_ALPHA;
        if (persistent)
                flags |= TEXF_PRECACHE;
-       if (!strcmp(path, "gfx/colorcontrol/ditherpattern.tga"))
+       if (!strcmp(path, "gfx/colorcontrol/ditherpattern"))
                flags |= TEXF_CLAMP;
 
        // load the pic from disk
@@ -353,38 +353,33 @@ cachepic_t        *Draw_CachePic (const char *path, qboolean persistent)
                {
                        if (!strcmp(path, "gfx/conchars"))
                        {
-                               unsigned char *pix;
-                               // conchars is a raw image and with the wrong transparent color
-                               pix = (unsigned char *)p;
-                               for (i = 0;i < 128 * 128;i++)
-                                       if (pix[i] == 0)
-                                               pix[i] = 255;
-                               pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, pix, TEXTYPE_PALETTE, flags, palette_complete);
+                               // conchars is a raw image and with color 0 as transparent instead of 255
+                               pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, (unsigned char *)p, TEXTYPE_PALETTE, flags, palette_font);
                        }
                        else
-                               pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, flags, palette_complete);
+                               pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, flags, palette_transparent);
                }
        }
 
        if (pic->tex == NULL && !strcmp(path, "gfx/conchars"))
                pic->tex = draw_generateconchars();
-       if (pic->tex == NULL && !strcmp(path, "ui/mousepointer.tga"))
+       if (pic->tex == NULL && !strcmp(path, "ui/mousepointer"))
                pic->tex = draw_generatemousepointer();
-       if (pic->tex == NULL && !strcmp(path, "gfx/prydoncursor001.tga"))
+       if (pic->tex == NULL && !strcmp(path, "gfx/prydoncursor001"))
                pic->tex = draw_generatemousepointer();
-       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair1.tga"))
+       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair1"))
                pic->tex = draw_generatecrosshair(0);
-       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair2.tga"))
+       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair2"))
                pic->tex = draw_generatecrosshair(1);
-       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair3.tga"))
+       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair3"))
                pic->tex = draw_generatecrosshair(2);
-       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair4.tga"))
+       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair4"))
                pic->tex = draw_generatecrosshair(3);
-       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair5.tga"))
+       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair5"))
                pic->tex = draw_generatecrosshair(4);
-       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair6.tga"))
+       if (pic->tex == NULL && !strcmp(path, "gfx/crosshair6"))
                pic->tex = draw_generatecrosshair(5);
-       if (pic->tex == NULL && !strcmp(path, "gfx/colorcontrol/ditherpattern.tga"))
+       if (pic->tex == NULL && !strcmp(path, "gfx/colorcontrol/ditherpattern"))
                pic->tex = draw_generateditherpattern();
        if (pic->tex == NULL)
        {
@@ -422,7 +417,7 @@ cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, u
                {
                        if (numcachepics == MAX_CACHED_PICS)
                        {
-                               Con_Printf ("Draw_NewPic: numcachepics == MAX_CACHED_PICS");
+                               Con_Printf ("Draw_NewPic: numcachepics == MAX_CACHED_PICS\n");
                                // FIXME: support NULL in callers?
                                return cachepics; // return the first one
                        }
@@ -535,8 +530,6 @@ void R_DrawQueue(void)
        r_view_x = bound(0, r_refdef.x, vid.width - r_refdef.width);
        r_view_y = bound(0, r_refdef.y, vid.height - r_refdef.height);
        r_view_z = 0;
-       r_view_fov_x = bound(0.1, r_refdef.fov_x, 170);
-       r_view_fov_y = bound(0.1, r_refdef.fov_y, 170);
        r_view_matrix = r_refdef.viewentitymatrix;
        GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1);