X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=91d866d393a746c0afdd6fbc2e1fcb4e4f70fed5;hb=fd9860c8c2d7ff69fe2e49958e93cc9ed6c179ac;hp=b1bda354f4ee203b6b4e210e541e7eea16d51e6c;hpb=8e93780440f50370361998ce76d9678195ed5292;p=xonotic%2Fdarkplaces.git

diff --git a/gl_draw.c b/gl_draw.c
index b1bda354..91d866d3 100644
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -29,7 +29,7 @@ dp_font_t dp_fonts[MAX_FONTS] = {{0}};
 
 cvar_t r_textshadow = {CVAR_SAVE, "r_textshadow", "0", "draws a shadow on all text to improve readability (note: value controls offset, 1 = 1 pixel, 1.5 = 1.5 pixels, etc)"};
 cvar_t r_textbrightness = {CVAR_SAVE, "r_textbrightness", "0", "additional brightness for text color codes (0 keeps colors as is, 1 makes them all white)"};
-cvar_t r_textcontrast = {CVAR_SAVE, "r_textcontrast", "1", "additional contrast for text color codes (1 keeps colors as is, 1 makes them all black)"};
+cvar_t r_textcontrast = {CVAR_SAVE, "r_textcontrast", "1", "additional contrast for text color codes (1 keeps colors as is, 0 makes them all black)"};
 
 extern cvar_t v_glslgamma;
 
@@ -452,7 +452,7 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
 	flags = TEXF_ALPHA;
 	if (!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT))
 		flags |= TEXF_PRECACHE;
-	if (strcmp(path, "gfx/colorcontrol/ditherpattern"))
+	if (!(cachepicflags & CACHEPICFLAG_NOCLAMP))
 		flags |= TEXF_CLAMP;
 	if (!(cachepicflags & CACHEPICFLAG_NOCOMPRESSION) && gl_texturecompression_2d.integer)
 		flags |= TEXF_COMPRESS;
@@ -601,7 +601,7 @@ extern int con_linewidth; // to force rewrapping
 static void LoadFont(qboolean override, const char *name, dp_font_t *fnt)
 {
 	int i;
-	float maxwidth;
+	float maxwidth, scale;
 	char widthfile[MAX_QPATH];
 	char *widthbuf;
 	fs_offset_t widthbufsize;
@@ -624,6 +624,7 @@ static void LoadFont(qboolean override, const char *name, dp_font_t *fnt)
 	// unspecified width == 1 (base width)
 	for(i = 1; i < 256; ++i)
 		fnt->width_of[i] = 1;
+	scale = 1;
 
 	// FIXME load "name.width", if it fails, fill all with 1
 	if((widthbuf = (char *) FS_LoadFile(widthfile, tempmempool, true, &widthbufsize)))
@@ -637,14 +638,44 @@ static void LoadFont(qboolean override, const char *name, dp_font_t *fnt)
 			if(!COM_ParseToken_Simple(&p, false, false))
 				return;
 
-			if(!strcmp(com_token, "extraspacing"))
+			switch(*com_token)
 			{
-				if(!COM_ParseToken_Simple(&p, false, false))
-					return;
-				extraspacing = atof(com_token);
+				case '0':
+				case '1':
+				case '2':
+				case '3':
+				case '4':
+				case '5':
+				case '6':
+				case '7':
+				case '8':
+				case '9':
+				case '+':
+				case '-':
+				case '.':
+					fnt->width_of[ch++] = atof(com_token) + extraspacing;
+					break;
+				default:
+					if(!strcmp(com_token, "extraspacing"))
+					{
+						if(!COM_ParseToken_Simple(&p, false, false))
+							return;
+						extraspacing = atof(com_token);
+					}
+					else if(!strcmp(com_token, "scale"))
+					{
+						if(!COM_ParseToken_Simple(&p, false, false))
+							return;
+						scale = atof(com_token);
+					}
+					else
+					{
+						Con_Printf("Warning: skipped unknown font property %s\n", com_token);
+						if(!COM_ParseToken_Simple(&p, false, false))
+							return;
+					}
+					break;
 			}
-			else
-				fnt->width_of[ch++] = atof(com_token) + extraspacing;
 		}
 
 		Mem_Free(widthbuf);
