Font drawing is nice now

code/text.odin

@@ -1,9 +1,10 @@
 package sectr
 
+import "core:math"
 import    "core:unicode/utf8"
 import rl "vendor:raylib"
 
-debug_draw_text :: proc( content : string, pos : Vec2, size : f32, color : rl.Color = rl.WHITE, font : rl.Font = {} )
+debug_draw_text :: proc( content : string, pos : Vec2, size : f32, color : rl.Color = rl.WHITE, font : FontID = Font_Default )
 {
 	state := get_state(); using state
 
@@ -13,30 +14,63 @@ debug_draw_text :: proc( content : string, pos : Vec2, size : f32, color : rl.Co
 	runes := utf8.string_to_runes( content, context.temp_allocator )
 
 	font := font
-	if ( font.glyphs == nil ) {
+	if ( len(font) == 0 ) {
 		font = default_font
 	}
-
 	pos := screen_to_render(pos)
 
-	rl.DrawTextCodepoints( font,
+	px_size := size
+
+	rl_font := to_rl_Font(font, px_size )
+	rl.DrawTextCodepoints( rl_font,
 		raw_data(runes), cast(i32) len(runes),
 		position = transmute(rl.Vector2) pos,
-		fontSize = size,
+		fontSize = px_size,
+		spacing  = 0.0,
+		tint     = color );
+}
+
+debug_draw_text_world :: proc( content : string, pos : Vec2, size : f32, color : rl.Color = rl.WHITE, font : FontID = Font_Default )
+{
+	state := get_state(); using state
+
+	if len( content ) == 0 {
+		return
+	}
+	runes := utf8.string_to_runes( content, context.temp_allocator )
+
+	font := font
+	if ( len(font) == 0 ) {
+		font = default_font
+	}
+	pos := world_to_screen_pos(pos)
+
+	px_size     := size
+	zoom_adjust := px_size * project.workspace.cam.zoom
+
+	rl_font := to_rl_Font(font, zoom_adjust )
+	rl.DrawTextCodepoints( rl_font,
+		raw_data(runes), cast(i32) len(runes),
+		position = transmute(rl.Vector2) pos,
+		fontSize = px_size,
 		spacing  = 0.0,
 		tint     = color );
 }
 
 // Raylib's equivalent doesn't take a length for the string (making it a pain in the ass)
 // So this is a 1:1 copy except it takes Odin strings
-measure_text_size :: proc ( text : string, font : Font, font_size, spacing : f32 ) -> AreaSize
+measure_text_size :: proc ( text : string, font : FontID, font_size := Font_Use_Default_Size, spacing : f32 ) -> AreaSize
 {
+	px_size := math.round( points_to_pixels( font_size ) )
+	rl_font := to_rl_Font( font, font_size )
+
 	// This is a static var within raylib. We don't have getter access to it.
+	// Note(Ed) : raylib font size is in pixels so this is also.
 	@static text_line_spacing : f32 = 15
 
 	text_size : AreaSize
 
-	if font.texture.id == 0 || len(text) == 0 {
+	if rl_font.texture.id == 0 || len(text) == 0 {
 		return text_size
 	}
 
@@ -46,30 +80,31 @@ measure_text_size :: proc ( text : string, font : Font, font_size, spacing : f32
 	text_width      : f32 = 0.0
 	temp_text_width : f32 = 0.0 // Used to counter longer text line width
 
-	text_height := cast(f32) font.baseSize
-	scale_factor := font_size / text_height
+	text_height := cast(f32) rl_font.baseSize
+	scale_factor := px_size / text_height
 
 	letter : rune
 	index  : i32 = 0
 
-	for id : i32 = 0; id < i32(len(text)); {
+	for id : i32 = 0; id < i32(len(text));
+	{
 		byte_counter += 1
 
 		next : i32 = 0
 
 		ctext := cast(cstring) ( & raw_data( text )[id] )
 		letter = rl.GetCodepointNext( ctext, & next )
-		index  = rl.GetGlyphIndex( font, letter )
+		index  = rl.GetGlyphIndex( rl_font, letter )
 
 		id += 1
 
 		if letter != rune('\n')
 		{
-			if font.glyphs[index].advanceX != 0 {
-				text_width += f32(font.glyphs[index].advanceX)
+			if rl_font.glyphs[index].advanceX != 0 {
+				text_width += f32(rl_font.glyphs[index].advanceX)
 			}
 			else {
-				text_width += font.recs[index].width + f32(font.glyphs[index].offsetX)
+				text_width += rl_font.recs[index].width + f32(rl_font.glyphs[index].offsetX)
 			}
 		}
 		else
@@ -87,11 +122,9 @@ measure_text_size :: proc ( text : string, font : Font, font_size, spacing : f32
 			}
 		}
 	}
-
 	if temp_text_width < text_width {
 		temp_text_width = text_width
 	}
-
 	text_size.x = temp_text_width * scale_factor + f32(temp_byte_counter - 1) * spacing
 	text_size.y = text_height * scale_factor