ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 23:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor style changes for sdl3 and sdl3/ttf

Browse Source
This commit is contained in:
gingerBill
2025-05-18 11:20:55 +01:00
parent d6210ae76f
commit 3e5110bb46
3 changed files with 134 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/sdl3/sdl3_gpu.odin
Vendored
+14
View File
@@ -59,6 +59,7 @@ GPUTextureFormat :: enum c.int {
B5G5R5A1_UNORM, B5G5R5A1_UNORM,
B4G4R4A4_UNORM, B4G4R4A4_UNORM,
B8G8R8A8_UNORM, B8G8R8A8_UNORM,
/* Compressed Unsigned Normalized Float Color Formats */ /* Compressed Unsigned Normalized Float Color Formats */
BC1_RGBA_UNORM, BC1_RGBA_UNORM,
BC2_RGBA_UNORM, BC2_RGBA_UNORM,
@@ -66,10 +67,13 @@ GPUTextureFormat :: enum c.int {
BC4_R_UNORM, BC4_R_UNORM,
BC5_RG_UNORM, BC5_RG_UNORM,
BC7_RGBA_UNORM, BC7_RGBA_UNORM,
/* Compressed Signed Float Color Formats */ /* Compressed Signed Float Color Formats */
BC6H_RGB_FLOAT, BC6H_RGB_FLOAT,
/* Compressed Unsigned Float Color Formats */ /* Compressed Unsigned Float Color Formats */
BC6H_RGB_UFLOAT, BC6H_RGB_UFLOAT,
/* Signed Normalized Float Color Formats */ /* Signed Normalized Float Color Formats */
R8_SNORM, R8_SNORM,
R8G8_SNORM, R8G8_SNORM,
@@ -77,6 +81,7 @@ GPUTextureFormat :: enum c.int {
R16_SNORM, R16_SNORM,
R16G16_SNORM, R16G16_SNORM,
R16G16B16A16_SNORM, R16G16B16A16_SNORM,
/* Signed Float Color Formats */ /* Signed Float Color Formats */
R16_FLOAT, R16_FLOAT,
R16G16_FLOAT, R16G16_FLOAT,
@@ -84,8 +89,10 @@ GPUTextureFormat :: enum c.int {
R32_FLOAT, R32_FLOAT,
R32G32_FLOAT, R32G32_FLOAT,
R32G32B32A32_FLOAT, R32G32B32A32_FLOAT,
/* Unsigned Float Color Formats */ /* Unsigned Float Color Formats */
R11G11B10_UFLOAT, R11G11B10_UFLOAT,
/* Unsigned Integer Color Formats */ /* Unsigned Integer Color Formats */
R8_UINT, R8_UINT,
R8G8_UINT, R8G8_UINT,
@@ -96,6 +103,7 @@ GPUTextureFormat :: enum c.int {
R32_UINT, R32_UINT,
R32G32_UINT, R32G32_UINT,
R32G32B32A32_UINT, R32G32B32A32_UINT,
/* Signed Integer Color Formats */ /* Signed Integer Color Formats */
R8_INT, R8_INT,
R8G8_INT, R8G8_INT,
@@ -106,20 +114,24 @@ GPUTextureFormat :: enum c.int {
R32_INT, R32_INT,
R32G32_INT, R32G32_INT,
R32G32B32A32_INT, R32G32B32A32_INT,
/* SRGB Unsigned Normalized Color Formats */ /* SRGB Unsigned Normalized Color Formats */
R8G8B8A8_UNORM_SRGB, R8G8B8A8_UNORM_SRGB,
B8G8R8A8_UNORM_SRGB, B8G8R8A8_UNORM_SRGB,
/* Compressed SRGB Unsigned Normalized Color Formats */ /* Compressed SRGB Unsigned Normalized Color Formats */
BC1_RGBA_UNORM_SRGB, BC1_RGBA_UNORM_SRGB,
BC2_RGBA_UNORM_SRGB, BC2_RGBA_UNORM_SRGB,
BC3_RGBA_UNORM_SRGB, BC3_RGBA_UNORM_SRGB,
BC7_RGBA_UNORM_SRGB, BC7_RGBA_UNORM_SRGB,
/* Depth Formats */ /* Depth Formats */
D16_UNORM, D16_UNORM,
D24_UNORM, D24_UNORM,
D32_FLOAT, D32_FLOAT,
D24_UNORM_S8_UINT, D24_UNORM_S8_UINT,
D32_FLOAT_S8_UINT, D32_FLOAT_S8_UINT,
/* Compressed ASTC Normalized Float Color Formats*/ /* Compressed ASTC Normalized Float Color Formats*/
ASTC_4x4_UNORM, ASTC_4x4_UNORM,
ASTC_5x4_UNORM, ASTC_5x4_UNORM,
@@ -135,6 +147,7 @@ GPUTextureFormat :: enum c.int {
ASTC_10x10_UNORM, ASTC_10x10_UNORM,
ASTC_12x10_UNORM, ASTC_12x10_UNORM,
ASTC_12x12_UNORM, ASTC_12x12_UNORM,
/* Compressed SRGB ASTC Normalized Float Color Formats*/ /* Compressed SRGB ASTC Normalized Float Color Formats*/
ASTC_4x4_UNORM_SRGB, ASTC_4x4_UNORM_SRGB,
ASTC_5x4_UNORM_SRGB, ASTC_5x4_UNORM_SRGB,
@@ -150,6 +163,7 @@ GPUTextureFormat :: enum c.int {
ASTC_10x10_UNORM_SRGB, ASTC_10x10_UNORM_SRGB,
ASTC_12x10_UNORM_SRGB, ASTC_12x10_UNORM_SRGB,
ASTC_12x12_UNORM_SRGB, ASTC_12x12_UNORM_SRGB,
/* Compressed ASTC Signed Float Color Formats*/ /* Compressed ASTC Signed Float Color Formats*/
ASTC_4x4_FLOAT, ASTC_4x4_FLOAT,
ASTC_5x4_FLOAT, ASTC_5x4_FLOAT,
vendor/sdl3/ttf/sdl3_textengine.odin
Vendored
+5 -6
View File
@@ -18,7 +18,7 @@ CopyOperation :: struct {
cmd: DrawCommand, cmd: DrawCommand,
text_offset: c.int, text_offset: c.int,
glyph_font: ^Font, glyph_font: ^Font,
glyph_index: SDL.Uint32, glyph_index: u32,
src: SDL.Rect, src: SDL.Rect,
dst: SDL.Rect, dst: SDL.Rect,
reserved: rawptr, reserved: rawptr,
@@ -30,8 +30,7 @@ DrawOperation :: struct #raw_union {
copy: CopyOperation, copy: CopyOperation,
} }
TextLayout :: struct { TextLayout :: struct {}
}
TextData :: struct { TextData :: struct {
font: ^Font, font: ^Font,
@@ -41,9 +40,9 @@ TextData :: struct {
x, y: c.int, x, y: c.int,
w, h: c.int, w, h: c.int,
num_ops: c.int, num_ops: c.int,
ops: [^]DrawOperation, ops: [^]DrawOperation `fmt:"v,num_ops"`,
num_clusters: c.int, num_clusters: c.int,
clusters: [^]SubString, clusters: [^]SubString `fmt:"v,num_clusters"`,
props: SDL.PropertiesID, props: SDL.PropertiesID,
needs_engine_update: bool, needs_engine_update: bool,
engine: ^TextEngine, engine: ^TextEngine,
@@ -51,7 +50,7 @@ TextData :: struct {
} }
TextEngine :: struct { TextEngine :: struct {
version: SDL.Uint32, version: u32,
userdata: rawptr, userdata: rawptr,
CreateText: proc "c" (userdata: rawptr, text: ^Text) -> bool, CreateText: proc "c" (userdata: rawptr, text: ^Text) -> bool,
DestroyText: proc "c" (userdata: rawptr, Textext: ^Text), DestroyText: proc "c" (userdata: rawptr, Textext: ^Text),
vendor/sdl3/ttf/sdl3_ttf.odin
Vendored
+29 -30
View File
@@ -41,17 +41,16 @@ MAJOR_VERSION :: 3
MINOR_VERSION :: 2 MINOR_VERSION :: 2
PATCHLEVEL :: 2 PATCHLEVEL :: 2
Font :: struct { Font :: struct {}
}
Text :: struct { Text :: struct {
text: ^c.char, text: [^]u8,
num_lines: c.int, num_lines: c.int,
refcount: c.int, refcount: c.int,
internal: ^TextData, internal: ^TextData,
} }
FontStyle :: enum SDL.Uint32 { FontStyle :: enum u32 {
NORMAL, NORMAL,
BOLD, BOLD,
ITALIC, ITALIC,
@@ -59,7 +58,7 @@ FontStyle :: enum SDL.Uint32 {
STRIKETHROUGH, STRIKETHROUGH,
} }
FontStyleFlags :: bit_set[FontStyle;SDL.Uint32] FontStyleFlags :: distinct bit_set[FontStyle; u32]
// NOTE: This is called TTF_HintingFlags but its not a bit_set so // NOTE: This is called TTF_HintingFlags but its not a bit_set so
// the "flags" doesnt really make sense, its just the hinting. // the "flags" doesnt really make sense, its just the hinting.
@@ -96,9 +95,9 @@ ImageType :: enum c.int {
GPUAtlasDrawSequence :: struct { GPUAtlasDrawSequence :: struct {
atlas_texture: ^SDL.GPUTexture, atlas_texture: ^SDL.GPUTexture,
xy, uv: [^]SDL.FPoint, xy, uv: [^]SDL.FPoint `fmt:"v,num_vertices"`,
num_vertices: c.int, num_vertices: c.int,
indices: [^]c.int, indices: [^]c.int `fmt:"v,num_indices"`,
num_indices: c.int, num_indices: c.int,
image_type: ImageType, image_type: ImageType,
next: ^GPUAtlasDrawSequence, next: ^GPUAtlasDrawSequence,
@@ -106,11 +105,11 @@ GPUAtlasDrawSequence :: struct {
GPUTextEngineWinding :: enum c.int { GPUTextEngineWinding :: enum c.int {
INVALID = -1, INVALID = -1,
CLOCKWISE, CLOCKWISE = 0,
COUNTER_CLOCKWISE, COUNTER_CLOCKWISE = +1,
} }
SubStringFlags :: bit_field SDL.Uint32 { SubStringFlags :: bit_field u32 {
direction: u8 | 8, direction: u8 | 8,
text_start: bool | 1, text_start: bool | 1,
line_start: bool | 1, line_start: bool | 1,
@@ -140,7 +139,7 @@ foreign lib {
CopyFont :: proc(existing_font: ^Font) -> ^Font --- CopyFont :: proc(existing_font: ^Font) -> ^Font ---
GetFontProperties :: proc(font: ^Font) -> SDL.PropertiesID --- GetFontProperties :: proc(font: ^Font) -> SDL.PropertiesID ---
GetFontGeneration :: proc(font: ^Font) -> SDL.Uint32 --- GetFontGeneration :: proc(font: ^Font) -> u32 ---
AddFallbackFont :: proc(font: ^Font, fallback: ^Font) -> bool --- AddFallbackFont :: proc(font: ^Font, fallback: ^Font) -> bool ---
RemoveFallbackFont :: proc(font: ^Font, fallback: ^Font) --- RemoveFallbackFont :: proc(font: ^Font, fallback: ^Font) ---
@@ -189,20 +188,20 @@ foreign lib {
SetFontDirection :: proc(font: ^Font, direction: Direction) -> bool --- SetFontDirection :: proc(font: ^Font, direction: Direction) -> bool ---
GetFontDirection :: proc(#by_ptr font: Font) -> Direction --- GetFontDirection :: proc(#by_ptr font: Font) -> Direction ---
StringToTag :: proc(string: cstring) -> SDL.Uint32 --- StringToTag :: proc(string: cstring) -> u32 ---
TagToString :: proc(tag: SDL.Uint32, string: [^]c.char, size: c.size_t) --- TagToString :: proc(tag: u32, string: [^]c.char, size: c.size_t) ---
SetFontScript :: proc(font: ^Font, script: SDL.Uint32) -> bool --- SetFontScript :: proc(font: ^Font, script: u32) -> bool ---
GetFontScript :: proc(font: ^Font) -> SDL.Uint32 --- GetFontScript :: proc(font: ^Font) -> u32 ---
SetFontLanguage :: proc(font: ^Font, language_bcp47: cstring) -> bool --- SetFontLanguage :: proc(font: ^Font, language_bcp47: cstring) -> bool ---
GetGlyphScript :: proc(ch: SDL.Uint32) -> SDL.Uint32 --- GetGlyphScript :: proc(ch: u32) -> u32 ---
FontHasGlyph :: proc(font: ^Font, ch: SDL.Uint32) -> bool --- FontHasGlyph :: proc(font: ^Font, ch: u32) -> bool ---
GetGlyphImage :: proc(font: ^Font, ch: SDL.Uint32, image_type: ^ImageType) -> ^SDL.Surface --- GetGlyphImage :: proc(font: ^Font, ch: u32, image_type: ^ImageType) -> ^SDL.Surface ---
GetGlyphImageForIndex :: proc(font: ^Font, glyph_index: SDL.Uint32, image_type: ^ImageType) -> ^SDL.Surface --- GetGlyphImageForIndex :: proc(font: ^Font, glyph_index: u32, image_type: ^ImageType) -> ^SDL.Surface ---
GetGlyphMetrics :: proc(font: ^Font, ch: SDL.Uint32, minx, maxx, miny, maxy, advance: ^c.int) -> bool --- GetGlyphMetrics :: proc(font: ^Font, ch: u32, minx, maxx, miny, maxy, advance: ^c.int) -> bool ---
GetGlyphKerning :: proc(font: ^Font, previous_ch: SDL.Uint32, ch: SDL.Uint32, kerning: ^c.int) -> bool --- GetGlyphKerning :: proc(font: ^Font, previous_ch: u32, ch: u32, kerning: ^c.int) -> bool ---
GetStringSize :: proc(font: ^Font, text: cstring, length: c.size_t, w, h: ^c.int) -> bool --- GetStringSize :: proc(font: ^Font, text: cstring, length: c.size_t, w, h: ^c.int) -> bool ---
GetStringSizeWrapped :: proc(font: ^Font, text: cstring, length: c.size_t, wrap_width: c.int, w, h: ^c.int) -> bool --- GetStringSizeWrapped :: proc(font: ^Font, text: cstring, length: c.size_t, wrap_width: c.int, w, h: ^c.int) -> bool ---
@@ -210,19 +209,19 @@ foreign lib {
RenderText_Solid :: proc(font: ^Font, text: cstring, length: c.size_t, fg: SDL.Color) -> ^SDL.Surface --- RenderText_Solid :: proc(font: ^Font, text: cstring, length: c.size_t, fg: SDL.Color) -> ^SDL.Surface ---
RenderText_Solid_Wrapped :: proc(font: ^Font, text: cstring, length: c.size_t, fg: SDL.Color, wrap_Length: c.int) -> ^SDL.Surface --- RenderText_Solid_Wrapped :: proc(font: ^Font, text: cstring, length: c.size_t, fg: SDL.Color, wrap_Length: c.int) -> ^SDL.Surface ---
RenderGylph_Solid :: proc(font: ^Font, ch: SDL.Uint32, fg: SDL.Color) -> ^SDL.Surface --- RenderGylph_Solid :: proc(font: ^Font, ch: u32, fg: SDL.Color) -> ^SDL.Surface ---
RenderText_Shaded :: proc(font: ^Font, text: cstring, length: c.size_t, fg, bg: SDL.Color) -> ^SDL.Surface --- RenderText_Shaded :: proc(font: ^Font, text: cstring, length: c.size_t, fg, bg: SDL.Color) -> ^SDL.Surface ---
RenderText_Shaded_Wrapped :: proc(font: ^Font, text: cstring, length: c.size_t, fg, bg: SDL.Color, wrap_width: c.int) -> ^SDL.Surface --- RenderText_Shaded_Wrapped :: proc(font: ^Font, text: cstring, length: c.size_t, fg, bg: SDL.Color, wrap_width: c.int) -> ^SDL.Surface ---
RenderGlyph_Shaded :: proc(font: ^Font, ch: SDL.Uint32, fg, bg: SDL.Color) -> ^SDL.Surface --- RenderGlyph_Shaded :: proc(font: ^Font, ch: u32, fg, bg: SDL.Color) -> ^SDL.Surface ---
RenderText_Blended :: proc(font: ^Font, text: cstring, length: c.size_t, fg: SDL.Color) -> ^SDL.Surface --- RenderText_Blended :: proc(font: ^Font, text: cstring, length: c.size_t, fg: SDL.Color) -> ^SDL.Surface ---
RnederText_Blended_Wrapped :: proc(font: ^Font, text: cstring, length: c.size_t, fg: SDL.Color, wrap_width: c.int) -> ^SDL.Surface --- RnederText_Blended_Wrapped :: proc(font: ^Font, text: cstring, length: c.size_t, fg: SDL.Color, wrap_width: c.int) -> ^SDL.Surface ---
RenderGlyph_Blended :: proc(font: ^Font, ch: SDL.Uint32, fg: SDL.Color) -> ^SDL.Surface --- RenderGlyph_Blended :: proc(font: ^Font, ch: u32, fg: SDL.Color) -> ^SDL.Surface ---
RenderText_LCD :: proc(font: ^Font, text: cstring, length: c.size_t, fg, bg: SDL.Color) -> ^SDL.Surface --- RenderText_LCD :: proc(font: ^Font, text: cstring, length: c.size_t, fg, bg: SDL.Color) -> ^SDL.Surface ---
RenderText_LCD_Wrapped :: proc(font: ^Font, text: cstring, length: c.size_t, fg, bg: SDL.Color, wrap_width: c.int) -> ^SDL.Surface --- RenderText_LCD_Wrapped :: proc(font: ^Font, text: cstring, length: c.size_t, fg, bg: SDL.Color, wrap_width: c.int) -> ^SDL.Surface ---
RenderGlyph_LCD :: proc(font: ^Font, ch: SDL.Uint32, fg, bg: SDL.Color) -> ^SDL.Surface --- RenderGlyph_LCD :: proc(font: ^Font, ch: u32, fg, bg: SDL.Color) -> ^SDL.Surface ---
CreateSurfaceTextEngine :: proc() -> ^TextEngine --- CreateSurfaceTextEngine :: proc() -> ^TextEngine ---
DrawSurfaceText :: proc(text: ^Text, x, y: int, surface: ^SDL.Surface) -> bool --- DrawSurfaceText :: proc(text: ^Text, x, y: c.int, surface: ^SDL.Surface) -> bool ---
DestroySurfaceTextEngine :: proc(engine: ^TextEngine) --- DestroySurfaceTextEngine :: proc(engine: ^TextEngine) ---
CreateRendererTextEngine :: proc(renderer: ^SDL.Renderer) -> ^TextEngine --- CreateRendererTextEngine :: proc(renderer: ^SDL.Renderer) -> ^TextEngine ---
@@ -245,11 +244,11 @@ foreign lib {
GetTextFont :: proc(text: ^Text) -> ^Font --- GetTextFont :: proc(text: ^Text) -> ^Font ---
SetTextDirection :: proc(text: ^Text, direction: Direction) -> bool --- SetTextDirection :: proc(text: ^Text, direction: Direction) -> bool ---
GetTextDirection :: proc(text: ^Text) -> Direction --- GetTextDirection :: proc(text: ^Text) -> Direction ---
SetTextScript :: proc(text: ^Text, script: SDL.Uint32) -> bool --- SetTextScript :: proc(text: ^Text, script: u32) -> bool ---
GetTextScript :: proc(text: ^Text) -> SDL.Uint32 --- GetTextScript :: proc(text: ^Text) -> u32 ---
SetTextColor :: proc(text: ^Text, r, g, b, a: SDL.Uint8) -> bool --- SetTextColor :: proc(text: ^Text, r, g, b, a: u8) -> bool ---
SetTextColorFloat :: proc(text: ^Text, r, g, b, a: f32) -> bool --- SetTextColorFloat :: proc(text: ^Text, r, g, b, a: f32) -> bool ---
GetTextColor :: proc(text: ^Text, r, g, b, a: ^SDL.Uint8) -> bool --- GetTextColor :: proc(text: ^Text, r, g, b, a: ^u8) -> bool ---
GetTextColorFloat :: proc(text: ^Text, r, g, b, a: ^f32) -> bool --- GetTextColorFloat :: proc(text: ^Text, r, g, b, a: ^f32) -> bool ---
SetTextPosition :: proc(text: ^Text, x, y: c.int) -> bool --- SetTextPosition :: proc(text: ^Text, x, y: c.int) -> bool ---
GetTextPosition :: proc(text: ^Text, x, y: ^c.int) -> bool --- GetTextPosition :: proc(text: ^Text, x, y: ^c.int) -> bool ---