X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=135cac695bd347c4f7d3c32c8c7c72fd5c779fbd;hb=7da3f74c75363169da55547a5758a10735352b95;hp=358c7251844a9aa79f98d076a38b4ec34de780b7;hpb=eab50b35822052aad2a31fece513583600e5941f;p=xonotic%2Fdarkplaces.git

diff --git a/gl_draw.c b/gl_draw.c
index 358c7251..135cac69 100644
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -20,6 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 #include "image.h"
+#include "wad.h"
+
+#include "cl_video.h"
+
 
 static rtexture_t *char_texture;
 
@@ -34,6 +38,41 @@ static int numcachepics;
 
 static rtexturepool_t *drawtexturepool;
 
+static qbyte concharimage[11356] =
+{
+#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;
+
+	for (i = 0;i < 32768;i++)
+	{
+		buffer[i][0] = 255;
+		buffer[i][1] = 255;
+		buffer[i][2] = 255;
+		buffer[i][3] = data[i*4+0];
+	}
+
+	for (i = 32768;i < 65536;i++)
+	{
+		buffer[i][0] = 255;
+		buffer[i][1] = 0;
+		buffer[i][2] = 0;
+		buffer[i][3] = data[i*4+0];
+	}
+	Mem_Free(data);
+	return R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
+}
+
 static qbyte pointerimage[256] =
 {
 	"333333332......."
@@ -223,11 +262,26 @@ Draw_CachePic
 ================
 */
 // FIXME: move this to client somehow
-cachepic_t	*Draw_CachePic (char *path)
+cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
 {
 	int i, crc, hashkey;
 	cachepic_t *pic;
 	qpic_t *p;
+	int persistentflag;
+
+    if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1)) {
+		clvideo_t *video;
+
+		video = CL_GetVideo(path);
+		if( video )
+			return &video->cpif;
+	}
+
+	if (persistent) {
+		persistentflag = TEXF_PRECACHE;
+	} else {
+		persistentflag = 0;
+	}
 
 	crc = CRC_Block(path, strlen(path));
 	hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
@@ -244,11 +298,11 @@ cachepic_t	*Draw_CachePic (char *path)
 	cachepichash[hashkey] = pic;
 
 	// load the pic from disk
-	pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, TEXF_ALPHA | TEXF_PRECACHE);
+	pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, TEXF_ALPHA | persistentflag);
 	if (pic->tex == NULL && !strncmp(path, "gfx/", 4))
 	{
 		// compatibility with older versions
-		pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, TEXF_ALPHA | TEXF_PRECACHE);
+		pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, TEXF_ALPHA | persistentflag);
 		// failed to find gfx/whatever.tga or similar, try the wad
 		if (pic->tex == NULL && (p = W_GetLumpName (path + 4)))
 		{
@@ -260,14 +314,19 @@ cachepic_t	*Draw_CachePic (char *path)
 				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 | TEXF_PRECACHE, palette_complete);
+				pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, pix, TEXTYPE_PALETTE, TEXF_ALPHA | persistentflag, palette_complete);
 			}
 			else
-				pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, TEXF_ALPHA | TEXF_PRECACHE, palette_complete);
+				pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, TEXF_ALPHA | persistentflag, palette_complete);
 		}
 	}
+
+	if (pic->tex == NULL && !strcmp(path, "gfx/conchars"))
+		pic->tex = draw_generateconchars();
 	if (pic->tex == NULL && !strcmp(path, "ui/mousepointer.tga"))
 		pic->tex = draw_generatemousepointer();
+	if (pic->tex == NULL && !strcmp(path, "gfx/prydoncursor001.tga"))
+		pic->tex = draw_generatemousepointer();
 	if (pic->tex == NULL && !strcmp(path, "gfx/crosshair1.tga"))
 		pic->tex = draw_generatecrosshair(0);
 	if (pic->tex == NULL && !strcmp(path, "gfx/crosshair2.tga"))
@@ -283,7 +342,7 @@ cachepic_t	*Draw_CachePic (char *path)
 	if (pic->tex == NULL)
 	{
 		Con_Printf("Draw_CachePic: failed to load %s\n", path);
-		pic->tex = r_notexture;
+		pic->tex = r_texture_notexture;
 	}
 
 	pic->width = R_TextureWidth(pic->tex);
@@ -291,7 +350,7 @@ cachepic_t	*Draw_CachePic (char *path)
 	return pic;
 }
 
-cachepic_t *Draw_NewPic(char *picname, int width, int height, int alpha, qbyte *pixels)
+cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, qbyte *pixels)
 {
 	int crc, hashkey;
 	cachepic_t *pic;
@@ -332,7 +391,7 @@ cachepic_t *Draw_NewPic(char *picname, int width, int height, int alpha, qbyte *
 	return pic;
 }
 
-void Draw_FreePic(char *picname)
+void Draw_FreePic(const char *picname)
 {
 	int crc;
 	int hashkey;
@@ -364,7 +423,7 @@ static void gl_draw_start(void)
 	numcachepics = 0;
 	memset(cachepichash, 0, sizeof(cachepichash));
 
-	char_texture = Draw_CachePic("gfx/conchars")->tex;
+	char_texture = Draw_CachePic("gfx/conchars", true)->tex;
 }
 
 static void gl_draw_shutdown(void)
@@ -396,7 +455,7 @@ void R_DrawQueue(void)
 	float x, y, w, h, s, t, u, v, *av, *at, c[4];
 	cachepic_t *pic;
 	drawqueue_t *dq;
-	char *str, *currentpic;
+	char *str;
 	int batchcount;
 	unsigned int color;
 	drawqueuemesh_t *mesh;
@@ -418,8 +477,20 @@ void R_DrawQueue(void)
 			quadelements[pos++] = num + 3;
 		}
 	}
