X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=5f78a0084afcbf9af2be1837b3c905a17fb05862;hb=40b76564595459c2a1bbbdac928e4a1b6f05eb3f;hp=f6a7532c1cc2ef90323b25e806d970d443cfef62;hpb=d95ef248f5f8b23e3eb84829cc33c28cca83f314;p=xonotic%2Fdarkplaces.git

diff --git a/gl_draw.c b/gl_draw.c
index f6a7532c..5f78a008 100644
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -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
@@ -745,13 +780,14 @@ void GL_Draw_Init (void)
 
 void _DrawQ_Setup(void)
 {
+	r_viewport_t viewport;
 	if (r_refdef.draw2dstage)
 		return;
 	r_refdef.draw2dstage = true;
 	CHECKGLERROR
-	qglViewport(r_refdef.view.x, vid.height - (r_refdef.view.y + r_refdef.view.height), r_refdef.view.width, r_refdef.view.height);CHECKGLERROR
+	R_Viewport_InitOrtho(&viewport, &identitymatrix, r_refdef.view.x, vid.height - r_refdef.view.y - r_refdef.view.height, r_refdef.view.width, r_refdef.view.height, 0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100, NULL);
+	R_SetViewport(&viewport);
 	GL_ColorMask(r_refdef.view.colormask[0], r_refdef.view.colormask[1], r_refdef.view.colormask[2], 1);
-	GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100);
 	qglDepthFunc(GL_LEQUAL);CHECKGLERROR
 	qglDisable(GL_POLYGON_OFFSET_FILL);CHECKGLERROR
 	GL_CullFace(GL_FRONT); // quake is backwards, this culls back faces
@@ -778,6 +814,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);
 }
@@ -830,6 +868,59 @@ void DrawQ_Pic(float x, float y, cachepic_t *pic, float width, float height, flo
 	R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
 }
 
+void DrawQ_RotPic(float x, float y, cachepic_t *pic, float width, float height, float org_x, float org_y, float angle, float red, float green, float blue, float alpha, int flags)
+{
+	float floats[20];
+	float af = DEG2RAD(-angle); // forward
+	float ar = DEG2RAD(-angle + 90); // right
+	float sinaf = sin(af);
+	float cosaf = cos(af);
+	float sinar = sin(ar);
+	float cosar = cos(ar);
+
+	_DrawQ_ProcessDrawFlag(flags);
+	GL_Color(red, green, blue, alpha);
+
+	R_Mesh_VertexPointer(floats, 0, 0);
+	R_Mesh_ColorPointer(NULL, 0, 0);
+	R_Mesh_ResetTextureState();
+	R_SetupGenericShader(pic != NULL);
+	if (pic)
+	{
+		if (width == 0)
+			width = pic->width;
+		if (height == 0)
+			height = pic->height;
+		R_Mesh_TexBind(0, R_GetTexture(pic->tex));
+		R_Mesh_TexCoordPointer(0, 2, floats + 12, 0, 0);
+
+		floats[12] = 0.0f;floats[13] = 0.0f;
+		floats[14] = 1.0f;floats[15] = 0.0f;
+		floats[16] = 1.0f;floats[17] = 1.0f;
+		floats[18] = 0.0f;floats[19] = 1.0f;
+	}
+
+	floats[2] = floats[5] = floats[8] = floats[11] = 0;
+
+// top left
+	floats[0] = x - cosaf*org_x - cosar*org_y;
+	floats[1] = y - sinaf*org_x - sinar*org_y;
+
+// top right
+	floats[3] = x + cosaf*(width-org_x) - cosar*org_y;
+	floats[4] = y + sinaf*(width-org_x) - sinar*org_y;
+
+// bottom right
+	floats[6] = x + cosaf*(width-org_x) + cosar*(height-org_y);
+	floats[7] = y + sinaf*(width-org_x) + sinar*(height-org_y);
+
+// bottom left
+	floats[9]  = x - cosaf*org_x + cosar*(height-org_y);
+	floats[10] = y - sinaf*org_x + sinar*(height-org_y);
+
+	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)
 {
 	float floats[12];
@@ -851,7 +942,7 @@ void DrawQ_Fill(float x, float y, float width, float height, float red, float gr
 	R_Mesh_Draw(0, 4, 0, 2, NULL, polygonelements, 0, 0);
 }
 
-// color tag printing
+/// color tag printing
 static const vec4_t string_colors[] =
 {
 	// Quake3 colors
@@ -885,11 +976,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 +998,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 +1009,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 +1073,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 +1087,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,7 +1121,8 @@ 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);
+
+		DrawQ_GetTextColor(color, colorindex, basered, basegreen, baseblue, basealpha, shadow != 0);
 
 		x = startx;
 		y = starty;
@@ -996,22 +1135,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++;
+					colorindex = ch - '0';
+					DrawQ_GetTextColor(color, colorindex, basered, basegreen, baseblue, basealpha, shadow != 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';
-					DrawQ_GetTextColor(color, colorindex, basered, basegreen, baseblue, basealpha, shadow);
-					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)
+								//Con_Printf("^1colorindex:^7 %x\n", colorindex);
+								DrawQ_GetTextColor(color, colorindex, basered, basegreen, baseblue, basealpha, shadow != 0);
+								i+=3;
+								continue;
+							}
+						}
+					}
 				}
+				else if (ch == STRING_COLOR_TAG)
+					i++;
+				i--;
 			}
 			num = (unsigned char) text[i];
 			thisw = fnt->width_of[num];
@@ -1024,14 +1194,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;
@@ -1068,18 +1238,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;
@@ -1197,7 +1368,7 @@ void DrawQ_Line (float width, float x1, float y1, float x2, float y2, float r, f
 	R_SetupGenericShader(false);
 
 	CHECKGLERROR
-	qglLineWidth(width);CHECKGLERROR
+	//qglLineWidth(width);CHECKGLERROR
 
 	GL_Color(r,g,b,alpha);
 	CHECKGLERROR
@@ -1210,11 +1381,16 @@ void DrawQ_Line (float width, float x1, float y1, float x2, float y2, float r, f
 
 void DrawQ_SetClipArea(float x, float y, float width, float height)
 {
+	int ix, iy, iw, ih;
 	_DrawQ_Setup();
 
 	// We have to convert the con coords into real coords
 	// OGL uses top to bottom
-	GL_Scissor((int)(x * ((float)vid.width / vid_conwidth.integer)), (int)(y * ((float) vid.height / vid_conheight.integer)), (int)(width * ((float)vid.width / vid_conwidth.integer)), (int)(height * ((float)vid.height / vid_conheight.integer)));
+	ix = (int)(0.5 + x * ((float)vid.width / vid_conwidth.integer));
+	iy = (int)(0.5 + y * ((float) vid.height / vid_conheight.integer));
+	iw = (int)(width * ((float)vid.width / vid_conwidth.integer));
+	ih = (int)(height * ((float)vid.height / vid_conheight.integer));
+	GL_Scissor(ix, vid.height - iy - ih, iw, ih);
 
 	GL_ScissorTest(true);
 }