X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=b7f66accde15831260419946701e483c9d830014;hb=16d1bc98646ef5ac05806f7190b3424b70804c32;hp=425c515911cc79452346a4cb8d3e8cfe4d4e9ff4;hpb=b5948d30a9cf9e2c851150307a338fe38f3dbd7b;p=xonotic%2Fdarkplaces.git

diff --git a/gl_draw.c b/gl_draw.c
index 425c5159..b7f66acc 100644
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -619,8 +619,14 @@ static void LoadFont(qboolean override, const char *name, dp_font_t *fnt)
 					fnt->width_of[ch] = atof(com_token) + extraspacing;
 					if (fnt->ft2)
 					{
-						for (i = 0; i < MAX_FONT_SIZES && fnt->req_sizes[i] >= 0; ++i)
-							Font_MapForIndex(fnt->ft2, i)->width_of[ch] = snap_to_pixel_x(fnt->width_of[ch] * fnt->req_sizes[i], 0.4);
+						for (i = 0; i < MAX_FONT_SIZES; ++i)
+						{
+							//Font_MapForIndex(fnt->ft2, i)->width_of[ch] = snap_to_pixel_x(fnt->width_of[ch] * fnt->req_sizes[i], 0.4);
+							ft2_font_map_t *map = Font_MapForIndex(fnt->ft2, i);
+							if (!map)
+								break;
+							map->width_of[ch] = Font_SnapTo(fnt->width_of[ch], 1/map->size);
+						}
 					}
 					ch++;
 					break;
@@ -789,7 +795,6 @@ static void LoadFont_f(void)
 	for(i = 1; i < MAX_FONT_SIZES; ++i)
 		f->req_sizes[i] = -1;
 
-	// for some reason this argc is 3 even when using 2 arguments here, maybe nexuiz screws up
 	if(Cmd_Argc() >= 3)
 	{
 		for(i = 0; i < Cmd_Argc()-3; ++i)
@@ -860,7 +865,6 @@ void GL_Draw_Init (void)
 	for(i = 0, j = 0; i < MAX_USERFONTS; ++i)
 		if(!FONT_USER[i].title[0])
 			dpsnprintf(FONT_USER[i].title, sizeof(FONT_USER[i].title), "user%d", j++);
-	Font_Init();
 }
 
 void _DrawQ_Setup(void)
