Refactor: Simplify vfontdata_freetype.c #109224

Harley Acheson · 2023-06-22T02:02:42+02:00

Harley Acheson commented

2023-06-22 02:02:42 +02:00

Simplification of the functions related to the conversion of FreeType
font glyph outlines into curves.

This contains no changes in behavior; this is merely moving things around to make them simpler. Overall there are 41 lines removed.

freetypechar_to_vchar is broken into two pieces: a new function is created - freetype_outline_to_curves - that only converts an FT_Outline into a nurbs ListBase. This should make it easier to change or replace this function without breaking anything else.

What is left of freetypechar_to_vchar does just the glyph loading and VChar creation. This should make it easier to later change from charcode lookup to glyphid lookup, add support for variable/mm features, or change the outline before conversion.

objchr_to_ftvfontdata is removed by moving it inside its only caller: BKE_vfontdata_char_from_freetypefont, which is then made simpler by using the (relatively new) vfont_face_load_from_packed_file.

This should leave the flow a lot more obvious, easier to follow, and easier to extend.

Simplification of the functions related to the conversion of FreeType font glyph outlines into curves. --- This contains no changes in behavior; this is merely **moving things around** to make them simpler. Overall there are **41 lines removed**. `freetypechar_to_vchar` is broken into two pieces: a new function is created - `freetype_outline_to_curves` - that only converts an `FT_Outline` into a nurbs ListBase. This should make it easier to change or replace this function without breaking anything else. What is left of `freetypechar_to_vchar` does just the glyph loading and VChar creation. This should make it easier to later change from charcode lookup to glyphid lookup, add support for variable/mm features, or change the outline before conversion. `objchr_to_ftvfontdata` is removed by moving it inside its only caller: `BKE_vfontdata_char_from_freetypefont`, which is then made simpler by using the (relatively new) `vfont_face_load_from_packed_file`. This should leave the flow a lot more obvious, easier to follow, and easier to extend.

👍 1

Harley Acheson added 1 commit 2023-06-22 02:02:48 +02:00

e7970c9fba Refactor: Simplify vfontdata_freetype.c

Simplification of the functions related to the conversion of FreeType
font glyph outlines into curves.

Harley Acheson added this to the User Interface project 2023-06-22 02:03:14 +02:00

Harley Acheson requested review from Campbell Barton 2023-06-22 02:03:23 +02:00

Campbell Barton approved these changes 2023-06-22 03:23:08 +02:00

Campbell Barton left a comment

Accepting w/ minor requests.

source/blender/blenkernel/intern/vfontdata_freetype.c Outdated

						
				@ -37,3 +37,3 @@

				#include "DNA_vfont_types.h"

				static VChar *freetypechar_to_vchar(FT_Face face, FT_ULong charcode, VFontData *vfd)

				static void freetype_outline_to_curves(FT_Outline ftoutline, ListBase *nurbsbase, float scale)

Campbell Barton commented

2023-06-22 03:22:01 +02:00

scale can be const.

Harley marked this conversation as resolved

source/blender/blenkernel/intern/vfontdata_freetype.c Outdated

						
				@ -258,0 +205,4 @@

				  MEM_freeN(onpoints);

				}

				static VChar *freetypechar_to_vchar(FT_Face face, FT_ULong charcode, VFontData* vfd)