X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=f0b1d40508da475d8a9501ebbf6ced2a740b34a3;hb=563d68e14d319fd1e9fcfae10740d2136de14e31;hp=8830e0600c35a15135401f6acd63e164d84819cc;hpb=bab38ea82ab69446517671c5dba4ca99935bd0e9;p=xonotic%2Fdarkplaces.git

diff --git a/gl_draw.c b/gl_draw.c
index 8830e060..f0b1d405 100644
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -20,8 +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"
 
-cvar_t scr_conalpha = {CVAR_SAVE, "scr_conalpha", "1"};
 
 static rtexture_t *char_texture;
 
@@ -36,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......."
@@ -199,10 +236,24 @@ static rtexture_t *draw_generatecrosshair(int num)
 
 static rtexture_t *draw_generateditherpattern(void)
 {
+#if 1
+	int x, y;
+	qbyte data[8*8*4];
+	for (y = 0;y < 8;y++)
+	{
+		for (x = 0;x < 8;x++)
+		{
+			data[(y*8+x)*4+0] = data[(y*8+x)*4+1] = data[(y*8+x)*4+2] = ((x^y) & 4) ? 255 : 0;
+			data[(y*8+x)*4+3] = 255;
+		}
+	}
+	return R_LoadTexture2D(drawtexturepool, "ditherpattern", 8, 8, data, TEXTYPE_RGBA, TEXF_FORCENEAREST | TEXF_PRECACHE, NULL);
+#else
 	qbyte 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);
+#endif
 }
 
 /*
@@ -211,11 +262,26 @@ Draw_CachePic
 ================
 */
 // FIXME: move this to client somehow