@@ -1099,7 +1103,6 @@ float DrawQ_TextWidth_UntilWidth_TrackColors_Scale(const char *text, size_t *max
 	qboolean snap = true;
 	qboolean least_one = false;
 	float dw, dh; // display w/h
-	float width_of_factor;
 	const float *width_of;
 
 	if (!h) h = w;
@@ -1145,15 +1148,9 @@ float DrawQ_TextWidth_UntilWidth_TrackColors_Scale(const char *text, size_t *max
 	//	x = snap_to_pixel_x(x, 0.4); // haha, it's 0 anyway
 
 	if (fontmap)
-	{
-		width_of_factor = 1;
 		width_of = fontmap->width_of;
-	}
 	else
-	{
-		width_of_factor = dw;
 		width_of = fnt->width_of;
-	}
 
 	for (i = 0;((bytes_left = *maxlen - (text - text_start)) > 0) && *text;)
 	{
@@ -1165,12 +1162,12 @@ float DrawQ_TextWidth_UntilWidth_TrackColors_Scale(const char *text, size_t *max
 		if (ch == ' ' && !fontmap)
 		{
 			if(!least_one || i0) // never skip the first character
-			if(x + width_of[(int) ' '] * width_of_factor > maxwidth)
+			if(x + width_of[(int) ' '] * dw > maxwidth)
 			{
 				i = i0;
 				break; // oops, can't draw this
 			}
-			x += width_of[(int) ' '] * width_of_factor;
+			x += width_of[(int) ' '] * dw;
 			continue;
 		}
 		// i points to the char after ^
@@ -1237,14 +1234,14 @@ float DrawQ_TextWidth_UntilWidth_TrackColors_Scale(const char *text, size_t *max
 				map = ft2_oldstyle_map;
 			prevch = 0;
 			if(!least_one || i0) // never skip the first character
-			if(x + width_of[ch] * width_of_factor > maxwidth)
+			if(x + width_of[ch] * dw > maxwidth)
 			{
 				i = i0;
 				break; // oops, can't draw this
 			}
-			x += width_of[ch] * width_of_factor;
+			x += width_of[ch] * dw;
 		} else {
-			if (!map || map == ft2_oldstyle_map || map->start < ch || map->start + FONT_CHARS_PER_MAP >= ch)
+			if (!map || map == ft2_oldstyle_map || ch < map->start || ch >= map->start + FONT_CHARS_PER_MAP)
 			{
 				map = FontMap_FindForChar(fontmap, ch);
 				if (!map)
@@ -1298,7 +1295,6 @@ float DrawQ_String_Scale(float startx, float starty, const char *text, size_t ma
 	float pix_x, pix_y;
 	size_t bytes_left;
 	float dw, dh;
-	float width_of_factor;
 	const float *width_of;
 
 	int tw, th;
@@ -1361,15 +1357,9 @@ float DrawQ_String_Scale(float startx, float starty, const char *text, size_t ma
 	pix_y = vid.height / vid_conheight.value;
 
 	if (fontmap)
-	{
-		width_of_factor = 1;
 		width_of = fontmap->width_of;
-	}
 	else
-	{
-		width_of_factor = dw;
 		width_of = fnt->width_of;
-	}
 
 	for (shadow = r_textshadow.value != 0 && basealpha > 0;shadow >= 0;shadow--)
 	{
@@ -1400,7 +1390,7 @@ float DrawQ_String_Scale(float startx, float starty, const char *text, size_t ma
 				break;
 			if (ch == ' ' && !fontmap)
 			{
-				x += width_of[(int) ' '] * width_of_factor;
+				x += width_of[(int) ' '] * dw;
 				continue;
 			}
 			if (ch == STRING_COLOR_TAG && !ignorecolorcodes && i < maxlen)
@@ -1477,9 +1467,7 @@ float DrawQ_String_Scale(float startx, float starty, const char *text, size_t ma
 						if (batchcount)
 						{
 							// switching from freetype to non-freetype rendering
-							GL_LockArrays(0, batchcount * 4);
 							R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, quadelement3s, 0, 0);
-							GL_LockArrays(0, 0);
 							batchcount = 0;
 							ac = color4f;
 							at = texcoord2f;
@@ -1516,25 +1504,21 @@ float DrawQ_String_Scale(float startx, float starty, const char *text, size_t ma
 				batchcount++;
 				if (batchcount >= QUADELEMENTS_MAXQUADS)
 				{
-					GL_LockArrays(0, batchcount * 4);
 					R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, quadelement3s, 0, 0);
-					GL_LockArrays(0, 0);
 					batchcount = 0;
 					ac = color4f;
 					at = texcoord2f;
 					av = vertex3f;
 				}
-				x += width_of[ch] * width_of_factor;
+				x += width_of[ch] * dw;
 			} else {
-				if (!map || map == ft2_oldstyle_map || map->start < ch || map->start + FONT_CHARS_PER_MAP >= ch)
+				if (!map || map == ft2_oldstyle_map || ch < map->start || ch >= map->start + FONT_CHARS_PER_MAP)
 				{
 					// new charmap - need to render
 					if (batchcount)
 					{
 						// we need a different character map, render what we currently have:
-						GL_LockArrays(0, batchcount * 4);
 						R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, quadelement3s, 0, 0);
-						GL_LockArrays(0, 0);
 						batchcount = 0;
 						ac = color4f;
 						at = texcoord2f;
@@ -1593,9 +1577,7 @@ float DrawQ_String_Scale(float startx, float starty, const char *text, size_t ma
 				batchcount++;
 				if (batchcount >= QUADELEMENTS_MAXQUADS)
 				{
-					GL_LockArrays(0, batchcount * 4);
 					R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, quadelement3s, 0, 0);
-					GL_LockArrays(0, 0);
 					batchcount = 0;
 					ac = color4f;
 					at = texcoord2f;
@@ -1613,11 +1595,7 @@ float DrawQ_String_Scale(float startx, float starty, const char *text, size_t ma
 		}
 	}
 	if (batchcount > 0)
-	{
-		GL_LockArrays(0, batchcount * 4);
 		R_Mesh_Draw(0, batchcount * 4, 0, batchcount * 2, quadelement3i, quadelement3s, 0, 0);
-		GL_LockArrays(0, 0);
-	}
 
 	if (outcolor)
 		*outcolor = colorindex;
@@ -1734,9 +1712,7 @@ void DrawQ_Mesh (drawqueuemesh_t *mesh, int flags)
 	R_Mesh_TexCoordPointer(0, 2, mesh->data_texcoord2f, 0, 0);
 	R_SetupShader_Generic(mesh->texture, NULL, GL_MODULATE, 1);
 
-	GL_LockArrays(0, mesh->num_vertices);
 	R_Mesh_Draw(0, mesh->num_vertices, 0, mesh->num_triangles, mesh->data_element3i, mesh->data_element3s, 0, 0);
-	GL_LockArrays(0, 0);
 }
 
 void DrawQ_LineLoop (drawqueuemesh_t *mesh, int flags)