X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=52ae5a6257d725ae3f560fadc381e864484282dc;hb=e3398d6d0804cacfeca760a45db71ed26c25cbd7;hp=775a150bd2e094a4d2d9f26f185eb707ca489f0f;hpb=fc83bfe29745415b7ab325a045d637d901450b22;p=xonotic%2Fdarkplaces.git

diff --git a/gl_draw.c b/gl_draw.c
index 775a150b..52ae5a62 100644
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -197,10 +197,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
 }
 
 /*
@@ -268,7 +282,7 @@ cachepic_t	*Draw_CachePic (char *path)
 		pic->tex = draw_generateditherpattern();
 	if (pic->tex == NULL)
 	{
-		Con_Printf ("Draw_CachePic: failed to load %s\n", path);
+		Con_Printf("Draw_CachePic: failed to load %s\n", path);
 		pic->tex = r_notexture;
 	}
 
@@ -328,7 +342,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;
@@ -382,7 +396,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;
@@ -404,22 +418,19 @@ void R_DrawQueue(void)
 			quadelements[pos++] = num + 3;
 		}
 	}
-	GL_SetupView_ViewPort(vid.realx, vid.realy, vid.realwidth, vid.realheight);
+	qglViewport(0, 0, vid.realwidth, vid.realheight);
 	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_State_Texture(&m);
 
-	currentpic = "";
 	pic = NULL;
 	texnum = 0;
 	color = 0;
+	GL_Color(1,1,1,1);
 
 	batch = false;
 	batchcount = 0;
@@ -454,15 +465,12 @@ 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;
-			GL_VertexPointer(varray_vertex3f);
+			m.pointer_vertex = varray_vertex3f;
+			m.pointer_color = NULL;
 			m.pointer_texcoord[0] = varray_texcoord2f[0];
-			R_Mesh_State_Texture(&m);
+			m.tex[0] = chartexnum;
+			R_Mesh_State(&m);
 			at = varray_texcoord2f[0];
 			av = varray_vertex3f;
 			while ((num = *str++) && x < vid.conwidth)
@@ -486,7 +494,9 @@ void R_DrawQueue(void)
 					batchcount++;
 					if (batchcount >= 128)
 					{
+						GL_LockArrays(0, batchcount * 4);
 						R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements);
+						GL_LockArrays(0, 0);
 						batchcount = 0;
 						at = varray_texcoord2f[0];
 						av = varray_vertex3f;
@@ -495,18 +505,43 @@ void R_DrawQueue(void)
 				x += w;
 			}
 			if (batchcount > 0)
+			{
+				GL_LockArrays(0, batchcount * 4);
 				R_Mesh_Draw(batchcount * 4, batchcount * 2, quadelements);
+				GL_LockArrays(0, 0);
+			}
 			break;
 		case DRAWQUEUE_MESH:
 			mesh = (void *)(dq + 1);
-			GL_VertexPointer(mesh->data_vertex3f);
-			GL_ColorPointer(mesh->data_color4f);
-			m.tex[0] = R_GetTexture(mesh->texture);
+			m.pointer_vertex = mesh->data_vertex3f;
+			m.pointer_color = mesh->data_color4f;
 			m.pointer_texcoord[0] = mesh->data_texcoord2f;
-			R_Mesh_State_Texture(&m);
+			m.tex[0] = R_GetTexture(mesh->texture);
+			if (!m.tex[0])
+				m.pointer_texcoord[0] = NULL;
+			R_Mesh_State(&m);
+			GL_LockArrays(0, mesh->num_vertices);
 			R_Mesh_Draw(mesh->num_vertices, mesh->num_triangles, mesh->data_element3i);
-			currentpic = "\0";
+			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);
+
+				GL_Scissor(x, y, width, height);
+
+				GL_ScissorTest(true);
+			}
 			break;
+		case DRAWQUEUE_RESETCLIP:
+			GL_ScissorTest(false);
+			break;				
 		}
 	}
 
@@ -514,7 +549,8 @@ void R_DrawQueue(void)
 	{
 		// all the blends ignore depth
 		memset(&m, 0, sizeof(m));
-		R_Mesh_State_Texture(&m);
+		m.pointer_vertex = blendvertex3f;
+		R_Mesh_State(&m);
 		GL_DepthMask(true);
 		GL_DepthTest(false);
 		if (v_color_enable.integer)
@@ -528,7 +564,6 @@ void R_DrawQueue(void)
 		if (c[0] >= 1.01f || c[1] >= 1.01f || c[2] >= 1.01f)
 		{
 			GL_BlendFunc(GL_DST_COLOR, GL_ONE);
-			GL_VertexPointer(blendvertex3f);
 			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);
@@ -547,11 +582,9 @@ void R_DrawQueue(void)
 		if (c[0] >= 0.01f || c[1] >= 0.01f || c[2] >= 0.01f)
 		{
 			GL_BlendFunc(GL_ONE, GL_ONE);
-			GL_VertexPointer(blendvertex3f);
 			GL_Color(c[0], c[1], c[2], 1);
 			R_Mesh_Draw(3, 1, polygonelements);
 		}
 	}
-	R_Mesh_Finish();
 }