-cachepic_t	*Draw_CachePic (char *path)
+cachepic_t	*Draw_CachePic (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;
@@ -232,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)))
 		{
@@ -248,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"))
@@ -270,8 +341,8 @@ cachepic_t	*Draw_CachePic (char *path)
 		pic->tex = draw_generateditherpattern();
 	if (pic->tex == NULL)
 	{
-		Con_Printf ("Draw_CachePic: failed to load %s\n", path);
-		pic->tex = r_notexture;
+		Con_Printf("Draw_CachePic: failed to load %s\n", path);
+		pic->tex = r_texture_notexture;
 	}
 
 	pic->width = R_TextureWidth(pic->tex);
@@ -330,7 +401,7 @@ void Draw_FreePic(char *picname)
 	hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
 	for (pic = cachepichash[hashkey];pic;pic = pic->chain)
 	{
-		if (!strcmp (picname, pic->name))
+		if (!strcmp (picname, pic->name) && pic->tex)
 		{
 			R_FreeTexture(pic->tex);
 			pic->width = 0;
@@ -352,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)
@@ -369,8 +440,6 @@ static void gl_draw_newmap(void)
 
 void GL_Draw_Init (void)
 {
-	Cvar_RegisterVariable (&scr_conalpha);
-
 	numcachepics = 0;
 	memset(cachepichash, 0, sizeof(cachepichash));
 
@@ -380,15 +449,13 @@ void GL_Draw_Init (void)
 float blendvertex3f[9] = {-5000, -5000, 10, 10000, -5000, 10, -5000, 10000, 10};
 
 int quadelements[768];
-float textverts[128*4*3];
-float texttexcoords[128*4*2];
 void R_DrawQueue(void)
 {
-	int pos, num, chartexnum, overbright, texnum, additive, batch;
+	int pos, num, chartexnum, texnum, batch;
 	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;
@@ -410,41 +477,54 @@ void R_DrawQueue(void)
 			quadelements[pos++] = num + 3;
 		}
 	}
-	GL_SetupView_ViewPort(vid.realx, vid.realy, vid.realwidth, vid.realheight);
+
+	r_view_width = bound(0, r_refdef.width, vid.realwidth);
+	r_view_height = bound(0, r_refdef.height, vid.realheight);
+	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_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);
 	qglDepthFunc(GL_LEQUAL);
-	R_Mesh_Start();
 	R_Mesh_Matrix(&r_identitymatrix);
 
 	chartexnum = R_GetTexture(char_texture);
 
 	memset(&m, 0, sizeof(m));
-	m.tex[0] = 0;
-	R_Mesh_TextureState(&m);
 
-	currentpic = "";
 	pic = NULL;
 	texnum = 0;
 	color = 0;
+	GL_Color(1,1,1,1);
 
-	overbright = v_overbrightbits.integer;
 	batch = false;
 	batchcount = 0;
 	for (pos = 0;pos < r_refdef.drawqueuesize;pos += ((drawqueue_t *)(r_refdef.drawqueue + pos))->size)
 	{
 		dq = (drawqueue_t *)(r_refdef.drawqueue + pos);
-		additive = (dq->flags & DRAWFLAG_ADDITIVE) != 0;
 		color = dq->color;
-		m.blendfunc1 = GL_SRC_ALPHA;
-		if (additive)
-			m.blendfunc2 = GL_ONE;
+
+		if(dq->flags == DRAWFLAG_ADDITIVE)
+			GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+		else if(dq->flags == DRAWFLAG_MODULATE)
+			GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
+		else if(dq->flags == DRAWFLAG_2XMODULATE)
+			GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
 		else
-			m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
-		m.depthdisable = true;
+			GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-		c[0] = (float) ((color >> 24) & 0xFF) * (1.0f / 255.0f) * r_colorscale;
-		c[1] = (float) ((color >> 16) & 0xFF) * (1.0f / 255.0f) * r_colorscale;
-		c[2] = (float) ((color >>  8) & 0xFF) * (1.0f / 255.0f) * r_colorscale;
+		GL_DepthMask(true);
+		GL_DepthTest(false);
+
+		c[0] = (float) ((color >> 24) & 0xFF) * (1.0f / 255.0f);
+		c[1] = (float) ((color >> 16) & 0xFF) * (1.0f / 255.0f);
+		c[2] = (float) ((color >>  8) & 0xFF) * (1.0f / 255.0f);
 		c[3] = (float) ( color        & 0xFF) * (1.0f / 255.0f);
 		x = dq->x;
 		y = dq->y;
@@ -454,16 +534,16 @@ void R_DrawQueue(void)
 		switch(dq->command)
 		{
 		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;
-			at = texttexcoords;
-			av = textverts;
-			GL_Color(c[0], c[1], c[2], c[3]);
+			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)
 			{
 				if (num != ' ')
@@ -485,83 +565,53 @@ void R_DrawQueue(void)
 					batchcount++;
 					if (batchcount >= 128)
 					{
-						if (gl_mesh_copyarrays.integer)
-						{
-							m.pointervertexcount = 0;
-							m.pointer_vertex = NULL;
-							m.pointer_texcoord[0] = NULL;
-							m.pointer_color = NULL;
-							R_Mesh_State(&m);
-							R_Mesh_GetSpace(batchcount * 4);
-							R_Mesh_CopyVertex3f(textverts, batchcount * 4);
-							R_Mesh_CopyTexCoord2f(0, texttexcoords, batchcount * 4);
-						}
-						else
-						{
-							m.pointervertexcount = batchcount * 4;
-							m.pointer_vertex = textverts;
-							m.pointer_texcoord[0] = texttexcoords;
-							m.pointer_color = NULL;
-							R_Mesh_State(&m);
-						}
-						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 = texttexcoords;
-						av = textverts;
+						at = varray_texcoord2f[0];
+						av = varray_vertex3f;
 					}
 				}
 				x += w;
 			}
 			if (batchcount > 0)
 			{
-				if (gl_mesh_copyarrays.integer)
-				{
-					m.pointervertexcount = 0;
-					m.pointer_vertex = NULL;
-					m.pointer_texcoord[0] = NULL;
-					m.pointer_color = NULL;
-					R_Mesh_State(&m);
-					R_Mesh_GetSpace(batchcount * 4);
-					R_Mesh_CopyVertex3f(textverts, batchcount * 4);
-					R_Mesh_CopyTexCoord2f(0, texttexcoords, batchcount * 4);
-				}
-				else
-				{
-					m.pointervertexcount = batchcount * 4;
-					m.pointer_vertex = textverts;
-					m.pointer_texcoord[0] = texttexcoords;
-					m.pointer_color = NULL;
-					R_Mesh_State(&m);
-				}
-				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;
+			m.pointer_color = mesh->data_color4f;
+			m.pointer_texcoord[0] = mesh->data_texcoord2f;
 			m.tex[0] = R_GetTexture(mesh->texture);
-			GL_UseColorArray();
-			if (gl_mesh_copyarrays.integer)
-			{
-				m.pointervertexcount = 0;
-				m.pointer_vertex = NULL;
+			if (!m.tex[0])
 				m.pointer_texcoord[0] = NULL;
-				m.pointer_color = NULL;
-				R_Mesh_State(&m);
-				R_Mesh_GetSpace(mesh->numvertices);
-				R_Mesh_CopyVertex3f(mesh->vertex3f, mesh->numvertices);
-				R_Mesh_CopyTexCoord2f(0, mesh->texcoord2f, mesh->numvertices);
-				R_Mesh_CopyColor4f(mesh->color4f, mesh->numvertices);
-			}
-			else
+			R_Mesh_State(&m);
+			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:
 			{
-				m.pointervertexcount = mesh->numvertices;
-				m.pointer_vertex = mesh->vertex3f;
-				m.pointer_texcoord[0] = mesh->texcoord2f;
-				m.pointer_color = mesh->color4f;
-				R_Mesh_State(&m);
+				// 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);
+
+				GL_Scissor(x, y, width, height);
+
+				GL_ScissorTest(true);
 			}
-			R_Mesh_Draw(mesh->numvertices, mesh->numtriangles, mesh->element3i);
-			currentpic = "\0";
+			break;
+		case DRAWQUEUE_RESETCLIP:
+			GL_ScissorTest(false);
 			break;
 		}
 	}
