indrajith/reilua-enhanced
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New argument style for rlgl, text, lights and math.

Browse Source
This commit is contained in:
jussi
2023-04-09 22:19:47 +03:00
parent 6dad6544d7
commit f4ae19ca7d
6 changed files with 433 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog
View File

@@ -33,7 +33,8 @@ Detailed changes:
- CHANGED: DrawLineStrip no longer require pointsCount - CHANGED: DrawLineStrip no longer require pointsCount
- CHANGED: DrawTriangleFan no longer require pointsCount - CHANGED: DrawTriangleFan no longer require pointsCount
- CHANGED: DrawTriangleStrip no longer require pointsCount - CHANGED: DrawTriangleStrip no longer require pointsCount
- REVISED: How argumets are handled. Now uluaGet* functions can take index. Also using mostly positive stack indexing. - REVISED: How argumets are handled. Now uluaGet*Index functions can take stack index(positive only).
Also using mostly positive stack indexing.
------------------------------------------------------------------------ ------------------------------------------------------------------------
Release: ReiLua version 0.4.0 Using Raylib 4.2 Release: ReiLua version 0.4.0 Using Raylib 4.2

9
devnotes
View File

@@ -1,13 +1,14 @@
Current { Current {
* New argument styles for: models, rgui, easings.
* ReiLua camera3D lib. * ReiLua camera3D lib.
* Check new functions from https://github.com/raysan5/raylib/blob/master/CHANGELOG * Check new functions from https://github.com/raysan5/raylib/blob/master/CHANGELOG
} }
Backlog { Backlog {
* IsWaveReady and others like that. * IsWaveReady and other Is* ready functions.
* rlgl * rlgl
* More low level functions. Could be usefull now when draw polygon is removed. * More low level functions. Could be usefull now when for example draw polygon is removed.
* Text * Text
* Ability to set font texture filtering. * Ability to set font texture filtering.
* Codepoints? * Codepoints?
@@ -29,4 +30,8 @@ Backlog {
* LoadShader * LoadShader
* LoadShaderFromMemory * LoadShaderFromMemory
* LoadSoundFromWave * LoadSoundFromWave
* LoadFont
* LoadFontEx
* LoadFontFromImage
* DrawText
} }

48
src/lights.c
View File

@@ -32,6 +32,20 @@ bool validLight( size_t id ) {
} }
} }
static int newLight() {
int i = 0;
for ( i = 0; i < state->lightCount; i++ ) {
if ( state->lights[i] == NULL ) {
break;
}
}
state->lights[i] = malloc( sizeof( Light ) );
checkLightRealloc( i );
return i;
}
/* /*
## Lights - Basics ## Lights - Basics
*/ */
@@ -45,32 +59,21 @@ Create a light and get shader locations
- Success return int - Success return int
*/ */
int llightsCreateLight( lua_State *L ) { int llightsCreateLight( lua_State *L ) {
if ( !lua_isnumber( L, -5 ) || !lua_istable( L, -4 ) || !lua_istable( L, -3 ) || !lua_istable( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_istable( L, 2 ) || !lua_istable( L, 3 )
|| !lua_istable( L, 4 ) || !lua_isnumber( L, 5 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.CreateLight( int type, Vector3 position, Vector3 target, Color color, Shader shader )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.CreateLight( int type, Vector3 position, Vector3 target, Color color, Shader shader )" );
lua_pushinteger( L, -1 ); lua_pushinteger( L, -1 );
return 1; return 1;
} }
size_t shaderId = lua_tointeger( L, -1 ); int type = lua_tointeger( L, 1 );
lua_pop( L, 1 ); Vector3 position = uluaGetVector3Index( L, 2 );
Color color = uluaGetColor( L ); Vector3 target = uluaGetVector3Index( L, 3 );
lua_pop( L, 1 ); Color color = uluaGetColorIndex( L, 4 );
Vector3 target = uluaGetVector3( L ); size_t shaderId = lua_tointeger( L, 5 );
lua_pop( L, 1 );
Vector3 position = uluaGetVector3( L );
lua_pop( L, 1 );
int type = lua_tointeger( L, -1 );
int i = 0; int i = newLight();
for ( i = 0; i < state->lightCount; i++ ) {
if ( state->lights[i] == NULL ) {
break;
}
}
state->lights[i] = malloc( sizeof( Light ) );
*state->lights[i] = CreateLight( type, position, target, color, *state->shaders[ shaderId ] ); *state->lights[i] = CreateLight( type, position, target, color, *state->shaders[ shaderId ] );
lua_pushinteger( L, i ); lua_pushinteger( L, i );
checkLightRealloc( i );
return 1; return 1;
} }
@@ -84,14 +87,13 @@ Send light properties to shader
- Success return true - Success return true
*/ */
int llightsUpdateLightValues( lua_State *L ) { int llightsUpdateLightValues( lua_State *L ) {
if ( !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isnumber( L, 2 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.UpdateLightValues( Shader shader, Light light )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.UpdateLightValues( Shader shader, Light light )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
size_t lightId = lua_tointeger( L, -1 ); size_t shaderId = lua_tointeger( L, 1 );
lua_pop( L, 1 ); size_t lightId = lua_tointeger( L, 2 );
size_t shaderId = lua_tointeger( L, -1 );
if ( !validLight( lightId ) ) { if ( !validLight( lightId ) ) {
lua_pushboolean( L, false ); lua_pushboolean( L, false );

4
src/rlgl.c
View File

@@ -16,12 +16,12 @@ Set the line drawing width
- Success return true - Success return true
*/ */
int lrlglSetLineWidth( lua_State *L ) { int lrlglSetLineWidth( lua_State *L ) {
if ( !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.rlSetLineWidth( float width )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.rlSetLineWidth( float width )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
rlSetLineWidth( lua_tonumber( L, -1 ) ); rlSetLineWidth( lua_tonumber( L, 1 ) );
lua_pushboolean( L, true ); lua_pushboolean( L, true );
return 1; return 1;

723
src/rmath.c
View File

File diff suppressed because it is too large Load Diff

161
src/text.c
View File

@@ -29,6 +29,20 @@ bool validFont( size_t id ) {
} }
} }
static int newFont() {
int i = 0;
for ( i = 0; i < state->fontCount; i++ ) {
if ( state->fonts[i] == NULL ) {
break;
}
}
state->fonts[i] = malloc( sizeof( Font ) );
checkFontRealloc( i );
return i;
}
/* /*
## Text - Loading ## Text - Loading
*/ */
@@ -42,22 +56,21 @@ Load font from file into GPU memory ( VRAM )
- Success return int - Success return int
*/ */
int ltextLoadFont( lua_State *L ) { int ltextLoadFont( lua_State *L ) {
if ( !lua_isstring( L, -1 ) ) { if ( !lua_isstring( L, 1 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.LoadFont( string fileName )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.LoadFont( string fileName )" );
lua_pushinteger( L, -1 ); lua_pushinteger( L, -1 );
return 1; return 1;
} }
int i = 0; if ( FileExists( lua_tostring( L, 1 ) ) ) {
int i = newFont();
for ( i = 0; i < state->fontCount; i++ ) { *state->fonts[i] = LoadFont( lua_tostring( L, 1 ) );
if ( state->fonts[i] == NULL ) { lua_pushinteger( L, i );
break; return 1;
} }
else {
lua_pushinteger( L, -1 );
return 1;
} }
state->fonts[i] = malloc( sizeof( Font ) );
*state->fonts[i] = LoadFont( lua_tostring( L, -1 ) );
lua_pushinteger( L, i );
checkFontRealloc( i );
return 1; return 1;
} }
@@ -71,22 +84,23 @@ Load font from file with extended parameters. Loading the default character set
- Success return int - Success return int
*/ */
int ltextLoadFontEx( lua_State *L ) { int ltextLoadFontEx( lua_State *L ) {
if ( !lua_isstring( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isstring( L, 1 ) || !lua_isnumber( L, 2 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.LoadFontEx( string fileName, int fontSize )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.LoadFontEx( string fileName, int fontSize )" );
lua_pushinteger( L, -1 ); lua_pushinteger( L, -1 );
return 1; return 1;
} }
int i = 0; int fontSize = lua_tointeger( L, 2 );
for ( i = 0; i < state->fontCount; i++ ) { if ( FileExists( lua_tostring( L, 1 ) ) ) {
if ( state->fonts[i] == NULL ) { int i = newFont();
break; *state->fonts[i] = LoadFontEx( lua_tostring( L, 1 ), fontSize, NULL, 0 );
} lua_pushinteger( L, i );
return 1;
}
else {
lua_pushinteger( L, -1 );
return 1;
} }
state->fonts[i] = malloc( sizeof( Font ) );
*state->fonts[i] = LoadFontEx( lua_tostring( L, -2 ), lua_tointeger( L, - 1 ), NULL, 0 );
lua_pushinteger( L, i );
checkFontRealloc( i );
return 1; return 1;
} }
@@ -100,34 +114,23 @@ Load font from Image ( XNA style )
- Success return int - Success return int
*/ */
int ltextLoadFontFromImage( lua_State *L ) { int ltextLoadFontFromImage( lua_State *L ) {
if ( !lua_isnumber( L, -3 ) || !lua_istable( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_istable( L, 2 ) || !lua_isnumber( L, 3 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.LoadFontFromImage( Image image, Color key, int firstChar )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.LoadFontFromImage( Image image, Color key, int firstChar )" );
lua_pushinteger( L, -1 ); lua_pushinteger( L, -1 );
return 1; return 1;
} }
int i = 0; size_t imageId = lua_tointeger( L, 1 );
Color key = uluaGetColorIndex( L, 2 );
for ( i = 0; i < state->fontCount; i++ ) { int firstChar = lua_tointeger( L, 3 );
if ( state->fonts[i] == NULL ) {
break;
}
}
int firstChar = lua_tointeger( L, -1 );
lua_pop( L, 1 );
Color key = uluaGetColor( L );
lua_pop( L, 1 );
size_t imageId = lua_tointeger( L, -1 );
if ( !validImage( imageId ) ) { if ( !validImage( imageId ) ) {
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
state->fonts[i] = malloc( sizeof( Font ) ); int i = newFont();
*state->fonts[i] = LoadFontFromImage( *state->images[ imageId ], key, firstChar ); *state->fonts[i] = LoadFontFromImage( *state->images[ imageId ], key, firstChar );
lua_pushinteger( L, i ); lua_pushinteger( L, i );
checkFontRealloc( i );
return 1; return 1;
} }
@@ -141,19 +144,19 @@ Unload Font from GPU memory ( VRAM )
- Success return true - Success return true
*/ */
int ltextUnloadFont( lua_State *L ) { int ltextUnloadFont( lua_State *L ) {
if ( !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.UnloadFont( Font font )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.UnloadFont( Font font )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
size_t id = lua_tointeger( L, -1 ); size_t FontId = lua_tointeger( L, 1 );
if ( !validFont( id ) ) { if ( !validFont( FontId ) ) {
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
UnloadFont( *state->fonts[ id ] ); UnloadFont( *state->fonts[ FontId ] );
state->fonts[ id ] = NULL; state->fonts[ FontId ] = NULL;
lua_pushboolean( L, true ); lua_pushboolean( L, true );
return 1; return 1;
@@ -172,12 +175,12 @@ Draw current FPS
- Success return true - Success return true
*/ */
int ltextDrawFPS( lua_State *L ) { int ltextDrawFPS( lua_State *L ) {
if ( !lua_istable( L, -1 ) ) { if ( !lua_istable( L, 1 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.DrawFPS( Vector2 pos )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.DrawFPS( Vector2 pos )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
Vector2 pos = uluaGetVector2( L ); Vector2 pos = uluaGetVector2Index( L, 1 );
DrawFPS( pos.x, pos.y ); DrawFPS( pos.x, pos.y );
lua_pushboolean( L, true ); lua_pushboolean( L, true );
@@ -194,27 +197,23 @@ Draw text using font and additional parameters
- Success return true - Success return true
*/ */
int ltextDrawText( lua_State *L ) { int ltextDrawText( lua_State *L ) {
if ( !lua_isnumber( L, -6 ) || !lua_isstring( L, -5 ) || !lua_istable( L, -4 ) if ( !lua_isnumber( L, 1 ) || !lua_isstring( L, 2 ) || !lua_istable( L, 3 )
|| !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_istable( L, -1 ) ) { || !lua_isnumber( L, 4 ) || !lua_isnumber( L, 5 ) || !lua_istable( L, 6 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.DrawText( Font font, string text, Vector2 position, float fontSize, float spacing, Color tint )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.DrawText( Font font, string text, Vector2 position, float fontSize, float spacing, Color tint )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
Color color = uluaGetColor( L ); size_t fontId = lua_tointeger( L, 1 );
lua_pop( L, 1 ); Vector2 position = uluaGetVector2Index( L, 3 );
float spacing = lua_tonumber( L, -1 ); float fontSize = lua_tonumber( L, 4 );
lua_pop( L, 1 ); float spacing = lua_tonumber( L, 5 );
float fontSize = lua_tonumber( L, -1 ); Color tint = uluaGetColorIndex( L, 6 );
lua_pop( L, 1 );
Vector2 position = uluaGetVector2( L );
lua_pop( L, 1 );
size_t fontId = lua_tointeger( L, -2 );
if ( !validFont( fontId ) ) { if ( !validFont( fontId ) ) {
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
DrawTextEx( *state->fonts[ fontId ], lua_tostring( L, -1 ), position, fontSize, spacing, color ); DrawTextEx( *state->fonts[ fontId ], lua_tostring( L, 2 ), position, fontSize, spacing, tint );
lua_pushboolean( L, true ); lua_pushboolean( L, true );
return 1; return 1;
@@ -229,31 +228,25 @@ Draw text using Font and pro parameters ( rotation )
- Success return true - Success return true
*/ */
int ltextDrawTextPro( lua_State *L ) { int ltextDrawTextPro( lua_State *L ) {
if ( !lua_isnumber( L, -8 ) || !lua_isstring( L, -7 ) || !lua_istable( L, -6 ) || !lua_istable( L, -5 ) if ( !lua_isnumber( L, 1 ) || !lua_isstring( L, 2 ) || !lua_istable( L, 3 ) || !lua_istable( L, 4 )
|| !lua_isnumber( L, -4 ) || !lua_isnumber( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_istable( L, -1 ) ) { || !lua_isnumber( L, 5 ) || !lua_isnumber( L, 6 ) || !lua_isnumber( L, 7 ) || !lua_istable( L, 8 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.DrawTextPro( Font font, string text, Vector2 position, Vector2 origin, float rotation, float fontSize, float spacing, Color tint )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.DrawTextPro( Font font, string text, Vector2 position, Vector2 origin, float rotation, float fontSize, float spacing, Color tint )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
Color color = uluaGetColor( L ); size_t fontId = lua_tointeger( L, 1 );
lua_pop( L, 1 ); Vector2 position = uluaGetVector2Index( L, 3 );
float spacing = lua_tonumber( L, -1 ); Vector2 origin = uluaGetVector2Index( L, 4 );
lua_pop( L, 1 ); float rotation = lua_tonumber( L, 5 );
float fontSize = lua_tonumber( L, -1 ); float fontSize = lua_tonumber( L, 6 );
lua_pop( L, 1 ); float spacing = lua_tonumber( L, 7 );
float rotation = lua_tonumber( L, -1 ); Color tint = uluaGetColorIndex( L, 8 );
lua_pop( L, 1 );
Vector2 origin = uluaGetVector2( L );
lua_pop( L, 1 );
Vector2 position = uluaGetVector2( L );
lua_pop( L, 1 );
size_t fontId = lua_tointeger( L, -2 );
if ( !validFont( fontId ) ) { if ( !validFont( fontId ) ) {
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
DrawTextPro( *state->fonts[ fontId ], lua_tostring( L, -1 ), position, origin, rotation, fontSize, spacing, color ); DrawTextPro( *state->fonts[ fontId ], lua_tostring( L, 2 ), position, origin, rotation, fontSize, spacing, tint );
lua_pushboolean( L, true ); lua_pushboolean( L, true );
return 1; return 1;
@@ -272,22 +265,20 @@ Measure string size for Font
- Success return Vector2 - Success return Vector2
*/ */
int ltextMeasureText( lua_State *L ) { int ltextMeasureText( lua_State *L ) {
if ( !lua_isnumber( L, -4 ) || !lua_isstring( L, -3 ) || !lua_isnumber( L, -2 ) || !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) || !lua_isstring( L, 2 ) || !lua_isnumber( L, 3 ) || !lua_isnumber( L, 4 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.MeasureText( Font font, string text, float fontSize, float spacing )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.MeasureText( Font font, string text, float fontSize, float spacing )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
float spacing = lua_tonumber( L, -1 ); size_t fontId = lua_tointeger( L, 1 );
lua_pop( L, 1 ); float fontSize = lua_tonumber( L, 3 );
float fontSize = lua_tonumber( L, -1 ); float spacing = lua_tonumber( L, 4 );
lua_pop( L, 1 );
size_t fontId = lua_tointeger( L, -2 );
if ( !validFont( fontId ) ) { if ( !validFont( fontId ) ) {
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
uluaPushVector2( L, MeasureTextEx( *state->fonts[ fontId ], lua_tostring( L, -1 ), fontSize, spacing ) ); uluaPushVector2( L, MeasureTextEx( *state->fonts[ fontId ], lua_tostring( L, 2 ), fontSize, spacing ) );
return 1; return 1;
} }
@@ -301,12 +292,12 @@ Get font baseSize
- Success return int - Success return int
*/ */
int ltextGetFontBaseSize( lua_State *L ) { int ltextGetFontBaseSize( lua_State *L ) {
if ( !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.GetFontBaseSize( Font font )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.GetFontBaseSize( Font font )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
size_t fontId = lua_tointeger( L, -1 ); size_t fontId = lua_tointeger( L, 1 );
if ( !validFont( fontId ) ) { if ( !validFont( fontId ) ) {
lua_pushboolean( L, false ); lua_pushboolean( L, false );
@@ -326,12 +317,12 @@ Get font glyphCount
- Success return int - Success return int
*/ */
int ltextGetFontGlyphCount( lua_State *L ) { int ltextGetFontGlyphCount( lua_State *L ) {
if ( !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.GetFontGlyphCount( Font font )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.GetFontGlyphCount( Font font )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
size_t fontId = lua_tointeger( L, -1 ); size_t fontId = lua_tointeger( L, 1 );
if ( !validFont( fontId ) ) { if ( !validFont( fontId ) ) {
lua_pushboolean( L, false ); lua_pushboolean( L, false );
@@ -351,12 +342,12 @@ Get font glyphPadding
- Success return int - Success return int
*/ */
int ltextGetFontGlyphPadding( lua_State *L ) { int ltextGetFontGlyphPadding( lua_State *L ) {
if ( !lua_isnumber( L, -1 ) ) { if ( !lua_isnumber( L, 1 ) ) {
TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.GetFontGlyphPadding( Font font )" ); TraceLog( LOG_WARNING, "%s", "Bad call of function. RL.GetFontGlyphPadding( Font font )" );
lua_pushboolean( L, false ); lua_pushboolean( L, false );
return 1; return 1;
} }
size_t fontId = lua_tointeger( L, -1 ); size_t fontId = lua_tointeger( L, 1 );
if ( !validFont( fontId ) ) { if ( !validFont( fontId ) ) {
lua_pushboolean( L, false ); lua_pushboolean( L, false );