@@ -653,7 +684,11 @@ static void LoadFont(qboolean override, const char *name, dp_font_t *fnt)
 	maxwidth = fnt->width_of[1];
 	for(i = 2; i < 256; ++i)
 		maxwidth = max(maxwidth, fnt->width_of[i]);
-	fnt->width_of[0] = maxwidth;
+	fnt->maxwidth = maxwidth;
+
+	// fix up maxwidth for overlap
+	fnt->maxwidth *= scale;
+	fnt->scale = scale;
 
 	if(fnt == FONT_CONSOLE)
 		con_linewidth = -1; // rewrap console in next frame
@@ -778,6 +813,8 @@ static void _DrawQ_ProcessDrawFlag(int flags)
 		GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
 	else if(flags == DRAWFLAG_2XMODULATE)
 		GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
+	else if(flags == DRAWFLAG_SCREEN)
+		GL_BlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE);
 	else
 		GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 }
@@ -827,7 +864,7 @@ void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, flo
 	floats[3] = floats[6] = x + width;
 	floats[7] = floats[10] = y + height;
 
-	R_Mesh_Draw(0, 4, 2, polygonelements, 0, 0);
+	R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
 }
 
 void DrawQ_Fill(float x, float y, float width, float height, float red, float green, float blue, float alpha, int flags)
@@ -848,7 +885,7 @@ void DrawQ_Fill(float x, float y, float width, float height, float red, float gr
 	floats[3] = floats[6] = x + width;
 	floats[7] = floats[10] = y + height;
 
-	R_Mesh_Draw(0, 4, 2, polygonelements, 0, 0);
+	R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
 }
 
 // color tag printing
