From 70a2bcba18aa9855380c132f89e26b61bfd2cb40 Mon Sep 17 00:00:00 2001 From: jussi Date: Wed, 3 Jan 2024 18:23:19 +0200 Subject: Rest of font loading/unloading functions. GlyphInfo type to userdata. GlyphInfo management functions. --- include/lua_core.h | 4 ++-- include/text.h | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/lua_core.h b/include/lua_core.h index ba56f27..59ebb8f 100644 --- a/include/lua_core.h +++ b/include/lua_core.h @@ -45,7 +45,6 @@ Matrix uluaGetMatrix( lua_State *L, int index ); BoundingBox uluaGetBoundingBox( lua_State *L, int index ); Ray uluaGetRay( lua_State *L, int index ); NPatchInfo uluaGetNPatchInfo( lua_State *L, int index ); -GlyphInfo uluaGetGlyphInfo( lua_State *L, int index ); BoneInfo uluaGetBoneInfo( lua_State *L, int index ); Transform uluaGetTransform( lua_State *L, int index ); Buffer* uluaGetBuffer( lua_State *L, int index ); @@ -57,6 +56,7 @@ Mesh* uluaGetMesh( lua_State *L, int index ); Camera2D* uluaGetCamera2D( lua_State *L, int index ); Camera3D* uluaGetCamera3D( lua_State *L, int index ); Font* uluaGetFont( lua_State *L, int index ); +GlyphInfo* uluaGetGlyphInfo( lua_State *L, int index ); Wave* uluaGetWave( lua_State *L, int index ); Sound* uluaGetSound( lua_State *L, int index ); Music* uluaGetMusic( lua_State *L, int index ); @@ -76,7 +76,6 @@ void uluaPushMatrix( lua_State *L, Matrix matrix ); void uluaPushRay( lua_State *L, Ray ray ); void uluaPushRayCollision( lua_State *L, RayCollision rayCol ); void uluaPushBoundingBox( lua_State *L, BoundingBox box ); -void uluaPushGlyphInfo( lua_State *L, GlyphInfo glyphInfo, Image *image ); void uluaPushBoneInfo( lua_State *L, BoneInfo boneInfo ); void uluaPushTransform( lua_State *L, Transform transform ); void uluaPushBuffer( lua_State *L, Buffer buffer ); @@ -87,6 +86,7 @@ void uluaPushCamera2D( lua_State *L, Camera2D camera ); void uluaPushCamera3D( lua_State *L, Camera3D camera ); void uluaPushShader( lua_State *L, Shader shader ); void uluaPushFont( lua_State *L, Font font ); +void uluaPushGlyphInfo( lua_State *L, GlyphInfo glyph ); void uluaPushWave( lua_State *L, Wave wave ); void uluaPushSound( lua_State *L, Sound sound ); void uluaPushMusic( lua_State *L, Music music ); diff --git a/include/text.h b/include/text.h index a38f979..96c9b82 100644 --- a/include/text.h +++ b/include/text.h @@ -1,12 +1,18 @@ #pragma once +void unloadGlyphInfo( GlyphInfo *glyph ); /* Font loading/unloading functions. */ int ltextGetFontDefault( lua_State *L ); int ltextLoadFont( lua_State *L ); int ltextLoadFontEx( lua_State *L ); int ltextLoadFontFromImage( lua_State *L ); +int ltextLoadFontFromMemory( lua_State *L ); +int ltextLoadFontFromData( lua_State *L ); int ltextIsFontReady( lua_State *L ); +int ltextLoadFontData( lua_State *L ); +int ltextGenImageFontAtlas( lua_State *L ); int ltextUnloadFont( lua_State *L ); +int ltextExportFontAsCode( lua_State *L ); /* Text drawing functions. */ int ltextDrawFPS( lua_State *L ); int ltextDrawText( lua_State *L ); @@ -21,8 +27,21 @@ int ltextSetTextLineSpacing( lua_State *L ); int ltextMeasureText( lua_State *L ); int ltextGetGlyphIndex( lua_State *L ); int ltextGetGlyphInfo( lua_State *L ); +int ltextGetGlyphInfoByIndex( lua_State *L ); int ltextGetGlyphAtlasRec( lua_State *L ); +int ltextGetGlyphAtlasRecByIndex( lua_State *L ); int ltextGetFontBaseSize( lua_State *L ); int ltextGetFontGlyphCount( lua_State *L ); int ltextGetFontGlyphPadding( lua_State *L ); int ltextGetFontTexture( lua_State *L ); +/* GlyphInfo management functions. */ +int ltextLoadGlyphInfo( lua_State *L ); +int ltextUnloadGlyphInfo( lua_State *L ); +int ltextSetGlyphInfoValue( lua_State *L ); +int ltextSetGlyphInfoOffset( lua_State *L ); +int ltextSetGlyphInfoAdvanceX( lua_State *L ); +int ltextSetGlyphInfoImage( lua_State *L ); +int ltextGetGlyphInfoValue( lua_State *L ); +int ltextGetGlyphInfoOffset( lua_State *L ); +int ltextGetGlyphInfoAdvanceX( lua_State *L ); +int ltextGetGlyphInfoImage( lua_State *L ); -- cgit v1.2.3