[Bf-blender-cvs] [72c579e] temp-blf-wordwrap: BLF: remove extra pen_y argument
Campbell Barton
noreply at git.blender.org
Sat Aug 29 03:51:05 CEST 2015
Commit: 72c579eccab4308f1bc1b7d6d6ef2d277bf600d8
Author: Campbell Barton
Date: Sat Aug 29 11:44:06 2015 +1000
Branches: temp-blf-wordwrap
https://developer.blender.org/rB72c579eccab4308f1bc1b7d6d6ef2d277bf600d8
BLF: remove extra pen_y argument
keep internally for *_ex functions, needed for word wrapping.
===================================================================
M source/blender/blenfont/intern/blf.c
M source/blender/blenfont/intern/blf_font.c
M source/blender/blenfont/intern/blf_internal.h
===================================================================
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index 9402a17..ca25ef8 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -565,7 +565,7 @@ void BLF_draw(int fontid, const char *str, size_t len)
blf_font_draw__wrap(font, str, len);
}
else {
- blf_font_draw(font, str, len, 0);
+ blf_font_draw(font, str, len);
}
blf_draw__end(mode, param);
}
@@ -582,7 +582,7 @@ void BLF_draw_ascii(int fontid, const char *str, size_t len)
blf_font_draw_ascii__wrap(font, str, len);
}
else {
- blf_font_draw_ascii(font, str, len, 0);
+ blf_font_draw_ascii(font, str, len);
}
blf_draw__end(mode, param);
}
@@ -648,7 +648,7 @@ void BLF_boundbox(int fontid, const char *str, size_t len, rctf *box)
FontBLF *font = blf_get(fontid);
if (font) {
- blf_font_boundbox(font, str, len, 0, box);
+ blf_font_boundbox(font, str, len, box);
}
}
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index 97594f0..8bff51c 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -174,7 +174,7 @@ static void blf_font_ensure_ascii_table(FontBLF *font)
} \
} (void)0
-void blf_font_draw(FontBLF *font, const char *str, size_t len, int pen_y)
+static void blf_font_draw_ex(FontBLF *font, const char *str, size_t len, int pen_y)
{
unsigned int c;
GlyphBLF *g, *g_prev = NULL;
@@ -204,9 +204,13 @@ void blf_font_draw(FontBLF *font, const char *str, size_t len, int pen_y)
g_prev = g;
}
}
+void blf_font_draw(FontBLF *font, const char *str, size_t len)
+{
+ blf_font_draw_ex(font, str, len, 0);
+}
/* faster version of blf_font_draw, ascii only for view dimensions */
-void blf_font_draw_ascii(FontBLF *font, const char *str, size_t len, int pen_y)
+static void blf_font_draw_ascii_ex(FontBLF *font, const char *str, size_t len, int pen_y)
{
unsigned char c;
GlyphBLF *g, *g_prev = NULL;
@@ -232,6 +236,10 @@ void blf_font_draw_ascii(FontBLF *font, const char *str, size_t len, int pen_y)
g_prev = g;
}
}
+void blf_font_draw_ascii(FontBLF *font, const char *str, size_t len)
+{
+ blf_font_draw_ascii_ex(font, str, len, 0);
+}
/* use fixed column width, but an utf8 character may occupy multiple columns */
int blf_font_draw_mono(FontBLF *font, const char *str, size_t len, int cwidth)
@@ -558,7 +566,7 @@ size_t blf_font_width_to_rstrlen(FontBLF *font, const char *str, size_t len, flo
return i_prev;
}
-void blf_font_boundbox(FontBLF *font, const char *str, size_t len, int pen_y, rctf *box)
+static void blf_font_boundbox_ex(FontBLF *font, const char *str, size_t len, rctf *box, int pen_y)
{
unsigned int c;
GlyphBLF *g, *g_prev = NULL;
@@ -610,7 +618,10 @@ void blf_font_boundbox(FontBLF *font, const char *str, size_t len, int pen_y, rc
box->ymax = 0.0f;
}
}
-
+void blf_font_boundbox(FontBLF *font, const char *str, size_t len, rctf *box)
+{
+ blf_font_boundbox_ex(font, str, len, box, 0);
+}
/* -------------------------------------------------------------------- */
@@ -694,7 +705,7 @@ static void blf_font_wrap_apply(
/* blf_font_draw__wrap */
static void blf_font_draw__wrap_cb(FontBLF *font, const char *str, size_t len, int pen_y, void *UNUSED(userdata))
{
- blf_font_draw(font, str, len, pen_y);
+ blf_font_draw_ex(font, str, len, pen_y);
}
void blf_font_draw__wrap(FontBLF *font, const char *str, size_t len)
{
@@ -704,7 +715,7 @@ void blf_font_draw__wrap(FontBLF *font, const char *str, size_t len)
/* blf_font_draw_ascii__wrap */
static void blf_font_draw_ascii__wrap_cb(FontBLF *font, const char *str, size_t len, int pen_y, void *UNUSED(userdata))
{
- blf_font_draw_ascii(font, str, len, pen_y);
+ blf_font_draw_ascii_ex(font, str, len, pen_y);
}
void blf_font_draw_ascii__wrap(FontBLF *font, const char *str, size_t len)
{
@@ -717,7 +728,7 @@ static void blf_font_boundbox_wrap_cb(FontBLF *font, const char *str, size_t len
rctf *box = userdata;
rctf box_single;
- blf_font_boundbox(font, str, len, pen_y, &box_single);
+ blf_font_boundbox_ex(font, str, len, &box_single, pen_y);
BLI_rctf_union(box, &box_single);
}
void blf_font_boundbox__wrap(FontBLF *font, const char *str, size_t len, rctf *box)
@@ -751,7 +762,7 @@ void blf_font_width_and_height(FontBLF *font, const char *str, size_t len, float
blf_font_boundbox__wrap(font, str, len, &box);
}
else {
- blf_font_boundbox(font, str, len, 0, &box);
+ blf_font_boundbox(font, str, len, &box);
}
*width = (BLI_rctf_size_x(&box) * xa);
*height = (BLI_rctf_size_y(&box) * ya);
@@ -771,7 +782,7 @@ float blf_font_width(FontBLF *font, const char *str, size_t len)
blf_font_boundbox__wrap(font, str, len, &box);
}
else {
- blf_font_boundbox(font, str, len, 0, &box);
+ blf_font_boundbox(font, str, len, &box);
}
return BLI_rctf_size_x(&box) * xa;
}
@@ -790,7 +801,7 @@ float blf_font_height(FontBLF *font, const char *str, size_t len)
blf_font_boundbox__wrap(font, str, len, &box);
}
else {
- blf_font_boundbox(font, str, len, 0, &box);
+ blf_font_boundbox(font, str, len, &box);
}
return BLI_rctf_size_y(&box) * ya;
}
diff --git a/source/blender/blenfont/intern/blf_internal.h b/source/blender/blenfont/intern/blf_internal.h
index 515e46e..ed77e3a 100644
--- a/source/blender/blenfont/intern/blf_internal.h
+++ b/source/blender/blenfont/intern/blf_internal.h
@@ -51,15 +51,15 @@ struct FontBLF *blf_font_new_from_mem(const char *name, const unsigned char *mem
void blf_font_attach_from_mem(struct FontBLF *font, const unsigned char *mem, int mem_size);
void blf_font_size(struct FontBLF *font, unsigned int size, unsigned int dpi);
-void blf_font_draw(struct FontBLF *font, const char *str, size_t len, int pen_y);
+void blf_font_draw(struct FontBLF *font, const char *str, size_t len);
void blf_font_draw__wrap(struct FontBLF *font, const char *str, size_t len);
-void blf_font_draw_ascii(struct FontBLF *font, const char *str, size_t len, int pen_y);
+void blf_font_draw_ascii(struct FontBLF *font, const char *str, size_t len);
void blf_font_draw_ascii__wrap(struct FontBLF *font, const char *str, size_t len);
int blf_font_draw_mono(struct FontBLF *font, const char *str, size_t len, int cwidth);
void blf_font_buffer(struct FontBLF *font, const char *str);
size_t blf_font_width_to_strlen(struct FontBLF *font, const char *str, size_t len, float width, float *r_width);
size_t blf_font_width_to_rstrlen(struct FontBLF *font, const char *str, size_t len, float width, float *r_width);
-void blf_font_boundbox(struct FontBLF *font, const char *str, size_t len, int pen_y, struct rctf *box);
+void blf_font_boundbox(struct FontBLF *font, const char *str, size_t len, struct rctf *box);
void blf_font_boundbox__wrap(struct FontBLF *font, const char *str, size_t len, struct rctf *box);
void blf_font_width_and_height(struct FontBLF *font, const char *str, size_t len, float *width, float *height);
float blf_font_width(struct FontBLF *font, const char *str, size_t len);
More information about the Bf-blender-cvs
mailing list