@@ -885,11 +922,19 @@ static void DrawQ_GetTextColor(float color[4], int colorindex, float r, float g,
 {
 	float C = r_textcontrast.value;
 	float B = r_textbrightness.value;
-	Vector4Copy(string_colors[colorindex], color);
-	Vector4Set(color, (color[0] * C + B) * r, (color[1] * C + B) * g, (color[2] * C + B) * b, color[3] * a);
+	if (colorindex & 0x10000) // that bit means RGB color
+	{
+		color[0] = ((colorindex >> 12) & 0xf) / 15.0;
+		color[1] = ((colorindex >> 8) & 0xf) / 15.0;
+		color[2] = ((colorindex >> 4) & 0xf) / 15.0;
+		color[3] = (colorindex & 0xf) / 15.0;
+	}
+	else
+		Vector4Copy(string_colors[colorindex], color);
+	Vector4Set(color, color[0] * r * C + B, color[1] * g * C + B, color[2] * b * C + B, color[3] * a);
 	if (shadow)
 	{
-		float shadowalpha = color[0]+color[1]+color[2] * 0.8;
+		float shadowalpha = (color[0]+color[1]+color[2]) * 0.8;
 		Vector4Set(color, 0, 0, 0, color[3] * bound(0, shadowalpha, 1));
 	}
 }
@@ -899,6 +944,8 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors(const char *text, size_t *maxl
 	int num, colorindex = STRING_COLOR_DEFAULT;
 	size_t i;
 	float x = 0;
+	char ch;
+	int tempcolorindex;
 
 	if (*maxlen < 1)
 		*maxlen = 1<<30;
@@ -908,27 +955,58 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors(const char *text, size_t *maxl
 	else
 		colorindex = *outcolor;
 
+	maxwidth /= fnt->scale;
+
 	for (i = 0;i < *maxlen && text[i];i++)
 	{
 		if (text[i] == ' ')
 		{
-			if(x + fnt->width_of[' '] > maxwidth)
+			if(x + fnt->width_of[(int) ' '] > maxwidth)
 				break; // oops, can't draw this
-			x += fnt->width_of[' '];
+			x += fnt->width_of[(int) ' '];
 			continue;
 		}
 		if (text[i] == STRING_COLOR_TAG && !ignorecolorcodes && i + 1 < *maxlen)
 		{
-			if (text[i+1] == STRING_COLOR_TAG)
+			ch = text[++i];
+            if (ch <= '9' && ch >= '0') // ^[0-9] found
 			{
-				i++;
+				colorindex = ch - '0';
+                continue;
 			}
-			else if (text[i+1] >= '0' && text[i+1] <= '9')
+			else if (ch == STRING_COLOR_RGB_TAG_CHAR && i + 3 < *maxlen ) // ^x found
 			{
-				colorindex = text[i+1] - '0';
-				i++;
-				continue;
+				// building colorindex...
+				ch = tolower(text[i+1]);
+				tempcolorindex = 0x10000; // binary: 1,0000,0000,0000,0000
+				if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 12;
+				else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 12;
+				else tempcolorindex = 0;
+				if (tempcolorindex)
+				{
+					ch = tolower(text[i+2]);
+					if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 8;
+					else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 8;
+					else tempcolorindex = 0;
+					if (tempcolorindex)
+					{
+						ch = tolower(text[i+3]);
+						if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 4;
+						else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 4;
+						else tempcolorindex = 0;
+						if (tempcolorindex)
+						{
+							colorindex = tempcolorindex | 0xf;
+							// ...done! now colorindex has rgba codes (1,rrrr,gggg,bbbb,aaaa)
+							i+=3;
+							continue;
+						}
+					}
+				}
 			}
+			else if (ch == STRING_COLOR_TAG) // ^^ found, ignore the first ^ and go to print the second
+				i++;
+			i--;
 		}
 		num = (unsigned char) text[i];
 		if(x + fnt->width_of[num] > maxwidth)
@@ -941,7 +1019,7 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors(const char *text, size_t *maxl
 	if (outcolor)
 		*outcolor = colorindex;
 
-	return x;
+	return x * fnt->scale;
 }
 
 float DrawQ_String_Font(float startx, float starty, const char *text, size_t maxlen, float w, float h, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt)
@@ -955,11 +1033,17 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 	float vertex3f[QUADELEMENTS_MAXQUADS*4*3];
 	float texcoord2f[QUADELEMENTS_MAXQUADS*4*2];
 	float color4f[QUADELEMENTS_MAXQUADS*4*4];
+	int ch;
+	int tempcolorindex;
 
 	int tw, th;
 	tw = R_TextureWidth(fnt->tex);
 	th = R_TextureHeight(fnt->tex);
 
+	starty -= (fnt->scale - 1) * h * 0.5; // center
+	w *= fnt->scale;
+	h *= fnt->scale;
+
 	if (maxlen < 1)
 		maxlen = 1<<30;
 
@@ -983,6 +1067,7 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 			colorindex = STRING_COLOR_DEFAULT;
 		else
 			colorindex = *outcolor;
+
 		DrawQ_GetTextColor(color, colorindex, basered, basegreen, baseblue, basealpha, shadow);
 
 		x = startx;
@@ -996,22 +1081,53 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 		{
 			if (text[i] == ' ')
 			{
-				x += fnt->width_of[' '] * w;
+				x += fnt->width_of[(int) ' '] * w;
 				continue;
 			}
 			if (text[i] == STRING_COLOR_TAG && !ignorecolorcodes && i + 1 < maxlen)
 			{
-				if (text[i+1] == STRING_COLOR_TAG)
+				ch = text[++i];
+				if (ch <= '9' && ch >= '0') // ^[0-9] found
 				{
-					i++;
-				}
-				else if (text[i+1] >= '0' && text[i+1] <= '9')
-				{
-					colorindex = text[i+1] - '0';
+					colorindex = ch - '0';
 					DrawQ_GetTextColor(color, colorindex, basered, basegreen, baseblue, basealpha, shadow);
-					i++;
 					continue;
 				}
+				else if (ch == STRING_COLOR_RGB_TAG_CHAR && i+3 < maxlen ) // ^x found
+				{
+					// building colorindex...
+					ch = tolower(text[i+1]);
+					tempcolorindex = 0x10000; // binary: 1,0000,0000,0000,0000
+					if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 12;
+					else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 12;
+					else tempcolorindex = 0;
+					if (tempcolorindex)
+					{
+						ch = tolower(text[i+2]);
+						if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 8;
+						else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 8;
+						else tempcolorindex = 0;
+						if (tempcolorindex)
+						{
+							ch = tolower(text[i+3]);
+							if (ch <= '9' && ch >= '0') tempcolorindex |= (ch - '0') << 4;
+							else if (ch >= 'a' && ch <= 'f') tempcolorindex |= (ch - 87) << 4;
+							else tempcolorindex = 0;
+							if (tempcolorindex)
+							{
+								colorindex = tempcolorindex | 0xf;
+								// ...done! now colorindex has rgba codes (1,rrrr,gggg,bbbb,aaaa)
+								//Con_Printf("^1colorindex:^7 %x\n", colorindex);
+								DrawQ_GetTextColor(color, colorindex, basered, basegreen, baseblue, basealpha, shadow);
+								i+=3;
+								continue;
+							}
+						}
+					}
+				}
+				else if (ch == STRING_COLOR_TAG)
+					i++;
+				i--;
 			}
 			num = (unsigned char) text[i];
 			thisw = fnt->width_of[num];
@@ -1024,14 +1140,14 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 			ac[ 4] = color[0];ac[ 5] = color[1];ac[ 6] = color[2];ac[ 7] = color[3];
 			ac[ 8] = color[0];ac[ 9] = color[1];ac[10] = color[2];ac[11] = color[3];
 			ac[12] = color[0];ac[13] = color[1];ac[14] = color[2];ac[15] = color[3];
-			at[ 0] = s  ;at[ 1] = t  ;
-			at[ 2] = s+u;at[ 3] = t  ;
-			at[ 4] = s+u;at[ 5] = t+v;
-			at[ 6] = s  ;at[ 7] = t+v;
-			av[ 0] = x  ;av[ 1] = y  ;av[ 2] = 10;
-			av[ 3] = x+w*thisw;av[ 4] = y  ;av[ 5] = 10;
-			av[ 6] = x+w*thisw;av[ 7] = y+h;av[ 8] = 10;
-			av[ 9] = x  ;av[10] = y+h;av[11] = 10;
+			at[ 0] = s		; at[ 1] = t	;
+			at[ 2] = s+u	; at[ 3] = t	;
+			at[ 4] = s+u	; at[ 5] = t+v	;
+			at[ 6] = s		; at[ 7] = t+v	;
+			av[ 0] = x			; av[ 1] = y	; av[ 2] = 10;
+			av[ 3] = x+w*thisw	; av[ 4] = y	; av[ 5] = 10;
+			av[ 6] = x+w*thisw	; av[ 7] = y+h	; av[ 8] = 10;
+			av[ 9] = x			; av[10] = y+h	; av[11] = 10;
 			ac += 16;
 			at += 8;
 			av += 12;
@@ -1039,7 +1155,7 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 			if (batchcount >= QUADELEMENTS_MAXQUADS)
 			{
 				GL_LockArrays(0, batchcount * 4);
-				R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements, 0, 0);
+				R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, NULL, quadelements, 0, 0);
 				GL_LockArrays(0, 0);
 				batchcount = 0;
 				ac = color4f;
@@ -1052,7 +1168,7 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
 	if (batchcount > 0)
 	{
 		GL_LockArrays(0, batchcount * 4);
-		R_Mesh_Draw(0, batchcount * 4, batchcount * 2, quadelements, 0, 0);
+		R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, NULL, quadelements, 0, 0);
 		GL_LockArrays(0, 0);
 	}
 
@@ -1068,18 +1184,19 @@ float DrawQ_String(float startx, float starty, const char *text, size_t maxlen,
 	return DrawQ_String_Font(startx, starty, text, maxlen, w, h, basered, basegreen, baseblue, basealpha, flags, outcolor, ignorecolorcodes, &dp_fonts[0]);
 }
 
-float DrawQ_TextWidth_Font_UntilWidth(const char *text, size_t *maxlen, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxWidth)
+float DrawQ_TextWidth_Font(const char *text, size_t maxlen, qboolean ignorecolorcodes, const dp_font_t *fnt)
 {
-	return DrawQ_TextWidth_Font_UntilWidth_TrackColors(text, maxlen, NULL, ignorecolorcodes, fnt, maxWidth);
+	return DrawQ_TextWidth_Font_UntilWidth(text, &maxlen, ignorecolorcodes, fnt, 1000000000);
 }
 
-float DrawQ_TextWidth_Font(const char *text, size_t maxlen, qboolean ignorecolorcodes, const dp_font_t *fnt)
+float DrawQ_TextWidth_Font_UntilWidth(const char *text, size_t *maxlen, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxWidth)
 {
-	return DrawQ_TextWidth_Font_UntilWidth(text, &maxlen, ignorecolorcodes, fnt, 1000000000);
+	return DrawQ_TextWidth_Font_UntilWidth_TrackColors(text, maxlen, NULL, ignorecolorcodes, fnt, maxWidth);
 }
 
 #if 0
 // not used
+// no ^xrgb management
 static int DrawQ_BuildColoredText(char *output2c, size_t maxoutchars, const char *text, int maxreadchars, qboolean ignorecolorcodes, int *outcolor)
 {
 	int color, numchars = 0;
@@ -1151,7 +1268,7 @@ void DrawQ_SuperPic(float x, float y, cachepic_t *pic, float width, float height
 	floats[28] = r4;floats[29] = g4;floats[30] = b4;floats[31] = a4;
 	floats[32] = r3;floats[33] = g3;floats[34] = b3;floats[35] = a3;
 
-	R_Mesh_Draw(0, 4, 2, polygonelements, 0, 0);
+	R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
 }
 
 void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags)
@@ -1166,7 +1283,7 @@ void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags)
 	R_SetupGenericShader(mesh->texture != NULL);
 
 	GL_LockArrays(0, mesh->num_vertices);
-	R_Mesh_Draw(0, mesh->num_vertices, mesh->num_triangles, mesh->data_element3i, 0, 0);
+	R_Mesh_Draw(0, mesh->num_vertices, 0, mesh->num_triangles, NULL, mesh->data_element3s, 0, 0);
 	GL_LockArrays(0, 0);
 }
 
@@ -1194,6 +1311,8 @@ void DrawQ_Line (float width, float x1, float y1, float x2, float y2, float r, f
 {
 	_DrawQ_ProcessDrawFlag(flags);
 
+	R_SetupGenericShader(false);
+
 	CHECKGLERROR
 	qglLineWidth(width);CHECKGLERROR
 
@@ -1257,7 +1376,7 @@ void R_DrawGamma(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(0, 3, 1, polygonelements, 0, 0);
+				R_Mesh_Draw(0, 3, 0, 1, NULL, polygonelements, 0, 0);
 				VectorScale(c, 0.5, c);
 			}
 		}
@@ -1273,7 +1392,7 @@ void R_DrawGamma(void)
 		{
 			GL_BlendFunc(GL_ONE, GL_ONE);
 			GL_Color(c[0], c[1], c[2], 1);
-			R_Mesh_Draw(0, 3, 1, polygonelements, 0, 0);
+			R_Mesh_Draw(0, 3, 0, 1, NULL, polygonelements, 0, 0);
 		}
 	}
 }