@@ -570,7 +620,10 @@ void R_DrawQueue(void)
 	{
 		// all the blends ignore depth
 		memset(&m, 0, sizeof(m));
-		m.depthdisable = true;
+		m.pointer_vertex = blendvertex3f;
+		R_Mesh_State(&m);
+		GL_DepthMask(true);
+		GL_DepthTest(false);
 		if (v_color_enable.integer)
 		{
 			c[0] = v_color_white_r.value;
@@ -579,27 +632,13 @@ void R_DrawQueue(void)
 		}
 		else
 			c[0] = c[1] = c[2] = v_contrast.value;
-		VectorScale(c, (float) (1 << v_overbrightbits.integer), c);
 		if (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f)
 		{
-			m.blendfunc1 = GL_DST_COLOR;
-			m.blendfunc2 = GL_ONE;
-			if (gl_mesh_copyarrays.integer)
-			{
-				R_Mesh_State(&m);
-				R_Mesh_GetSpace(3);
-				R_Mesh_CopyVertex3f(blendvertex3f, 3);
-			}
-			else
-			{
-				m.pointervertexcount = 3;
-				m.pointer_vertex = blendvertex3f;
-				R_Mesh_State(&m);
-			}
+			GL_BlendFunc(GL_DST_COLOR, GL_ONE);
 			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);
 			}
 		}
@@ -613,26 +652,10 @@ void R_DrawQueue(void)
 			c[0] = c[1] = c[2] = v_brightness.value;
 		if (c[0] >= 0.01f || c[1] >= 0.01f || c[2] >= 0.01f)
 		{
-			m.blendfunc1 = GL_ONE;
-			m.blendfunc2 = GL_ONE;
-			if (gl_mesh_copyarrays.integer)
-			{
-				m.pointervertexcount = 0;
-				m.pointer_vertex = NULL;
-				R_Mesh_State(&m);
-				R_Mesh_GetSpace(3);
-				R_Mesh_CopyVertex3f(blendvertex3f, 3);
-			}
-			else
-			{
-				m.pointervertexcount = 3;
-				m.pointer_vertex = blendvertex3f;
-				R_Mesh_State(&m);
-			}
+			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);
 		}
 	}
-	R_Mesh_Finish();
 }