X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=ft2.c;h=ce929355b3ba5e8c282651be10e2abf8dd43e449;hb=f1f794cceaae1a0687140f9a0c88eff3e858271a;hp=1809d366eead9df4913be574a88a392c392957ca;hpb=b7ebd5e02477bf12fbb2cb6e3979fbf18d39e626;p=xonotic%2Fdarkplaces.git

diff --git a/ft2.c b/ft2.c
index 1809d366..ce929355 100644
--- a/ft2.c
+++ b/ft2.c
@@ -145,12 +145,12 @@ typedef struct
 	unsigned char *buf, *buf2;
 	int bufsize, bufwidth, bufheight, bufpitch;
 	float blur, outline, shadowx, shadowy, shadowz;
-	int padding, blurpadding, outlinepadding;
+	int padding_t, padding_b, padding_l, padding_r, blurpadding_lt, blurpadding_rb, outlinepadding_t, outlinepadding_b, outlinepadding_l, outlinepadding_r;
 	unsigned char circlematrix[2*POSTPROCESS_MAXRADIUS+1][2*POSTPROCESS_MAXRADIUS+1];
 	unsigned char gausstable[2*POSTPROCESS_MAXRADIUS+1];
 }
 font_postprocess_t;
-static font_postprocess_t pp = {};
+static font_postprocess_t pp;
 
 /*
 ====================
@@ -312,11 +312,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;
@@ -529,27 +531,32 @@ 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;
 	pp.shadowy = fnt->settings->shadowy;
 	pp.shadowz = fnt->settings->shadowz;
-	pp.outlinepadding = bound(0, ceil(pp.outline) + ceil(max(max(pp.shadowx, pp.shadowy), max(-pp.shadowx, -pp.shadowy))), POSTPROCESS_MAXRADIUS);
-	pp.blurpadding = bound(0, ceil(pp.blur) + ceil(max(pp.shadowz, -pp.shadowz)), POSTPROCESS_MAXRADIUS);
-		// FIXME for high values of shadow, we can do better by doing different x and y padding...
-	pp.padding = pp.blurpadding + pp.outlinepadding;
+	pp.outlinepadding_l = bound(0, ceil(pp.outline - pp.shadowx), POSTPROCESS_MAXRADIUS);
+	pp.outlinepadding_r = bound(0, ceil(pp.outline + pp.shadowx), POSTPROCESS_MAXRADIUS);
+	pp.outlinepadding_t = bound(0, ceil(pp.outline - pp.shadowy), POSTPROCESS_MAXRADIUS);
+	pp.outlinepadding_b = bound(0, ceil(pp.outline + pp.shadowy), POSTPROCESS_MAXRADIUS);
+	pp.blurpadding_lt = bound(0, ceil(pp.blur - pp.shadowz), POSTPROCESS_MAXRADIUS);
+	pp.blurpadding_rb = bound(0, ceil(pp.blur + pp.shadowz), POSTPROCESS_MAXRADIUS);
+	pp.padding_l = pp.blurpadding_lt + pp.outlinepadding_l;
+	pp.padding_r = pp.blurpadding_rb + pp.outlinepadding_r;
+	pp.padding_t = pp.blurpadding_lt + pp.outlinepadding_t;
+	pp.padding_b = pp.blurpadding_rb + pp.outlinepadding_b;
 	if(need_gauss)
 	{
 		float sum = 0;
 		for(x = -POSTPROCESS_MAXRADIUS; x <= POSTPROCESS_MAXRADIUS; ++x)
-			sum += (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)));
+			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_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);
 	}
@@ -558,12 +565,12 @@ void Font_Postprocess_Update(ft2_font_t *fnt, int bpp, int w, int h)
 		for(y = -POSTPROCESS_MAXRADIUS; y <= POSTPROCESS_MAXRADIUS; ++y)
 			for(x = -POSTPROCESS_MAXRADIUS; x <= POSTPROCESS_MAXRADIUS; ++x)
 			{
-				float d = pp.outline + 1 - sqrt(pow(x - pp.shadowx, 2) + pow(y - pp.shadowy, 2));
+				float d = pp.outline + 1 - sqrt(pow(x + pp.shadowx, 2) + pow(y + pp.shadowy, 2));
 				pp.circlematrix[POSTPROCESS_MAXRADIUS+y][POSTPROCESS_MAXRADIUS+x] = (d >= 1) ? 255 : (d <= 0) ? 0 : floor(d * 255 + 0.5);
 			}
 	}
-	pp.bufwidth = w + 2 * pp.padding;
-	pp.bufheight = h + 2 * pp.padding;
+	pp.bufwidth = w + pp.padding_l + pp.padding_r;
+	pp.bufheight = h + pp.padding_t + pp.padding_b;
 	pp.bufpitch = pp.bufwidth;
 	needed = pp.bufwidth * pp.bufheight;
 	if(!pp.buf || pp.bufsize < needed * 2)
@@ -586,10 +593,10 @@ void Font_Postprocess(ft2_font_t *fnt, unsigned char *imagedata, int pitch, int
 
 		// perform operation, not exceeding the passed padding values,
 		// but possibly reducing them
-		*pad_l = min(*pad_l, pp.padding);
-		*pad_r = min(*pad_r, pp.padding);
-		*pad_t = min(*pad_t, pp.padding);
-		*pad_b = min(*pad_b, pp.padding);
+		*pad_l = min(*pad_l, pp.padding_l);
+		*pad_r = min(*pad_r, pp.padding_r);
+		*pad_t = min(*pad_t, pp.padding_t);
+		*pad_b = min(*pad_b, pp.padding_b);
 
 		// calculate gauss table
 		
@@ -606,10 +613,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);
-					int y1 = max(-y, -pp.outlinepadding);
-					int x2 = min(pp.outlinepadding, w-1-x);
-					int y2 = min(pp.outlinepadding, 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;
@@ -620,7 +627,7 @@ void Font_Postprocess(ft2_font_t *fnt, unsigned char *imagedata, int pitch, int
 							if(cur > highest)
 								highest = cur;
 						}
-					pp.buf[((x + pp.padding) + pp.bufpitch * (y + pp.padding))] = (highest + 128) / 255;
+					pp.buf[((x + pp.padding_l) + pp.bufpitch * (y + pp.padding_t))] = (highest + 128) / 255;
 				}
 
 			// blur the outline buffer
@@ -630,26 +637,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);
-						int x2 = min(pp.blurpadding, 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);
-						int y2 = min(pp.blurpadding, 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;
 					}
 			}
 
@@ -657,7 +664,7 @@ 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)
 				{
-					unsigned char outlinealpha = pp.buf[(x + pp.padding) + pp.bufpitch * (y + pp.padding)];
+					unsigned char outlinealpha = pp.buf[(x + pp.padding_l) + pp.bufpitch * (y + pp.padding_t)];
 					if(outlinealpha > 0)
 					{
 						unsigned char oldalpha = imagedata[x * bpp + pitch * y + (bpp - 1)];
@@ -675,13 +682,17 @@ 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;
 				}
 		}
 	}
 	else
 	{
 		// just calculate parameters
-		*pad_l = *pad_r = *pad_t = *pad_b = pp.padding;
+		*pad_l = pp.padding_l;
+		*pad_r = pp.padding_r;
+		*pad_t = pp.padding_t;
+		*pad_b = pp.padding_b;
 	}
 }
 
@@ -1327,9 +1338,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;