default offsetmapping off (as it messes up model skins)

[xonotic/darkplaces.git] / gl_draw.c

diff --git a/gl_draw.c b/gl_draw.c
index 135cac695bd347c4f7d3c32c8c7c72fd5c779fbd..d1dbbf4a27b75641411fa97df2d4024e3ee3ff6e 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -38,7 +38,7 @@ static int numcachepics;
 
 static rtexturepool_t *drawtexturepool;
 
-static qbyte concharimage[11356] =
+static qbyte concharimage[13468] =
 {
 #include "lhfont.h"
 };
@@ -49,26 +49,52 @@ static rtexture_t *draw_generateconchars(void)
 {
        int i;
        qbyte buffer[65536][4], *data = NULL;
+       double random;
 
-       fs_filesize = 11356;
+       fs_filesize = 13396;
        data = LoadTGA (concharimage, 256, 256);
        fs_filesize = -1;
-
-       for (i = 0;i < 32768;i++)
+// Gold numbers
+       for (i = 0;i < 8192;i++)
        {
-               buffer[i][0] = 255;
-               buffer[i][1] = 255;
-               buffer[i][2] = 255;
+               random = lhrandom (0.0,1.0);
+               buffer[i][0] = 83 + (qbyte)(random * 64);
+               buffer[i][1] = 71 + (qbyte)(random * 32);
+               buffer[i][2] = 23 + (qbyte)(random * 16);
                buffer[i][3] = data[i*4+0];
        }
-
-       for (i = 32768;i < 65536;i++)
+// White chars
+       for (i = 8192;i < 32768;i++)
+       {
+               random = lhrandom (0.0,1.0);
+               buffer[i][0] = 95 + (qbyte)(random * 64);
+               buffer[i][1] = 95 + (qbyte)(random * 64);
+               buffer[i][2] = 95 + (qbyte)(random * 64);
+               buffer[i][3] = data[i*4+0];
+       }
+// Gold numbers
+       for (i = 32768;i < 40960;i++)
        {
-               buffer[i][0] = 255;
-               buffer[i][1] = 0;
-               buffer[i][2] = 0;
+               random = lhrandom (0.0,1.0);
+               buffer[i][0] = 83 + (qbyte)(random * 64);
+               buffer[i][1] = 71 + (qbyte)(random * 32);
+               buffer[i][2] = 23 + (qbyte)(random * 16);
                buffer[i][3] = data[i*4+0];
        }
+// Red chars
+       for (i = 40960;i < 65536;i++)
+       {
+               random = lhrandom (0.0,1.0);
+               buffer[i][0] = 96 + (qbyte)(random * 64);
+               buffer[i][1] = 43 + (qbyte)(random * 32);
+               buffer[i][2] = 27 + (qbyte)(random * 32);
+               buffer[i][3] = data[i*4+0];
+       }
+
+#if 0
+       Image_WriteTGARGBA ("gfx/generated_conchars.tga", 256, 256, &buffer[0][0]);
+#endif
+
        Mem_Free(data);
        return R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
 }
@@ -267,9 +293,9 @@ cachepic_t  *Draw_CachePic (const char *path, qboolean persistent)
        int i, crc, hashkey;
        cachepic_t *pic;
        qpic_t *p;
-       int persistentflag;
+       int flags;
 
-    if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1)) {
+       if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1)) {
                clvideo_t *video;
 
                video = CL_GetVideo(path);
@@ -277,12 +303,6 @@ cachepic_t *Draw_CachePic (const char *path, qboolean persistent)
                        return &video->cpif;
        }
 
-       if (persistent) {
-               persistentflag = TEXF_PRECACHE;
-       } else {
-               persistentflag = 0;
-       }
-
        crc = CRC_Block(path, strlen(path));
        hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
        for (pic = cachepichash[hashkey];pic;pic = pic->chain)
@@ -290,19 +310,29 @@ cachepic_t        *Draw_CachePic (const char *path, qboolean persistent)
                        return pic;
 
        if (numcachepics == MAX_CACHED_PICS)
-               Sys_Error ("numcachepics == MAX_CACHED_PICS");
+       {
+               Con_Printf ("Draw_CachePic: numcachepics == MAX_CACHED_PICS");
+               // FIXME: support NULL in callers?
+               return cachepics; // return the first one
+       }
        pic = cachepics + (numcachepics++);
-       strcpy (pic->name, path);
+       strlcpy (pic->name, path, sizeof(pic->name));
        // link into list
        pic->chain = cachepichash[hashkey];
        cachepichash[hashkey] = pic;
 
+       flags = TEXF_ALPHA;
+       if (persistent)
+               flags |= TEXF_PRECACHE;
+       if (!strcmp(path, "gfx/colorcontrol/ditherpattern.tga"))
+               flags |= TEXF_CLAMP;
+
        // load the pic from disk
-       pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, TEXF_ALPHA | persistentflag);
+       pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, flags);
        if (pic->tex == NULL && !strncmp(path, "gfx/", 4))
        {
                // compatibility with older versions
-               pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, TEXF_ALPHA | persistentflag);
+               pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, flags);
                // failed to find gfx/whatever.tga or similar, try the wad
                if (pic->tex == NULL && (p = W_GetLumpName (path + 4)))
                {
@@ -314,10 +344,10 @@ cachepic_t        *Draw_CachePic (const char *path, qboolean persistent)
                                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, TEXF_ALPHA | persistentflag, palette_complete);
+                               pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, pix, TEXTYPE_PALETTE, flags, palette_complete);
                        }
                        else
-                               pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, TEXF_ALPHA | persistentflag, palette_complete);
+                               pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, flags, palette_complete);
                }
        }
 
@@ -374,7 +404,11 @@ cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, q
                if (pic == NULL)
                {
                        if (numcachepics == MAX_CACHED_PICS)
-                               Sys_Error ("numcachepics == MAX_CACHED_PICS");
+                       {
+                               Con_Printf ("Draw_NewPic: numcachepics == MAX_CACHED_PICS");
+                               // FIXME: support NULL in callers?
+                               return cachepics; // return the first one
+                       }
                        pic = cachepics + (numcachepics++);
                        strcpy (pic->name, picname);
                        // link into list