X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=ft2.c;h=1079b5db52eba3d981dc5a3408fcc51e9e7badbc;hb=4a88dc68eb1e012c1c5559f5eb101ee802ddf2b4;hp=f4d1ec9794c78d658461b19f1f09e7feb5d8a2e8;hpb=c2f460a1456df64aec32d5f8cc097156adee619b;p=xonotic%2Fdarkplaces.git

diff --git a/ft2.c b/ft2.c
index f4d1ec97..1079b5db 100644
--- a/ft2.c
+++ b/ft2.c
@@ -150,7 +150,7 @@ typedef struct
 	unsigned char gausstable[2*POSTPROCESS_MAXRADIUS+1];
 }
 font_postprocess_t;
-static font_postprocess_t pp = {};
+static font_postprocess_t pp;
 
 /*
 ====================
@@ -186,8 +186,8 @@ qboolean Font_OpenLibrary (void)
 	const char* dllnames [] =
 	{
 #if defined(WIN32)
-		"freetype6.dll",
 		"libfreetype-6.dll",
+		"freetype6.dll",
 #elif defined(MACOSX)
 		"libfreetype.6.dylib",
 		"libfreetype.dylib",
@@ -251,12 +251,12 @@ void font_start(void)
 void font_shutdown(void)
 {
 	int i;
-	for (i = 0; i < MAX_FONTS; ++i)
+	for (i = 0; i < dp_fonts.maxsize; ++i)
 	{
-		if (dp_fonts[i].ft2)
+		if (dp_fonts.f[i].ft2)
 		{
-			Font_UnloadFont(dp_fonts[i].ft2);
-			dp_fonts[i].ft2 = NULL;
+			Font_UnloadFont(dp_fonts.f[i].ft2);
+			dp_fonts.f[i].ft2 = NULL;
 		}
 	}
 	Font_CloseLibrary();
@@ -273,6 +273,7 @@ void Font_Init(void)
 	Cvar_RegisterVariable(&r_font_size_snapping);
 	Cvar_RegisterVariable(&r_font_kerning);
 	Cvar_RegisterVariable(&developer_font);
+
 	// let's open it at startup already
 	Font_OpenLibrary();
 }
@@ -312,11 +313,13 @@ qboolean Font_Attach(ft2_font_t *font, ft2_attachment_t *attachment)
 
 float Font_VirtualToRealSize(float sz)
 {
-	int vh, vw, si;
+	int vh;
+	//int vw;
+	int si;
 	float sn;
 	if(sz < 0)
 		return sz;
-	vw = ((vid.width > 0) ? vid.width : vid_width.value);
+	//vw = ((vid.width > 0) ? vid.width : vid_width.value);
 	vh = ((vid.height > 0) ? vid.height : vid_height.value);
 	// now try to scale to our actual size:
 	sn = sz * vh / vid_conheight.value;
@@ -461,14 +464,22 @@ static qboolean Font_LoadFile(const char *name, int _face, ft2_settings_t *setti
 
 	namelen = strlen(name);
 
-	memcpy(filename, name, namelen);
-	memcpy(filename + namelen, ".ttf", 5);
+	// try load direct file
+	memcpy(filename, name, namelen+1);
 	data = FS_LoadFile(filename, font_mempool, false, &datasize);
+	// try load .ttf
+	if (!data)
+	{
+		memcpy(filename + namelen, ".ttf", 5);
+		data = FS_LoadFile(filename, font_mempool, false, &datasize);
+	}
+	// try load .otf
 	if (!data)
 	{
 		memcpy(filename + namelen, ".otf", 5);
 		data = FS_LoadFile(filename, font_mempool, false, &datasize);
 	}
+	// try load .pfb/afm
 	if (!data)
 	{
 		ft2_attachment_t afm;
@@ -485,13 +496,12 @@ static qboolean Font_LoadFile(const char *name, int _face, ft2_settings_t *setti
 				Font_Attach(font, &afm);
 		}
 	}
-
 	if (!data)
 	{
 		// FS_LoadFile being not-quiet should print an error :)
 		return false;
 	}
-	Con_Printf("Loading font %s face %i...\n", filename, _face);
+	Con_DPrintf("Loading font %s face %i...\n", filename, _face);
 
 	status = qFT_New_Memory_Face(font_ft2lib, (FT_Bytes)data, datasize, _face, (FT_Face*)&font->face);
 	if (status && _face != 0)
@@ -529,13 +539,10 @@ static qboolean Font_LoadFile(const char *name, int _face, ft2_settings_t *setti
 
 void Font_Postprocess_Update(ft2_font_t *fnt, int bpp, int w, int h)
 {
-	qboolean need_gauss, need_circle;
 	int needed, x, y;
 	float gausstable[2*POSTPROCESS_MAXRADIUS+1];
-	if(!pp.buf || pp.blur != fnt->settings->blur || pp.shadowz != fnt->settings->shadowz)
-		need_gauss = true;
-	if(!pp.buf || pp.outline != fnt->settings->outline || pp.shadowx != fnt->settings->shadowx || pp.shadowy != fnt->settings->shadowy)
-		need_circle = true;
+	qboolean need_gauss  = (!pp.buf || pp.blur != fnt->settings->blur || pp.shadowz != fnt->settings->shadowz);
+	qboolean need_circle = (!pp.buf || pp.outline != fnt->settings->outline || pp.shadowx != fnt->settings->shadowx || pp.shadowy != fnt->settings->shadowy);
 	pp.blur = fnt->settings->blur;
 	pp.outline = fnt->settings->outline;
 	pp.shadowx = fnt->settings->shadowx;
@@ -556,7 +563,7 @@ void Font_Postprocess_Update(ft2_font_t *fnt, int bpp, int w, int h)
 		float sum = 0;
 		for(x = -POSTPROCESS_MAXRADIUS; x <= POSTPROCESS_MAXRADIUS; ++x)
 			gausstable[POSTPROCESS_MAXRADIUS+x] = (pp.blur > 0 ? exp(-(pow(x + pp.shadowz, 2))/(pp.blur*pp.blur * 2)) : (floor(x + pp.shadowz + 0.5) == 0));
-		for(x = -pp.blurpadding_lt; x <= pp.blurpadding_rb; ++x)
+		for(x = -pp.blurpadding_rb; x <= pp.blurpadding_lt; ++x)
 			sum += gausstable[POSTPROCESS_MAXRADIUS+x];
 		for(x = -POSTPROCESS_MAXRADIUS; x <= POSTPROCESS_MAXRADIUS; ++x)
 			pp.gausstable[POSTPROCESS_MAXRADIUS+x] = floor(gausstable[POSTPROCESS_MAXRADIUS+x] / sum * 255 + 0.5);
@@ -614,10 +621,10 @@ void Font_Postprocess(ft2_font_t *fnt, unsigned char *imagedata, int pitch, int
 			for(y = -*pad_t; y < h + *pad_b; ++y)
 				for(x = -*pad_l; x < w + *pad_r; ++x)
 				{
-					int x1 = max(-x, -pp.outlinepadding_l);
-					int y1 = max(-y, -pp.outlinepadding_t);
-					int x2 = min(pp.outlinepadding_r, w-1-x);
-					int y2 = min(pp.outlinepadding_b, h-1-y);
+					int x1 = max(-x, -pp.outlinepadding_r);
+					int y1 = max(-y, -pp.outlinepadding_b);
+					int x2 = min(pp.outlinepadding_l, w-1-x);
+					int y2 = min(pp.outlinepadding_t, h-1-y);
 					int mx, my;
 					int cur = 0;
 					int highest = 0;
@@ -638,26 +645,26 @@ void Font_Postprocess(ft2_font_t *fnt, unsigned char *imagedata, int pitch, int
 				for(y = 0; y < pp.bufheight; ++y)
 					for(x = 0; x < pp.bufwidth; ++x)
 					{
-						int x1 = max(-x, -pp.blurpadding_lt);
-						int x2 = min(pp.blurpadding_rb, pp.bufwidth-1-x);
+						int x1 = max(-x, -pp.blurpadding_rb);
+						int x2 = min(pp.blurpadding_lt, pp.bufwidth-1-x);
 						int mx;
 						int blurred = 0;
 						for(mx = x1; mx <= x2; ++mx)
 							blurred += pp.gausstable[POSTPROCESS_MAXRADIUS+mx] * (int)pp.buf[(x+mx) + pp.bufpitch * y];
-						pp.buf2[x + pp.bufpitch * y] = blurred / 255;
+						pp.buf2[x + pp.bufpitch * y] = bound(0, blurred, 65025) / 255;
 					}
 
 				// vertical blur
 				for(y = 0; y < pp.bufheight; ++y)
 					for(x = 0; x < pp.bufwidth; ++x)
 					{
-						int y1 = max(-y, -pp.blurpadding_lt);
-						int y2 = min(pp.blurpadding_rb, pp.bufheight-1-y);
+						int y1 = max(-y, -pp.blurpadding_rb);
+						int y2 = min(pp.blurpadding_lt, pp.bufheight-1-y);
 						int my;
 						int blurred = 0;
 						for(my = y1; my <= y2; ++my)
 							blurred += pp.gausstable[POSTPROCESS_MAXRADIUS+my] * (int)pp.buf2[x + pp.bufpitch * (y+my)];
-						pp.buf[x + pp.bufpitch * y] = blurred / 255;
+						pp.buf[x + pp.bufpitch * y] = bound(0, blurred, 65025) / 255;
 					}
 			}
 
@@ -683,6 +690,7 @@ void Font_Postprocess(ft2_font_t *fnt, unsigned char *imagedata, int pitch, int
 						}
 						imagedata[x * bpp + pitch * y + (bpp - 1)] = newalpha;
 					}
+					//imagedata[x * bpp + pitch * y + (bpp - 1)] |= 0x80;
 				}
 		}
 	}
@@ -1338,9 +1346,9 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
 			//double mWidth = (glyph->metrics.width >> 6) / map->size;
 			//double mHeight = (glyph->metrics.height >> 6) / map->size;
 
-			mapglyph->txmin = ( (double)(gC * map->glyphSize) ) / ( (double)(map->glyphSize * FONT_CHARS_PER_LINE) );
+			mapglyph->txmin = ( (double)(gC * map->glyphSize) + (double)(gpad_l - pad_l) ) / ( (double)(map->glyphSize * FONT_CHARS_PER_LINE) );
 			mapglyph->txmax = mapglyph->txmin + (double)(bmp->width + pad_l + pad_r) / ( (double)(map->glyphSize * FONT_CHARS_PER_LINE) );
-			mapglyph->tymin = ( (double)(gR * map->glyphSize) ) / ( (double)(map->glyphSize * FONT_CHAR_LINES) );
+			mapglyph->tymin = ( (double)(gR * map->glyphSize) + (double)(gpad_r - pad_r) ) / ( (double)(map->glyphSize * FONT_CHAR_LINES) );
 			mapglyph->tymax = mapglyph->tymin + (double)(bmp->rows + pad_t + pad_b) / ( (double)(map->glyphSize * FONT_CHAR_LINES) );
 			//mapglyph->vxmin = bearingX;
 			//mapglyph->vxmax = bearingX + mWidth;
@@ -1391,12 +1399,12 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _
 		map->texture = R_LoadTexture2D(font_texturepool, map_identifier,
 					       map->glyphSize * FONT_CHARS_PER_LINE,
 					       map->glyphSize * FONT_CHAR_LINES,
-					       data, TEXTYPE_ALPHA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, NULL);
+					       data, TEXTYPE_ALPHA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, -1, NULL);
 	} else {
 		map->texture = R_LoadTexture2D(font_texturepool, map_identifier,
 					       map->glyphSize * FONT_CHARS_PER_LINE,
 					       map->glyphSize * FONT_CHAR_LINES,
-					       data, TEXTYPE_RGBA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, NULL);
+					       data, TEXTYPE_RGBA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, -1, NULL);
 	}
 
 	Mem_Free(data);