ed/VEFontCache-Odin
1
0
Fork 0
mirror of https://github.com/Ed94/VEFontCache-Odin.git synced 2025-08-05 14:42:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

shaper_shape_from_text supports providing shape size

Browse Source
This commit is contained in:
Edward R. Gonzalez
2024-07-01 19:47:48 -04:00
parent b409063906
commit b67c1567d2
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vefontcache/shaped_text.odin
View File

@@ -65,8 +65,6 @@ shape_text_uncached :: proc( ctx : ^Context, font : FontID, text_utf8 : string,
assert( ctx != nil ) assert( ctx != nil )
assert( font >= 0 && int(font) < len(ctx.entries) ) assert( font >= 0 && int(font) < len(ctx.entries) )
use_full_text_shape := ctx.text_shape_adv
clear( & output.glyphs ) clear( & output.glyphs )
clear( & output.positions ) clear( & output.positions )
@@ -76,7 +74,7 @@ shape_text_uncached :: proc( ctx : ^Context, font : FontID, text_utf8 : string,
line_gap := f32(line_gap_i32) line_gap := f32(line_gap_i32)
line_height := (ascent - descent + line_gap) * entry.size_scale line_height := (ascent - descent + line_gap) * entry.size_scale
if use_full_text_shape if ctx.text_shape_adv
{ {
// assert( entry.shaper_info != nil ) // assert( entry.shaper_info != nil )
shaper_shape_from_text( & ctx.shaper_ctx, & entry.shaper_info, output, text_utf8, ascent_i32, descent_i32, line_gap_i32, entry.size, entry.size_scale ) shaper_shape_from_text( & ctx.shaper_ctx, & entry.shaper_info, output, text_utf8, ascent_i32, descent_i32, line_gap_i32, entry.size, entry.size_scale )

23
vefontcache/shaper.odin
View File

@@ -79,10 +79,14 @@ shaper_shape_from_text :: proc( ctx : ^ShaperContext, info : ^ShaperInfo, output
descent := f32(descent) descent := f32(descent)
line_gap := f32(line_gap) line_gap := f32(line_gap)
max_line_width := f32(0)
line_count := 1
line_height := (ascent - descent + line_gap) * size_scale
position, vertical_position : f32 position, vertical_position : f32
shape_run :: proc( buffer : harfbuzz.Buffer, script : harfbuzz.Script, font : harfbuzz.Font, output : ^ShapedText, shape_run :: proc( buffer : harfbuzz.Buffer, script : harfbuzz.Script, font : harfbuzz.Font, output : ^ShapedText,
position, vertical_position : ^f32, position, vertical_position, max_line_width: ^f32, line_count: ^int,
ascent, descent, line_gap, size, size_scale : f32 ) ascent, descent, line_gap, size, size_scale: f32 )
{ {
// Set script and direction. We use the system's default langauge. // Set script and direction. We use the system's default langauge.
// script = HB_SCRIPT_LATIN // script = HB_SCRIPT_LATIN
@@ -99,6 +103,8 @@ shaper_shape_from_text :: proc( ctx : ^ShaperContext, info : ^ShaperInfo, output
glyph_infos := harfbuzz.buffer_get_glyph_infos( buffer, & glyph_count ) glyph_infos := harfbuzz.buffer_get_glyph_infos( buffer, & glyph_count )
glyph_positions := harfbuzz.buffer_get_glyph_positions( buffer, & glyph_count ) glyph_positions := harfbuzz.buffer_get_glyph_positions( buffer, & glyph_count )
line_height := (ascent - descent + line_gap) * size_scale
for index : i32; index < i32(glyph_count); index += 1 for index : i32; index < i32(glyph_count); index += 1
{ {
hb_glyph := glyph_infos[ index ] hb_glyph := glyph_infos[ index ]
@@ -107,9 +113,11 @@ shaper_shape_from_text :: proc( ctx : ^ShaperContext, info : ^ShaperInfo, output
if hb_glyph.cluster > 0 if hb_glyph.cluster > 0
{ {
(max_line_width^) = max( max_line_width^, position^ )
(position^) = 0.0 (position^) = 0.0
(vertical_position^) -= (ascent - descent + line_gap) * size_scale (vertical_position^) -= line_height
(vertical_position^) = cast(f32) i32(vertical_position^ + 0.5) (vertical_position^) = cast(f32) i32(vertical_position^ + 0.5)
(line_count^) += 1
continue continue
} }
if abs( size ) <= Advance_Snap_Smallfont_Size if abs( size ) <= Advance_Snap_Smallfont_Size
@@ -129,6 +137,7 @@ shaper_shape_from_text :: proc( ctx : ^ShaperContext, info : ^ShaperInfo, output
(position^) += f32(hb_gposition.x_advance) * size_scale (position^) += f32(hb_gposition.x_advance) * size_scale
(vertical_position^) += f32(hb_gposition.y_advance) * size_scale (vertical_position^) += f32(hb_gposition.y_advance) * size_scale
(max_line_width^) = max(max_line_width^, position^)
} }
output.end_cursor_pos.x = position^ output.end_cursor_pos.x = position^
@@ -157,12 +166,16 @@ shaper_shape_from_text :: proc( ctx : ^ShaperContext, info : ^ShaperInfo, output
} }
// End current run since we've encountered a script change. // End current run since we've encountered a script change.
shape_run( ctx.hb_buffer, current_script, info.font, output, & position, & vertical_position, ascent, descent, line_gap, size, size_scale ) shape_run( ctx.hb_buffer, current_script, info.font, output, & position, & vertical_position, & max_line_width, & line_count, ascent, descent, line_gap, size, size_scale )
harfbuzz.buffer_add( ctx.hb_buffer, hb_codepoint, codepoint == '\n' ? 1 : 0 ) harfbuzz.buffer_add( ctx.hb_buffer, hb_codepoint, codepoint == '\n' ? 1 : 0 )
current_script = script current_script = script
} }
// End the last run if needed // End the last run if needed
shape_run( ctx.hb_buffer, current_script, info.font, output, & position, & vertical_position, ascent, descent, line_gap, size, size_scale ) shape_run( ctx.hb_buffer, current_script, info.font, output, & position, & vertical_position, & max_line_width, & line_count, ascent, descent, line_gap, size, size_scale )
// Set the final size
output.size.x = max_line_width
output.size.y = f32(line_count) * line_height
return return
} }