//=============================================================================
/* Support Routines */
-#define MAX_CACHED_PICS 256
+#define FONT_FILESIZE 13468
+#define MAX_CACHED_PICS 1024
#define CACHEPICHASHSIZE 256
static cachepic_t *cachepichash[CACHEPICHASHSIZE];
static cachepic_t cachepics[MAX_CACHED_PICS];
static rtexturepool_t *drawtexturepool;
-static qbyte concharimage[11356] =
+static unsigned char concharimage[FONT_FILESIZE] =
{
#include "lhfont.h"
};
-extern qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight);
-
static rtexture_t *draw_generateconchars(void)
{
int i;
- qbyte buffer[65536][4], *data = NULL;
-
- fs_filesize = 11356;
- data = LoadTGA (concharimage, 256, 256);
- fs_filesize = -1;
+ unsigned char buffer[65536][4], *data = NULL;
+ double random;
- for (i = 0;i < 32768;i++)
+ data = LoadTGA (concharimage, FONT_FILESIZE, 256, 256);
+// 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 + (unsigned char)(random * 64);
+ buffer[i][1] = 71 + (unsigned char)(random * 32);
+ buffer[i][2] = 23 + (unsigned char)(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 + (unsigned char)(random * 64);
+ buffer[i][1] = 95 + (unsigned char)(random * 64);
+ buffer[i][2] = 95 + (unsigned char)(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 + (unsigned char)(random * 64);
+ buffer[i][1] = 71 + (unsigned char)(random * 32);
+ buffer[i][2] = 23 + (unsigned char)(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 + (unsigned char)(random * 64);
+ buffer[i][1] = 43 + (unsigned char)(random * 32);
+ buffer[i][2] = 27 + (unsigned char)(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);
}
-static qbyte pointerimage[256] =
-{
+static char *pointerimage =
"333333332......."
"26777761........"
"2655541........."
"................"
"................"
"................"
-};
+;
static rtexture_t *draw_generatemousepointer(void)
{
int i;
- qbyte buffer[256][4];
+ unsigned char buffer[256][4];
for (i = 0;i < 256;i++)
{
if (pointerimage[i] == '.')
}
// must match NUMCROSSHAIRS in r_crosshairs.c
-#define NUMCROSSHAIRS 5
+#define NUMCROSSHAIRS 6
-static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
+static char *crosshairtexdata[NUMCROSSHAIRS] =
{
"................"
"................"
".......44......."
".......44......."
"................"
+ "................"
".......77......."
".......77......."
"................"
- "................"
,
"................"
"................"
"........7......."
"........7......."
"........7......."
- "................"
+ "........7......."
"................"
,
"................"
"................"
"................"
"................"
+ ,
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ ".......55......."
+ ".......55......."
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
};
static rtexture_t *draw_generatecrosshair(int num)
{
int i;
char *in;
- qbyte data[16*16][4];
+ unsigned char data[16*16][4];
in = crosshairtexdata[num];
for (i = 0;i < 16*16;i++)
{
data[i][0] = 255;
data[i][1] = 255;
data[i][2] = 255;
- data[i][3] = (qbyte) ((int) (in[i] - '0') * 255 / 7);
+ data[i][3] = (unsigned char) ((int) (in[i] - '0') * 255 / 7);
}
}
return R_LoadTexture2D(drawtexturepool, va("crosshair%i", num), 16, 16, &data[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
{
#if 1
int x, y;
- qbyte data[8*8*4];
+ unsigned char data[8*8*4];
for (y = 0;y < 8;y++)
{
for (x = 0;x < 8;x++)
}
return R_LoadTexture2D(drawtexturepool, "ditherpattern", 8, 8, data, TEXTYPE_RGBA, TEXF_FORCENEAREST | TEXF_PRECACHE, NULL);
#else
- qbyte data[16];
+ unsigned char data[16];
memset(data, 255, sizeof(data));
data[0] = data[1] = data[2] = data[12] = data[13] = data[14] = 0;
return R_LoadTexture2D(drawtexturepool, "ditherpattern", 2, 2, data, TEXTYPE_RGBA, TEXF_FORCENEAREST | TEXF_PRECACHE, NULL);
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);
return &video->cpif;
}
- if (persistent) {
- persistentflag = TEXF_PRECACHE;
- } else {
- persistentflag = 0;
- }
-
- crc = CRC_Block(path, strlen(path));
+ crc = CRC_Block((unsigned char *)path, strlen(path));
hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
for (pic = cachepichash[hashkey];pic;pic = pic->chain)
if (!strcmp (path, pic->name))
return pic;
if (numcachepics == MAX_CACHED_PICS)
- Sys_Error ("numcachepics == MAX_CACHED_PICS");
+ {
+ Con_Printf ("Draw_CachePic: numcachepics == MAX_CACHED_PICS\n");
+ // FIXME: support NULL in callers?
+ return cachepics; // return the first one
+ }
pic = cachepics + (numcachepics++);
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"))
+ 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)))
+ if (pic->tex == NULL && (p = (qpic_t *)W_GetLumpName (path + 4)))
{
if (!strcmp(path, "gfx/conchars"))
{
- qbyte *pix;
+ unsigned char *pix;
// conchars is a raw image and with the wrong transparent color
- pix = (qbyte *)p;
+ 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, 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);
}
}
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/colorcontrol/ditherpattern.tga"))
+ if (pic->tex == NULL && !strcmp(path, "gfx/crosshair6"))
+ pic->tex = draw_generatecrosshair(5);
+ if (pic->tex == NULL && !strcmp(path, "gfx/colorcontrol/ditherpattern"))
pic->tex = draw_generateditherpattern();
if (pic->tex == NULL)
{
return pic;
}
-cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, qbyte *pixels)
+cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, unsigned char *pixels)
{
int crc, hashkey;
cachepic_t *pic;
- crc = CRC_Block(picname, strlen(picname));
+ crc = CRC_Block((unsigned char *)picname, strlen(picname));
hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
for (pic = cachepichash[hashkey];pic;pic = pic->chain)
if (!strcmp (picname, pic->name))
if (pic == NULL)
{
if (numcachepics == MAX_CACHED_PICS)
- Sys_Error ("numcachepics == MAX_CACHED_PICS");
+ {
+ Con_Printf ("Draw_NewPic: numcachepics == MAX_CACHED_PICS\n");
+ // FIXME: support NULL in callers?
+ return cachepics; // return the first one
+ }
pic = cachepics + (numcachepics++);
strcpy (pic->name, picname);
// link into list
int hashkey;
cachepic_t *pic;
// this doesn't really free the pic, but does free it's texture
- crc = CRC_Block(picname, strlen(picname));
+ crc = CRC_Block((unsigned char *)picname, strlen(picname));
hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
for (pic = cachepichash[hashkey];pic;pic = pic->chain)
{
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);
}
break;
case DRAWQUEUE_MESH:
- mesh = (void *)(dq + 1);
+ mesh = (drawqueuemesh_t *)(dq + 1);
m.pointer_vertex = mesh->data_vertex3f;
m.pointer_color = mesh->data_color4f;
m.pointer_texcoord[0] = mesh->data_texcoord2f;
projects / xonotic / darkplaces.git / blobdiff