Change the BLF_aspect function to handle 3d text.

This is need to properly handle 3d text (dalai work on GE), before
the BLF_aspect only take one argument, and the result was a call to:
	glScalef(aspect, aspect, 1.0)

Now the three value are store in the font (x, y and z) and also
need to be enable using BLF_enable(BLF_ASPECT).

By default all the code that don't have BLF_ASPECT enable work with
a scale of 1.0 (so nothing change to the current UI).

I also remove all the call of BLF_aspect(fontid, 1.0) found in
the editors, because is disable by default, so no need any more.

Campbell the only thing to check is the python api, right now
I modify the api to from:
	BLF_aspect(fontid, aspect)
to:
	BLF_aspect(fontid, aspect, aspect, 1.0)

This is to avoid break the api, but now you need add the BLF_ASPECT
option to the function py_blf_enable and in some point change
py_blf_aspect to take 3 arguments.

1 files changed, 29 insertions, 5 deletions

diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index 3adda7bb6f1..d1dcf7aa9b3 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -420,35 +420,57 @@ void blf_font_boundbox(FontBLF *font, const char *str, rctf *box)
 
 void blf_font_width_and_height(FontBLF *font, const char *str, float *width, float *height)
 {
+	float xa, ya;
 	rctf box;
 
 	if (font->glyph_cache) {
+		if (font->flags & BLF_ASPECT) {
+			xa= font->aspect[0];
+			ya= font->aspect[1];
+		}
+		else {
+			xa= 1.0f;
+			ya= 1.0f;
+		}
+
 		blf_font_boundbox(font, str, &box);
-		*width= ((box.xmax - box.xmin) * font->aspect);
-		*height= ((box.ymax - box.ymin) * font->aspect);
+		*width= ((box.xmax - box.xmin) * xa);
+		*height= ((box.ymax - box.ymin) * ya);
 	}
 }
 
 float blf_font_width(FontBLF *font, const char *str)
 {
+	float xa;
 	rctf box;
 
 	if (!font->glyph_cache)
 		return(0.0f);
 
+	if (font->flags & BLF_ASPECT)
+		xa= font->aspect[0];
+	else
+		xa= 1.0f;
+
 	blf_font_boundbox(font, str, &box);
-	return((box.xmax - box.xmin) * font->aspect);
+	return((box.xmax - box.xmin) * xa);
 }
 
 float blf_font_height(FontBLF *font, const char *str)
 {
+	float ya;
 	rctf box;
 
 	if (!font->glyph_cache)
 		return(0.0f);
 
+	if (font->flags & BLF_ASPECT)
+		ya= font->aspect[1];
+	else
+		ya= 1.0f;
+
 	blf_font_boundbox(font, str, &box);
-	return((box.ymax - box.ymin) * font->aspect);
+	return((box.ymax - box.ymin) * ya);
 }
 
 float blf_font_fixed_width(FontBLF *font)
@@ -495,7 +517,9 @@ static void blf_font_fill(FontBLF *font)
 {
 	int i;
 
-	font->aspect= 1.0f;
+	font->aspect[0]= 1.0f;
+	font->aspect[1]= 1.0f;
+	font->aspect[2]= 1.0f;
 	font->pos[0]= 0.0f;
 	font->pos[1]= 0.0f;
 	font->angle= 0.0f;