X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=e143ad3ea2277e8f3b570af032c5354e466d620c;hb=c1d9bbe13a1d1b1769f1690d94f3b49b9f16f840;hp=6304fb8e63dd0fd43a00c36ecc3cf94e979026ba;hpb=cd21cb3be9de4da3b2c1d2cb029352947b48166c;p=xonotic%2Fdarkplaces.git

diff --git a/gl_draw.c b/gl_draw.c
index 6304fb8e..e143ad3e 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
 }
 
 /*
@@ -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;
@@ -404,7 +418,7 @@ 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();
@@ -427,11 +441,13 @@ void R_DrawQueue(void)
 	{
 		dq = (drawqueue_t *)(r_refdef.drawqueue + pos);
 		color = dq->color;
-
-		if(dq->flags & DRAWFLAG_ADDITIVE)
+		
+		if(dq->flags == DRAWFLAG_ADDITIVE)
 			GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
-		else if(dq->flags & DRAWFLAG_MODULATE)
+		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
 			GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
@@ -497,14 +513,32 @@ void R_DrawQueue(void)
 			break;
 		case DRAWQUEUE_MESH:
 			mesh = (void *)(dq + 1);
-			GL_VertexPointer(mesh->vertex3f);
-			GL_ColorPointer(mesh->color4f);
+			GL_VertexPointer(mesh->data_vertex3f);
+			GL_ColorPointer(mesh->data_color4f);
 			m.tex[0] = R_GetTexture(mesh->texture);
-			m.pointer_texcoord[0] = mesh->texcoord2f;
+			m.pointer_texcoord[0] = mesh->data_texcoord2f;
 			R_Mesh_State_Texture(&m);
-			R_Mesh_Draw(mesh->numvertices, mesh->numtriangles, mesh->element3i);
+			R_Mesh_Draw(mesh->num_vertices, mesh->num_triangles, mesh->data_element3i);
 			currentpic = "\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;				
 		}
 	}