ed/SectrPrototype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

made draw type vis a compile time option

Browse Source 
Didn't want to deal with the branchless math trial and error...
This commit is contained in:
Edward R. Gonzalez
2025-01-09 23:48:43 -05:00
parent b5fdc02b7d
commit 9ab7bf78c6
4 changed files with 29 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
code/font/vefontcache/draw.odin
View File

@ -41,10 +41,6 @@ Glyph_Pack_Entry :: struct #packed {
region_pos : Vec2,
region_size : Vec2,
// bounds_scaled : Range2,
// bounds_size : Vec2,
// bounds_size_scaled : Vec2,
// scale : Vec2,
over_sample : Vec2, // Only used for oversized glyphs
shape : Parser_Glyph_Shape,
@ -107,7 +103,7 @@ Glyph_Draw_Buffer :: struct{
draw_list : Draw_List,
batch_cache : Glyph_Batch_Cache,
shape_gen_scratch : [dynamic]Vertex,
shape_gen_scratch : [dynamic]Vertex, // Used during triangulating a glyph into a mesh.
glyph_pack : #soa[dynamic]Glyph_Pack_Entry,
oversized : [dynamic]i32,
@ -260,7 +256,6 @@ generate_shapes_draw_list :: #force_inline proc ( ctx : ^Context, font : Font_ID
for shape in shapes {
ctx.cursor_pos = {}
ctx.cursor_pos = generate_shape_draw_list( & ctx.draw_list, shape, & ctx.atlas, & ctx.glyph_buffer, ctx.px_scalar,
ctx.enable_draw_type_visualization,
colour,
entry,
px_size,
@ -271,7 +266,7 @@ generate_shapes_draw_list :: #force_inline proc ( ctx : ^Context, font : Font_ID
}
}
/* Core generator pipeline for shapes
/* Generator pipeline for shapes
If you'd like to make a custom draw procedure, this can either be used directly or
modified to create an augmented derivative for a specific code path.
@ -281,11 +276,10 @@ generate_shapes_draw_list :: #force_inline proc ( ctx : ^Context, font : Font_ID
* Dealing with shaping (essentially minimizing having to ever deal with it in a hot path if possible)
* Dealing with atlas regioning (the expensive region resolution & parser calls are done on the shape pass)
Pipleine order:
* Resolve the glyph's position offset from the target position
* Segregate the glyphs into three slices: oversized, to_cache, cached.
* If oversized is not necessary for your use case and your hitting a bottleneck, remove it in a derivative procedure.
* If oversized is not necessary for your use case and your hitting a bottleneck, omit it with setting ENABLE_OVERSIZED_GLYPHS to false.
* You have to to be drawing a px font size > ~140 px for it to trigger.
* The atlas can be scaled with the size_multiplier parameter of startup so that it becomes more irrelevant if processing a larger atlas is a non-issue.
* The segregation will not allow slices to exceed the batch_cache capacity of the glyph_buffer (configurable within startup params)
@ -297,8 +291,6 @@ generate_shape_draw_list :: proc( draw_list : ^Draw_List, shape : Shaped_Text,
glyph_buffer : ^Glyph_Draw_Buffer,
px_scalar : f32,
enable_debug_vis_type : f32,
colour : RGBAN,
entry : Entry,
px_size : f32,
@ -310,9 +302,6 @@ generate_shape_draw_list :: proc( draw_list : ^Draw_List, shape : Shaped_Text,
{
profile(#procedure)
// font_scale := font_scale * px_scalar
// target_scale := target_scale / px_scalar
mark_glyph_seen :: #force_inline proc "contextless" ( cache : ^Glyph_Batch_Cache, lru_code : Atlas_Key ) {
cache.table[lru_code] = true
cache.num += 1
@ -335,9 +324,9 @@ generate_shape_draw_list :: proc( draw_list : ^Draw_List, shape : Shaped_Text,
append_sub_pack :: #force_inline proc ( pack : ^[dynamic]i32, entry : i32 )
{
raw := cast(^runtime.Raw_Dynamic_Array) pack
raw.len += 1
pack[len(pack) - 1] = entry
raw := cast(^runtime.Raw_Dynamic_Array) pack
raw.len += 1
pack[len(pack) - 1] = entry
}
sub_slice :: #force_inline proc "contextless" ( pack : ^[dynamic]i32) -> []i32 { return pack[:] }
@ -431,8 +420,7 @@ generate_shape_draw_list :: proc( draw_list : ^Draw_List, shape : Shaped_Text,
entry,
colour,
font_scale,
target_scale,
enable_debug_vis_type
target_scale
)
reset_batch( & glyph_buffer.batch_cache)
@ -454,7 +442,6 @@ generate_shape_draw_list :: proc( draw_list : ^Draw_List, shape : Shaped_Text,
colour,
font_scale,
target_scale,
enable_debug_vis_type
)
}
@ -492,7 +479,6 @@ batch_generate_glyphs_draw_list :: proc ( draw_list : ^Draw_List,
colour : RGBAN,
font_scale : Vec2,
target_scale : Vec2,
enable_debug_vis_type : f32,
) #no_bounds_check
{
profile(#procedure)
@ -577,7 +563,6 @@ batch_generate_glyphs_draw_list :: proc ( draw_list : ^Draw_List,
// Quad to for drawing atlas slot to target
draw_quad := & glyph.draw_quad
// Target position (draw_list's target image)
draw_quad.dst_pos = glyph.position + (bounds_scaled.p0 - glyph_padding) * target_scale
draw_quad.dst_scale = (bounds_size_scaled + glyph_padding) * target_scale
@ -599,9 +584,11 @@ batch_generate_glyphs_draw_list :: proc ( draw_list : ^Draw_List,
profile_begin("gen oversized glyphs draw_list")
when ENABLE_OVERSIZED_GLYPHS do if len(oversized) > 0
{
colour.r = max(colour.r, 1.0 * enable_debug_vis_type)
colour.g = max(colour.g, 1.0 * enable_debug_vis_type)
colour.b = colour.b * cast(f32) cast(i32) ! b32( cast(i32) enable_debug_vis_type)
when ENABLE_DRAW_TYPE_VISUALIZATION {
colour.r = 1.0
colour.g = 1.0
colour.b = 0.0
}
for pack_id, index in oversized {
error : Allocator_Error
glyph_pack[pack_id].shape, error = parser_get_glyph_shape(entry.parser_info, shape.glyph[pack_id])
@ -651,9 +638,9 @@ batch_generate_glyphs_draw_list :: proc ( draw_list : ^Draw_List,
generate_blit_from_atlas_draw_list :: #force_inline proc (draw_list : ^Draw_List, glyph_pack : #soa[]Glyph_Pack_Entry, sub_pack : []i32, colour : RGBAN )
{
profile(#procedure)
call := Draw_Call_Default
call.pass = .Target
call.colour = colour
call := Draw_Call_Default
call.pass = .Target
call.colour = colour
for id, index in sub_pack
{
// profile("glyph")
@ -744,18 +731,22 @@ batch_generate_glyphs_draw_list :: proc ( draw_list : ^Draw_List,
for id, index in to_cache do parser_free_shape(entry.parser_info, glyph_pack[id].shape)
profile_begin("gen_cached_draw_list: to_cache")
// colour.r = max(colour.r, 1.0 * enable_debug_vis_type)
// colour.g = colour.g * cast(f32) cast(i32) ! cast(b32) cast(i32) enable_debug_vis_type
// colour.b = colour.b * cast(f32) cast(i32) ! cast(b32) cast(i32) enable_debug_vis_type
when ENABLE_DRAW_TYPE_VISUALIZATION {
colour.r = 1.0
colour.g = 0.0
colour.b = 0.0
}
generate_blit_from_atlas_draw_list( draw_list, glyph_pack[:], to_cache, colour )
profile_end()
}
profile_end()
profile_begin("gen_cached_draw_list: cached")
// colour.r = max(colour.r, 0.4 * enable_debug_vis_type)
// colour.g = max(colour.g, 0.4 * enable_debug_vis_type)
// colour.b = max(colour.b, 0.4 * enable_debug_vis_type)
when ENABLE_DRAW_TYPE_VISUALIZATION {
colour.r = 0.5
colour.g = 0.5
colour.b = 0.5
}
generate_blit_from_atlas_draw_list( draw_list, glyph_pack[:], cached, colour )
profile_end()
}
@ -764,9 +755,6 @@ batch_generate_glyphs_draw_list :: proc ( draw_list : ^Draw_List,
flush_glyph_buffer_draw_list :: proc( #no_alias draw_list, glyph_buffer_draw_list, glyph_buffer_clear_draw_list : ^Draw_List, allocated_x : ^i32 )
{
profile(#procedure)
// if len(glyph_buffer_clear_draw_list.calls) == 0 || len(glyph_buffer_draw_list.calls) == 0 do return
// Flush Draw_Calls to draw list
merge_draw_list( draw_list, glyph_buffer_clear_draw_list )
merge_draw_list( draw_list, glyph_buffer_draw_list)
clear_draw_list( glyph_buffer_draw_list )

11
code/font/vefontcache/vefontcache.odin
View File

@ -6,8 +6,10 @@ package vetext
import "base:runtime"
// See: mappings.odin for profiling hookup
DISABLE_PROFILING :: true
ENABLE_OVERSIZED_GLYPHS :: true
DISABLE_PROFILING :: true
ENABLE_OVERSIZED_GLYPHS :: true
// White: Cached Hit, Red: Cache Miss, Yellow: Oversized (Will override user's colors enabled)
ENABLE_DRAW_TYPE_VISUALIZATION :: false
Font_ID :: distinct i16
Glyph :: distinct i32
@ -102,8 +104,6 @@ Context :: struct {
// the draw_list result by the same amount.
px_scalar : f32, // Improves hinting, positioning, etc. Can make zoomed out text too jagged.
// White: Cached Hit, Red: Cache Miss, Yellow: Oversized (Will override user's colors when active)
enable_draw_type_visualization : f32,
default_curve_quality : i32,
}
@ -647,7 +647,6 @@ get_snapped_position :: #force_inline proc "contextless" ( ctx : Context, positi
set_alpha_scalar :: #force_inline proc( ctx : ^Context, scalar : f32 ) { assert(ctx != nil); ctx.alpha_sharpen = scalar }
set_colour :: #force_inline proc( ctx : ^Context, colour : RGBAN ) { assert(ctx != nil); ctx.colour = colour }
set_draw_type_visualization :: #force_inline proc( ctx : ^Context, should_enable : b32 ) { assert(ctx != nil); ctx.enable_draw_type_visualization = cast(f32) i32(should_enable); }
set_px_scalar :: #force_inline proc( ctx : ^Context, scalar : f32 ) { assert(ctx != nil); ctx.px_scalar = scalar }
set_snap_glyph_shape_position :: #force_inline proc( ctx : ^Context, should_snap : b32 ) {
@ -694,7 +693,6 @@ draw_text_shape_normalized_space :: #force_inline proc( ctx : ^Context,
ctx.cursor_pos = generate_shape_draw_list( & ctx.draw_list, shape, & ctx.atlas, & ctx.glyph_buffer,
ctx.px_scalar,
ctx.enable_draw_type_visualization,
adjusted_colour,
entry,
target_px_size,
@ -746,7 +744,6 @@ draw_text_normalized_space :: #force_inline proc( ctx : ^Context,
)
ctx.cursor_pos = generate_shape_draw_list( & ctx.draw_list, shape, & ctx.atlas, & ctx.glyph_buffer,
ctx.px_scalar,
ctx.enable_draw_type_visualization,
colour,
entry,
target_px_size,

2
code/sectr/engine/client_api.odin
View File

@ -535,8 +535,6 @@ tick_work_frame :: #force_inline proc( host_delta_time_ms : f64 ) -> b32
debug.draw_ui_padding_bounds = false
debug.draw_ui_content_bounds = false
font_provider_set_draw_type_visualization(true)
// config.engine_refresh_hz = 165
// config.color_theme = App_Thm_Light

4
code/sectr/font/provider.odin
View File

@ -119,10 +119,6 @@ font_load :: proc(path_file : string,
return fid
}
font_provider_set_draw_type_visualization :: #force_inline proc( should_enable : b32 ) {
ve.set_draw_type_visualization( & get_state().font_provider_ctx.ve_ctx, should_enable )
}
font_provider_set_alpha_sharpen :: #force_inline proc( scalar : f32 ) {
ve.set_alpha_scalar( & get_state().font_provider_ctx.ve_ctx, scalar )
}