-	qglViewport(0, 0, vid.realwidth, vid.realheight);
-	GL_SetupView_Mode_Ortho(0, 0, vid.conwidth, vid.conheight, -10, 100);
+
+	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.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.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);
 
@@ -427,11 +498,9 @@ void R_DrawQueue(void)
 
 	memset(&m, 0, sizeof(m));
 
-	currentpic = "";
 	pic = NULL;
 	texnum = 0;
 	color = 0;
-	GL_ColorPointer(NULL);
 	GL_Color(1,1,1,1);
 
 	batch = false;
@@ -440,7 +509,7 @@ void R_DrawQueue(void)
 	{
 		dq = (drawqueue_t *)(r_refdef.drawqueue + pos);
 		color = dq->color;
-		
+
 		if(dq->flags == DRAWFLAG_ADDITIVE)
 			GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
 		else if(dq->flags == DRAWFLAG_MODULATE)
@@ -467,18 +536,15 @@ void R_DrawQueue(void)
 		case DRAWQUEUE_STRING:
 			GL_Color(c[0], c[1], c[2], c[3]);
 			str = (char *)(dq + 1);
-			if (strcmp("gfx/conchars", currentpic))
-			{
-				currentpic = "gfx/conchars";
-				m.tex[0] = chartexnum;
-			}
 			batchcount = 0;
 			m.pointer_vertex = varray_vertex3f;
+			m.pointer_color = NULL;
 			m.pointer_texcoord[0] = varray_texcoord2f[0];
+			m.tex[0] = chartexnum;
 			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 != ' ')
 				{
@@ -499,7 +565,9 @@ void R_DrawQueue(void)
 					batchcount++;
 					if (batchcount >= 128)
 					{
-						R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements);
+						GL_LockArrays(0, batchcount * 4);
+						R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
+						GL_LockArrays(0, 0);
 						batchcount = 0;
 						at = varray_texcoord2f[0];
 						av = varray_vertex3f;
@@ -508,28 +576,34 @@ void R_DrawQueue(void)
 				x += w;
 			}
 			if (batchcount > 0)
-				R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements);
+			{
+				GL_LockArrays(0, batchcount * 4);
+				R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements);
+				GL_LockArrays(0, 0);
+			}
 			break;
 		case DRAWQUEUE_MESH:
 			mesh = (void *)(dq + 1);
 			m.pointer_vertex = mesh->data_vertex3f;
-			GL_ColorPointer(mesh->data_color4f);
-			m.tex[0] = R_GetTexture(mesh->texture);
+			m.pointer_color = mesh->data_color4f;
 			m.pointer_texcoord[0] = mesh->data_texcoord2f;
+			m.tex[0] = R_GetTexture(mesh->texture);
+			if (!m.tex[0])
+				m.pointer_texcoord[0] = NULL;
 			R_Mesh_State(&m);
-			R_Mesh_Draw(mesh->num_vertices, mesh->num_triangles, mesh->data_element3i);
-			GL_ColorPointer(NULL);
-			currentpic = "\0";
+			GL_LockArrays(0, mesh->num_vertices);
+			R_Mesh_Draw(0, mesh->num_vertices, mesh->num_triangles, mesh->data_element3i);
+			GL_LockArrays(0, 0);
 			break;
 		case DRAWQUEUE_SETCLIP:
 			{
 				// We have to convert the con coords into real coords
 				int x , y, width, height;
-				x = dq->x * ((float)vid.realwidth / vid.conwidth);
-				// 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);
+				x = dq->x * ((float)vid.width / vid_conwidth.integer);
+				// OGL uses top to bottom
+				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);
 
@@ -538,7 +612,7 @@ void R_DrawQueue(void)
 			break;
 		case DRAWQUEUE_RESETCLIP:
 			GL_ScissorTest(false);
-			break;				
+			break;
 		}
 	}
 
@@ -564,7 +638,7 @@ void R_DrawQueue(void)
 			while (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f)
 			{
 				GL_Color(bound(0, c[0] - 1, 1), bound(0, c[1] - 1, 1), bound(0, c[2] - 1, 1), 1);
-				R_Mesh_Draw(3, 1, polygonelements);
+				R_Mesh_Draw(0, 3, 1, polygonelements);
 				VectorScale(c, 0.5, c);
 			}
 		}
@@ -580,7 +654,7 @@ void R_DrawQueue(void)
 		{
 			GL_BlendFunc(GL_ONE, GL_ONE);
 			GL_Color(c[0], c[1], c[2], 1);
-			R_Mesh_Draw(3, 1, polygonelements);
+			R_Mesh_Draw(0, 3, 1, polygonelements);
 		}
 	}
 }