X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=d6879c8b6f6fc27d6552bf551ea5ea470b6a306a;hb=aa33d8f8642530f7f266d6cde1422f95aa74b2be;hp=7ae8700738f4a0bc3f104db4813e62ab63d1ec58;hpb=d010b5177ed500178d3a40b49788c8093127ecf4;p=xonotic%2Fdarkplaces.git

diff --git a/gl_draw.c b/gl_draw.c
index 7ae87007..d6879c8b 100644
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -30,6 +30,7 @@ static rtexture_t *char_texture;
 //=============================================================================
 /* Support Routines */
 
+#define FONT_FILESIZE 13468
 #define MAX_CACHED_PICS 256
 #define CACHEPICHASHSIZE 256
 static cachepic_t *cachepichash[CACHEPICHASHSIZE];
@@ -38,43 +39,66 @@ static int numcachepics;
 
 static rtexturepool_t *drawtexturepool;
 
-static qbyte concharimage[11356] =
+static qbyte 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;
+	double random;
 
-	fs_filesize = 11356;
+	fs_filesize = FONT_FILESIZE;
 	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);
 }
 
-static qbyte pointerimage[256] =
-{
+static char *pointerimage =
 	"333333332......."
 	"26777761........"
 	"2655541........."
@@ -91,7 +115,7 @@ static qbyte pointerimage[256] =
 	"................"
 	"................"
 	"................"
-};
+;
 
 static rtexture_t *draw_generatemousepointer(void)
 {
@@ -118,9 +142,9 @@ static rtexture_t *draw_generatemousepointer(void)
 }
 
 // must match NUMCROSSHAIRS in r_crosshairs.c
-#define NUMCROSSHAIRS 5
+#define NUMCROSSHAIRS 6
 
-static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
+static char *crosshairtexdata[NUMCROSSHAIRS] =
 {
 	"................"
 	"................"
@@ -168,10 +192,10 @@ static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
 	".......44......."
 	".......44......."
 	"................"
+	"................"
 	".......77......."
 	".......77......."
 	"................"
-	"................"
 	,
 	"................"
 	"................"
@@ -187,7 +211,7 @@ static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
 	"........7......."
 	"........7......."
 	"........7......."
-	"................"
+	"........7......."
 	"................"
 	,
 	"................"
@@ -206,6 +230,23 @@ static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
 	"................"
 	"................"
 	"................"
+	,
+	"................"
+	"................"
+	"................"
+	"................"
+	"................"
+	"................"
+	"................"
+	".......55......."
+	".......55......."
+	"................"
+	"................"
+	"................"
+	"................"
+	"................"
+	"................"
+	"................"
 };
 
 static rtexture_t *draw_generatecrosshair(int num)
@@ -267,9 +308,11 @@ 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,34 +320,38 @@ 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));
+	crc = CRC_Block((qbyte *)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");
+		// 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)))
+		if (pic->tex == NULL && (p = (qpic_t *)W_GetLumpName (path + 4)))
 		{
 			if (!strcmp(path, "gfx/conchars"))
 			{
@@ -314,10 +361,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);
 		}
 	}
 
@@ -337,6 +384,8 @@ cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
 		pic->tex = draw_generatecrosshair(3);
 	if (pic->tex == NULL && !strcmp(path, "gfx/crosshair5.tga"))
 		pic->tex = draw_generatecrosshair(4);
+	if (pic->tex == NULL && !strcmp(path, "gfx/crosshair6.tga"))
+		pic->tex = draw_generatecrosshair(5);
 	if (pic->tex == NULL && !strcmp(path, "gfx/colorcontrol/ditherpattern.tga"))
 		pic->tex = draw_generateditherpattern();
 	if (pic->tex == NULL)
@@ -355,7 +404,7 @@ cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, q
 	int crc, hashkey;
 	cachepic_t *pic;
 
-	crc = CRC_Block(picname, strlen(picname));
+	crc = CRC_Block((qbyte *)picname, strlen(picname));
 	hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
 	for (pic = cachepichash[hashkey];pic;pic = pic->chain)
 		if (!strcmp (picname, pic->name))
@@ -374,7 +423,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
@@ -397,7 +450,7 @@ void Draw_FreePic(const char *picname)
 	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((qbyte *)picname, strlen(picname));
 	hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
 	for (pic = cachepichash[hashkey];pic;pic = pic->chain)
 	{
@@ -478,19 +531,19 @@ void R_DrawQueue(void)
 		}
 	}
 
-	r_view_width = bound(0, r_refdef.width, vid.realwidth);
-	r_view_height = bound(0, r_refdef.height, vid.realheight);
+	r_view_width = bound(0, r_refdef.width, vid.width);
+	r_view_height = bound(0, r_refdef.height, vid.height);
 	r_view_depth = 1;
-	r_view_x = bound(0, r_refdef.x, vid.realwidth - r_refdef.width);
-	r_view_y = bound(0, r_refdef.y, vid.realheight - r_refdef.height);
+	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);
 
-	qglViewport(r_view_x, vid.realheight - (r_view_y + r_view_height), r_view_width, r_view_height);
-	GL_SetupView_Mode_Ortho(0, 0, vid.conwidth, vid.conheight, -10, 100);
+	qglViewport(r_view_x, vid.height - (r_view_y + r_view_height), r_view_width, r_view_height);
+	GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
 	qglDepthFunc(GL_LEQUAL);
 	R_Mesh_Matrix(&r_identitymatrix);
 
@@ -544,7 +597,7 @@ void R_DrawQueue(void)
 			R_Mesh_State(&m);
 			at = varray_texcoord2f[0];
 			av = varray_vertex3f;
-			while ((num = *str++) && x < vid.conwidth)
+			while ((num = *str++) && x < vid_conwidth.integer)
 			{
 				if (num != ' ')
 				{
@@ -583,7 +636,7 @@ void R_DrawQueue(void)
 			}
 			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;
@@ -599,11 +652,11 @@ void R_DrawQueue(void)
 			{
 				// We have to convert the con coords into real coords
 				int x , y, width, height;
-				x = dq->x * ((float)vid.realwidth / vid.conwidth);
+				x = dq->x * ((float)vid.width / vid_conwidth.integer);
 				// OGL uses top to bottom
-				y = dq->y * ((float) vid.realheight / vid.conheight);
-				width = dq->scalex * ((float)vid.realwidth / vid.conwidth);
-				height = dq->scaley * ((float)vid.realheight / vid.conheight);
+				y = dq->y * ((float) vid.height / vid_conheight.integer);
+				width = dq->scalex * ((float)vid.width / vid_conwidth.integer);
+				height = dq->scaley * ((float)vid.height / vid_conheight.integer);
 
 				GL_Scissor(x, y, width, height);