diff options
author | Campbell Barton <campbell@blender.org> | 2022-04-13 05:45:41 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-04-13 06:06:29 +0300 |
commit | 21ae323dbf28b4e0049e68153fe1a310ccf5ebef (patch) | |
tree | 184d0ff206289632094a71f574d6c8270c872a3c /source/blender/blenfont/intern/blf_internal_types.h | |
parent | ae43872ad572eb3e6ad1ebfd02921fc2403059bc (diff) |
Cleanup: avoid redundant float/int conversions in BLF
Internally many offsets for BLF were integers but exposed as floats,
since these are used in pixel-space, many callers were converging them
back to integers. Simplify logic by using ints.
Diffstat (limited to 'source/blender/blenfont/intern/blf_internal_types.h')
-rw-r--r-- | source/blender/blenfont/intern/blf_internal_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h index 34fa82629b4..79388752969 100644 --- a/source/blender/blenfont/intern/blf_internal_types.h +++ b/source/blender/blenfont/intern/blf_internal_types.h @@ -101,7 +101,7 @@ typedef struct BatchBLF { struct GPUVertBufRaw pos_step, col_step, offset_step, glyph_size_step; unsigned int pos_loc, col_loc, offset_loc, glyph_size_loc; unsigned int glyph_len; - float ofs[2]; /* copy of font->pos */ + int ofs[2]; /* copy of font->pos */ float mat[4][4]; /* previous call modelmatrix. */ bool enabled, active, simple_shader; struct GlyphCacheBLF *glyph_cache; @@ -231,7 +231,7 @@ typedef struct FontBLF { float aspect[3]; /* initial position for draw the text. */ - float pos[3]; + int pos[3]; /* angle in radians. */ float angle; @@ -260,7 +260,7 @@ typedef struct FontBLF { float m[16]; /* clipping rectangle. */ - rctf clip_rec; + rcti clip_rec; /* the width to wrap the text, see BLF_WORD_WRAP */ int wrap_width; |