diff options
| -rw-r--r-- | API.md | 18 | ||||
| -rw-r--r-- | changelog | 2 | ||||
| -rw-r--r-- | docgen.lua | 6 | ||||
| -rw-r--r-- | include/lua_core.h | 21 | ||||
| -rw-r--r-- | src/audio.c | 15 | ||||
| -rw-r--r-- | src/core.c | 9 | ||||
| -rw-r--r-- | src/lua_core.c | 267 | ||||
| -rw-r--r-- | src/models.c | 21 | ||||
| -rw-r--r-- | src/rlgl.c | 2 | ||||
| -rw-r--r-- | src/text.c | 5 | ||||
| -rw-r--r-- | src/textures.c | 9 |
11 files changed, 316 insertions, 59 deletions
@@ -47,6 +47,18 @@ This function will be called before InitWindow. Note! Only place where you shoul --- +> function RL.load() + +This function will be called when loading resource that allocates memory. Usefull for memory leak debugging. Note! Cannot detect all resources, for example material textures. + +--- + +> function RL.unload() + +This function will be called when unloading resource that has allocated memory. Usefull for memory leak debugging. Note! Cannot detect all resources, for example material textures. + +--- + ## Object unloading Some objects allocate memory that needs to be freed when object is no longer needed. By default objects like Textures are unloaded by the Lua garbage collector. It is generatty however recommended to handle this manually in more complex projects. You can change the behavior with SetGCUnload. @@ -261,6 +273,12 @@ Sound --- +> SoundAlias = Userdata + +SoundAlias + +--- + > Music = Userdata Music, audio stream, anything longer than ~10 seconds should be streamed @@ -49,6 +49,8 @@ DETAILED CHANGES: - FIXED: DrawTextBoxed Could draw text outside rect when using special characters. Also accepts optional tabSize argument. - ADDED: DrawTextBoxed Color change escape sequence. + - ADDED: RL.load and RL.unload functions for memory leak debugging. + - ADDED: SoundAlias garbage collection. ------------------------------------------------------------------------ Release: ReiLua version 0.8.0 Using Raylib 5.0 and Forked Raygui 4.0 @@ -115,6 +115,8 @@ local FUNC_DESC = { log = "This function can be used for custom log message handling.", exit = "This function will be called on program close. Cleanup could be done here.", config = "This function will be called before InitWindow. Note! Only place where you should call InitWindow manually. Doesn't have OpenGL context at this point.", + load = "This function will be called when loading resource that allocates memory. Usefull for memory leak debugging. Note! Cannot detect all resources, for example material textures.", + unload = "This function will be called when unloading resource that has allocated memory. Usefull for memory leak debugging. Note! Cannot detect all resources, for example material textures.", } apiFile:write( "\n---\n> function RL.init()\n\n"..FUNC_DESC.init.."\n\n---\n" ) @@ -124,6 +126,8 @@ apiFile:write( "\n> function RL.event( event )\n\n"..FUNC_DESC.event.."\n\n---\n apiFile:write( "\n> function RL.log( logLevel, message )\n\n"..FUNC_DESC.log.."\n\n---\n" ) apiFile:write( "\n> function RL.exit()\n\n"..FUNC_DESC.exit.."\n\n---\n" ) apiFile:write( "\n> function RL.config()\n\n"..FUNC_DESC.config.."\n\n---\n" ) +apiFile:write( "\n> function RL.load()\n\n"..FUNC_DESC.load.."\n\n---\n" ) +apiFile:write( "\n> function RL.unload()\n\n"..FUNC_DESC.unload.."\n\n---\n" ) luaApiFile:write( "-- Put this file into your project folder to provide annotations when using Lua language server.\n\n" ) luaApiFile:write( "RL={}\n\n" ) @@ -260,6 +264,8 @@ apiFile:write( "\n> Wave = Userdata\n\ Wave, audio wave data\n\n---\n" ) apiFile:write( "\n> Sound = Userdata\n\ Sound\n\n---\n" ) +apiFile:write( "\n> SoundAlias = Userdata\n\ +SoundAlias\n\n---\n" ) apiFile:write( "\n> Music = Userdata\n\ Music, audio stream, anything longer than ~10 seconds should be streamed\n\n---\n" ) apiFile:write( "\n> NPatchInfo = { { 0, 0, 24, 24 }, 8, 8, 8, 8, NPATCH_NINE_PATCH } or { source = { 0, 0, 24, 24 }, left = 8, top = 8, right = 8, bottom = 8, layout = NPATCH_NINE_PATCH }\n\ diff --git a/include/lua_core.h b/include/lua_core.h index e7c45fb..405f054 100644 --- a/include/lua_core.h +++ b/include/lua_core.h @@ -55,6 +55,8 @@ void luaCallInit(); void luaCallUpdate(); void luaCallDraw(); void luaCallExit(); +void luaCallLoad( const char* type, void* object ); +void luaCallUnload( const char* type, void* object ); void luaRegister(); void platformDefineGlobals(); void luaPlatformRegister(); @@ -119,6 +121,7 @@ REILUAPI void uluaPushFont( lua_State* L, Font font ); REILUAPI void uluaPushGlyphInfo( lua_State* L, GlyphInfo glyph ); REILUAPI void uluaPushWave( lua_State* L, Wave wave ); REILUAPI void uluaPushSound( lua_State* L, Sound sound ); +REILUAPI void uluaPushSoundAlias( lua_State* L, Sound alias ); REILUAPI void uluaPushMusic( lua_State* L, Music music ); REILUAPI void uluaPushLight( lua_State* L, Light light ); REILUAPI void uluaPushMaterial( lua_State* L, Material material ); @@ -128,6 +131,24 @@ REILUAPI void uluaPushModelAnimation( lua_State* L, ModelAnimation modelAnimatio REILUAPI void uluaPushRLRenderBatch( lua_State* L, rlRenderBatch renderBatch ); REILUAPI void uluaPushAutomationEvent( lua_State* L, AutomationEvent event ); REILUAPI void uluaPushAutomationEventList( lua_State* L, AutomationEventList eventList ); +/* Unload objects. */ +void uluaUnloadBuffer( Buffer* buffer ); +void uluaUnloadImage( Image* image ); +void uluaUnloadTexture( Texture* texture ); +void uluaUnloadRenderTexture( RenderTexture* renderTexture ); +void uluaUnloadShader( Shader* shader ); +void uluaUnloadFont( Font* font ); +void uluaUnloadGlyphInfo( GlyphInfo* glyph ); +void uluaUnloadWave( Wave* wave ); +void uluaUnloadSound( Sound* sound ); +void uluaUnloadSoundAlias( Sound* sound ); +void uluaUnloadMusic( Music* music ); +void uluaUnloadMaterial( Material* material, bool freeAll ); +void uluaUnloadMesh( Mesh* mesh ); +void uluaUnloadModel( Model* model ); +void uluaUnloadModelAnimation( ModelAnimation* modelAnimation ); +void uluaUnloadRLRenderBatch( rlRenderBatch* renderBatch ); +void uluaUnloadAutomationEventList( AutomationEventList* eventList ); /* Utils. */ REILUAPI int uluaGetTableLen( lua_State* L, int index ); REILUAPI bool uluaIsNil( lua_State* L, int index ); diff --git a/src/audio.c b/src/audio.c index dee3744..47e71ef 100644 --- a/src/audio.c +++ b/src/audio.c @@ -168,7 +168,8 @@ Create a new sound that shares the same sample data as the source sound, does no int laudioLoadSoundAlias( lua_State* L ) { Sound* source = uluaGetSound( L, 1 ); - uluaPushSound( L, LoadSoundAlias( *source ) ); + // uluaPushSound( L, LoadSoundAlias( *source ) ); + uluaPushSoundAlias( L, LoadSoundAlias( *source ) ); return 1; } @@ -211,8 +212,7 @@ Unload wave data int laudioUnloadWave( lua_State* L ) { Wave* wave = uluaGetWave( L, 1 ); - UnloadWave( *wave ); - memset( wave, 0, sizeof( Wave ) ); + uluaUnloadWave( wave ); return 0; } @@ -225,8 +225,7 @@ Unload sound int laudioUnloadSound( lua_State* L ) { Sound* sound = uluaGetSound( L, 1 ); - UnloadSound( *sound ); - memset( sound, 0, sizeof( Sound ) ); + uluaUnloadSound( sound ); return 0; } @@ -239,8 +238,7 @@ Unload a sound alias (does not deallocate sample data) int laudioUnloadSoundAlias( lua_State* L ) { Sound* alias = uluaGetSound( L, 1 ); - UnloadSoundAlias( *alias ); - memset( alias, 0, sizeof( Sound ) ); + uluaUnloadSoundAlias( alias ); return 0; } @@ -519,8 +517,7 @@ Unload music stream int laudioUnloadMusicStream( lua_State* L ) { Music* music = uluaGetMusic( L, 1 ); - UnloadMusicStream( *music ); - memset( music, 0, sizeof( Music ) ); + uluaUnloadMusic( music ); return 0; } @@ -1279,8 +1279,7 @@ Unload shader from GPU memory (VRAM) int lcoreUnloadShader( lua_State* L ) { Shader* shader = uluaGetShader( L, 1 ); - UnloadShader( *shader ); - memset( shader, 0, sizeof( Shader ) ); + uluaUnloadShader( shader ); return 0; } @@ -2304,8 +2303,7 @@ Unload automation events list from file int lcoreUnloadAutomationEventList( lua_State* L ) { AutomationEventList* list = uluaGetAutomationEventList( L, 1 ); - UnloadAutomationEventList( *list ); - memset( list, 0, sizeof( AutomationEventList ) ); + uluaUnloadAutomationEventList( list ); return 0; } @@ -3792,8 +3790,7 @@ Unload buffer data int lcoreUnloadBuffer( lua_State* L ) { Buffer* buffer = uluaGetBuffer( L, 1 ); - unloadBuffer( buffer ); - memset( buffer, 0, sizeof( Buffer ) ); + uluaUnloadBuffer( buffer ); return 0; } diff --git a/src/lua_core.c b/src/lua_core.c index e29b2ee..035685d 100644 --- a/src/lua_core.c +++ b/src/lua_core.c @@ -31,7 +31,7 @@ static int gcBuffer( lua_State* L ) { if ( state->gcUnload ) { Buffer* buffer = luaL_checkudata( L, 1, "Buffer" ); - unloadBuffer( buffer ); + uluaUnloadBuffer( buffer ); } return 0; } @@ -50,7 +50,7 @@ static void defineBuffer() { static int gcImage( lua_State* L ) { if ( state->gcUnload ) { Image* image = luaL_checkudata( L, 1, "Image" ); - UnloadImage( *image ); + uluaUnloadImage( image ); } return 0; } @@ -69,7 +69,7 @@ static void defineImage() { static int gcTexture( lua_State* L ) { if ( state->gcUnload ) { Texture* texture = luaL_checkudata( L, 1, "Texture" ); - UnloadTexture( *texture ); + uluaUnloadTexture( texture ); } return 0; } @@ -88,7 +88,7 @@ static void defineTexture() { static int gcRenderTexture( lua_State* L ) { if ( state->gcUnload ) { RenderTexture* renderTexture = luaL_checkudata( L, 1, "RenderTexture" ); - UnloadRenderTexture( *renderTexture ); + uluaUnloadRenderTexture( renderTexture ); } return 0; } @@ -125,7 +125,7 @@ static void defineCamera3D() { static int gcShader( lua_State* L ) { if ( state->gcUnload ) { Shader* shader = luaL_checkudata( L, 1, "Shader" ); - UnloadShader( *shader ); + uluaUnloadShader( shader ); } return 0; } @@ -144,7 +144,7 @@ static void defineShader() { static int gcFont( lua_State* L ) { if ( state->gcUnload ) { Font* font = luaL_checkudata( L, 1, "Font" ); - UnloadFont( *font ); + uluaUnloadFont( font ); } return 0; } @@ -163,7 +163,7 @@ static void defineFont() { static int gcGlyphInfo( lua_State* L ) { if ( state->gcUnload ) { GlyphInfo* glyph = luaL_checkudata( L, 1, "GlyphInfo" ); - unloadGlyphInfo( glyph ); + uluaUnloadGlyphInfo( glyph ); } return 0; } @@ -182,7 +182,7 @@ static void defineGlyphInfo() { static int gcWave( lua_State* L ) { if ( state->gcUnload ) { Wave* wave = luaL_checkudata( L, 1, "Wave" ); - UnloadWave( *wave ); + uluaUnloadWave( wave ); } return 0; } @@ -201,7 +201,7 @@ static void defineWave() { static int gcSound( lua_State* L ) { if ( state->gcUnload ) { Sound* sound = luaL_checkudata( L, 1, "Sound" ); - UnloadSound( *sound ); + uluaUnloadSound( sound ); } return 0; } @@ -216,11 +216,30 @@ static void defineSound() { lua_setfield( L, -2, "__gc" ); } + /* SoundAlias. */ +static int gcSoundAlias( lua_State* L ) { + if ( state->gcUnload ) { + Sound* sound = luaL_checkudata( L, 1, "SoundAlias" ); + uluaUnloadSoundAlias( sound ); + } + return 0; +} + +static void defineSoundAlias() { + lua_State* L = state->luaState; + + luaL_newmetatable( L, "SoundAlias" ); + lua_pushvalue( L, -1 ); + lua_setfield( L, -2, "__index" ); + lua_pushcfunction( L, gcSoundAlias ); + lua_setfield( L, -2, "__gc" ); +} + /* Music. */ static int gcMusic( lua_State* L ) { if ( state->gcUnload ) { Music* music = luaL_checkudata( L, 1, "Music" ); - UnloadMusicStream( *music ); + uluaUnloadMusic( music ); } return 0; } @@ -248,8 +267,7 @@ static void defineLight() { static int gcMaterial( lua_State* L ) { if ( state->gcUnload ) { Material* material = luaL_checkudata( L, 1, "Material" ); - /* Custom UnloadMaterial since we don't want to free Shaders or Textures. */ - unloadMaterial( material ); + uluaUnloadMaterial( material, true ); } return 0; } @@ -268,7 +286,7 @@ static void defineMaterial() { static int gcMesh( lua_State* L ) { if ( state->gcUnload ) { Mesh* mesh = luaL_checkudata( L, 1, "Mesh" ); - UnloadMesh( *mesh ); + uluaUnloadMesh( mesh ); } return 0; } @@ -287,7 +305,7 @@ static void defineMesh() { static int gcModel( lua_State* L ) { if ( state->gcUnload ) { Model* model = luaL_checkudata( L, 1, "Model" ); - UnloadModel( *model ); + uluaUnloadModel( model ); } return 0; } @@ -306,7 +324,7 @@ static void defineModel() { static int gcModelAnimation( lua_State* L ) { if ( state->gcUnload ) { ModelAnimation* modelAnimation = luaL_checkudata( L, 1, "ModelAnimation" ); - UnloadModelAnimation( *modelAnimation ); + uluaUnloadModelAnimation( modelAnimation ); } return 0; } @@ -325,7 +343,7 @@ static void defineModelAnimation() { static int gcRLRenderBatch( lua_State* L ) { if ( state->gcUnload ) { rlRenderBatch* renderBatch = luaL_checkudata( L, 1, "rlRenderBatch" ); - rlUnloadRenderBatch( *renderBatch ); + uluaUnloadRLRenderBatch( renderBatch ); } return 0; } @@ -353,7 +371,7 @@ static void defineAutomationEvent() { static int gcAutomationEventList( lua_State* L ) { if ( state->gcUnload ) { AutomationEventList* automationEventList = luaL_checkudata( L, 1, "AutomationEventList" ); - UnloadAutomationEventList( *automationEventList ); + uluaUnloadAutomationEventList( automationEventList ); } return 0; } @@ -1321,6 +1339,7 @@ bool luaInit( int argn, const char** argc ) { defineGlyphInfo(); defineWave(); defineSound(); + defineSoundAlias(); defineMusic(); defineLight(); defineMaterial(); @@ -1351,6 +1370,16 @@ bool luaInit( int argn, const char** argc ) { } lua_pop( L, -1 ); + /* Alloc counter test. */ + // lua_getglobal( L, "RL" ); + // lua_newtable( L ); + // lua_pushnumber( L, 0 ); + // lua_setfield( L, -2, "alloc" ); + // lua_getglobal( L, "RL" ); + // lua_getfield( L, -1, "alloc" ); + // lua_pushnumber( L, 0 ); + // lua_pop( L, -1 ); + return true; } @@ -1513,6 +1542,68 @@ void luaCallExit() { lua_pop( L, -1 ); } +void luaCallLoad( const char* type, void* object ) { + lua_State* L = state->luaState; + lua_pushcfunction( L, luaTraceback ); + int tracebackidx = lua_gettop(L); + + lua_getglobal( L, "RL" ); + lua_getfield( L, -1, "load" ); + + if ( lua_isfunction( L, -1 ) ) { + lua_Debug ar; + lua_getstack( L, 1, &ar ); + lua_getinfo( L, "Sl", &ar ); + + lua_createtable( L, 5, 0 ); + lua_pushstring( L, type ); + lua_setfield( L, -2, "type" ); + lua_pushlightuserdata( L, object ); + lua_setfield( L, -2, "object" ); + lua_pushstring( L, ar.source ); + lua_setfield( L, -2, "source" ); + lua_pushstring( L, ar.short_src ); + lua_setfield( L, -2, "short_src" ); + lua_pushinteger( L, ar.currentline ); + lua_setfield( L, -2, "currentline" ); + + if ( lua_pcall( L, 1, 0, tracebackidx ) != 0 ) { + TraceLog( LOG_ERROR, "Lua error: %s", lua_tostring( L, -1 ) ); + state->run = false; + } + lua_pop( L, 2 ); + } + else { + lua_pop( L, 3 ); + } +} + +void luaCallUnload( const char* type, void* object ) { + lua_State* L = state->luaState; + lua_pushcfunction( L, luaTraceback ); + int tracebackidx = lua_gettop(L); + + lua_getglobal( L, "RL" ); + lua_getfield( L, -1, "unload" ); + + if ( lua_isfunction( L, -1 ) ) { + lua_createtable( L, 2, 0 ); + lua_pushstring( L, type ); + lua_setfield( L, -2, "type" ); + lua_pushlightuserdata( L, object ); + lua_setfield( L, -2, "object" ); + + if ( lua_pcall( L, 1, 0, tracebackidx ) != 0 ) { + TraceLog( LOG_ERROR, "Lua error: %s", lua_tostring( L, -1 ) ); + state->run = false; + } + lua_pop( L, 2 ); + } + else { + lua_pop( L, 3 ); + } +} + void luaRegister() { lua_State* L = state->luaState; lua_getglobal( L, "RL" ); @@ -3539,7 +3630,13 @@ Sound* uluaGetSound( lua_State* L, int index ) { } /* Don't brake here, we want to get error from default if not found. */ default: - return luaL_checkudata( L, index, "Sound" ); + /* Also allow SoundAlias. */ + if ( luaL_testudata( L, index, "SoundAlias" ) ) { + return (Sound*)lua_touserdata( L, index ); + } + else { + luaL_checkudata( L, index, "Sound" ); + } } } @@ -3950,24 +4047,28 @@ void uluaPushBuffer( lua_State* L, Buffer buffer ) { } Buffer* bufferP = lua_newuserdata( L, sizeof( Buffer ) ); *bufferP = buffer; + luaCallLoad( "Buffer", bufferP ); luaL_setmetatable( L, "Buffer" ); } void uluaPushImage( lua_State* L, Image image ) { Image* imageP = lua_newuserdata( L, sizeof( Image ) ); *imageP = image; + luaCallLoad( "Image", imageP ); luaL_setmetatable( L, "Image" ); } void uluaPushTexture( lua_State* L, Texture texture ) { Texture* textureP = lua_newuserdata( L, sizeof( Texture ) ); *textureP = texture; + luaCallLoad( "Texture", textureP ); luaL_setmetatable( L, "Texture" ); } void uluaPushRenderTexture( lua_State* L, RenderTexture renderTexture ) { RenderTexture* renderTextureP = lua_newuserdata( L, sizeof( RenderTexture ) ); *renderTextureP = renderTexture; + luaCallLoad( "RenderTexture", renderTextureP ); luaL_setmetatable( L, "RenderTexture" ); } @@ -3986,87 +4087,217 @@ void uluaPushCamera3D( lua_State* L, Camera3D camera ) { void uluaPushShader( lua_State* L, Shader shader ) { Shader* shaderP = lua_newuserdata( L, sizeof( Shader ) ); *shaderP = shader; + luaCallLoad( "Shader", shaderP ); luaL_setmetatable( L, "Shader" ); } void uluaPushFont( lua_State* L, Font font ) { Font* fontP = lua_newuserdata( L, sizeof( Font ) ); *fontP = font; + luaCallLoad( "Font", fontP ); luaL_setmetatable( L, "Font" ); } void uluaPushGlyphInfo( lua_State* L, GlyphInfo glyph ) { GlyphInfo* glyphP = lua_newuserdata( L, sizeof( GlyphInfo ) ); *glyphP = glyph; + luaCallLoad( "GlyphInfo", glyphP ); luaL_setmetatable( L, "GlyphInfo" ); } void uluaPushWave( lua_State* L, Wave wave ) { Wave* waveP = lua_newuserdata( L, sizeof( Wave ) ); *waveP = wave; + luaCallLoad( "Wave", waveP ); luaL_setmetatable( L, "Wave" ); } void uluaPushSound( lua_State* L, Sound sound ) { Sound* soundP = lua_newuserdata( L, sizeof( Sound ) ); *soundP = sound; + luaCallLoad( "Sound", soundP ); luaL_setmetatable( L, "Sound" ); } +void uluaPushSoundAlias( lua_State* L, Sound alias ) { + Sound* aliasP = lua_newuserdata( L, sizeof( Sound ) ); + *aliasP = alias; + luaCallLoad( "SoundAlias", aliasP ); + luaL_setmetatable( L, "SoundAlias" ); +} + void uluaPushMusic( lua_State* L, Music music ) { Music* musicP = lua_newuserdata( L, sizeof( Music ) ); *musicP = music; + luaCallLoad( "Music", musicP ); luaL_setmetatable( L, "Music" ); } void uluaPushLight( lua_State* L, Light light ) { Light* lightP = lua_newuserdata( L, sizeof( Light ) ); *lightP = light; + luaCallLoad( "Light", lightP ); luaL_setmetatable( L, "Light" ); } void uluaPushMaterial( lua_State* L, Material material ) { Material* materialP = lua_newuserdata( L, sizeof( Material ) ); *materialP = material; + luaCallLoad( "Material", materialP ); luaL_setmetatable( L, "Material" ); } void uluaPushMesh( lua_State* L, Mesh mesh ) { Mesh* meshP = lua_newuserdata( L, sizeof( Mesh ) ); *meshP = mesh; + luaCallLoad( "Mesh", meshP ); luaL_setmetatable( L, "Mesh" ); } void uluaPushModel( lua_State* L, Model model ) { Model* modelP = lua_newuserdata( L, sizeof( Model ) ); *modelP = model; + luaCallLoad( "Model", modelP ); luaL_setmetatable( L, "Model" ); } void uluaPushModelAnimation( lua_State* L, ModelAnimation modelAnimation ) { ModelAnimation* modelAnimationP = lua_newuserdata( L, sizeof( ModelAnimation ) ); *modelAnimationP = modelAnimation; + luaCallLoad( "ModelAnimation", modelAnimationP ); luaL_setmetatable( L, "ModelAnimation" ); } void uluaPushRLRenderBatch( lua_State* L, rlRenderBatch renderBatch ) { rlRenderBatch* renderBatchP = lua_newuserdata( L, sizeof( rlRenderBatch ) ); *renderBatchP = renderBatch; + luaCallLoad( "rlRenderBatch", renderBatchP ); luaL_setmetatable( L, "rlRenderBatch" ); } void uluaPushAutomationEvent( lua_State* L, AutomationEvent event ) { AutomationEvent* eventP = lua_newuserdata( L, sizeof( AutomationEvent ) ); *eventP = event; + luaCallLoad( "AutomationEvent", eventP ); luaL_setmetatable( L, "AutomationEvent" ); } void uluaPushAutomationEventList( lua_State* L, AutomationEventList eventList ) { AutomationEventList* eventListP = lua_newuserdata( L, sizeof( AutomationEventList ) ); *eventListP = eventList; + luaCallLoad( "AutomationEventList", eventListP ); luaL_setmetatable( L, "AutomationEventList" ); } +/* Unload objects. */ + +void uluaUnloadBuffer( Buffer* buffer ) { + luaCallUnload( "Buffer", buffer ); + unloadBuffer( buffer ); + memset( buffer, 0, sizeof( Buffer ) ); +} + +void uluaUnloadImage( Image* image ) { + luaCallUnload( "Image", image ); + UnloadImage( *image ); + memset( image, 0, sizeof( Image ) ); +} + +void uluaUnloadTexture( Texture* texture ) { + luaCallUnload( "Texture", texture ); + UnloadTexture( *texture ); + memset( texture, 0, sizeof( Texture ) ); +} + +void uluaUnloadRenderTexture( RenderTexture* renderTexture ) { + luaCallUnload( "RenderTexture", renderTexture ); + UnloadRenderTexture( *renderTexture ); + memset( renderTexture, 0, sizeof( RenderTexture ) ); +} + +void uluaUnloadShader( Shader* shader ) { + luaCallUnload( "Shader", shader ); + UnloadShader( *shader ); + memset( shader, 0, sizeof( Shader ) ); +} + +void uluaUnloadFont( Font* font ) { + luaCallUnload( "Font", font ); + UnloadFont( *font ); + memset( font, 0, sizeof( Font ) ); +} + +void uluaUnloadGlyphInfo( GlyphInfo* glyph ) { + luaCallUnload( "GlyphInfo", glyph ); + unloadGlyphInfo( glyph ); +} + +void uluaUnloadWave( Wave* wave ) { + luaCallUnload( "Wave", wave ); + UnloadWave( *wave ); + memset( wave, 0, sizeof( Wave ) ); +} + +void uluaUnloadSound( Sound* sound ) { + luaCallUnload( "Sound", sound ); + UnloadSound( *sound ); + memset( sound, 0, sizeof( Sound ) ); +} + +void uluaUnloadSoundAlias( Sound* alias ) { + luaCallUnload( "SoundAlias", alias ); + UnloadSoundAlias( *alias ); + memset( alias, 0, sizeof( Sound ) ); +} + +void uluaUnloadMusic( Music* music ) { + luaCallUnload( "Music", music ); + UnloadMusicStream( *music ); + memset( music, 0, sizeof( Music ) ); +} + +void uluaUnloadMaterial( Material* material, bool freeAll ) { + luaCallUnload( "Material", material ); + if ( freeAll ) { + UnloadMaterial( *material ); + } + /* Custom UnloadMaterial if we don't want to free Shaders or Textures. */ + else { + unloadMaterial( material ); + } + memset( material, 0, sizeof( Material ) ); +} + +void uluaUnloadMesh( Mesh* mesh ) { + luaCallUnload( "Mesh", mesh ); + UnloadMesh( *mesh ); + memset( mesh, 0, sizeof( Mesh ) ); +} + +void uluaUnloadModel( Model* model ) { + luaCallUnload( "Model", model ); + UnloadModel( *model ); + memset( model, 0, sizeof( Model ) ); +} + +void uluaUnloadModelAnimation( ModelAnimation* modelAnimation ) { + luaCallUnload( "ModelAnimation", modelAnimation ); + UnloadModelAnimation( *modelAnimation ); + memset( modelAnimation, 0, sizeof( ModelAnimation ) ); +} + +void uluaUnloadRLRenderBatch( rlRenderBatch* renderBatch ) { + luaCallUnload( "rlRenderBatch", renderBatch ); + rlUnloadRenderBatch( *renderBatch ); + memset( renderBatch, 0, sizeof( rlRenderBatch ) ); +} + +void uluaUnloadAutomationEventList( AutomationEventList* eventList ) { + luaCallUnload( "AutomationEventList", eventList ); + UnloadAutomationEventList( *eventList ); + memset( eventList, 0, sizeof( AutomationEventList ) ); +} + /* Utils. */ int uluaGetTableLen( lua_State* L, int index ) { diff --git a/src/models.c b/src/models.c index cd58e4e..cee92bc 100644 --- a/src/models.c +++ b/src/models.c @@ -512,8 +512,7 @@ Unload model (meshes/materials) from memory (RAM and/or VRAM) int lmodelsUnloadModel( lua_State* L ) { Model* model = uluaGetModel( L, 1 ); - UnloadModel( *model ); - memset( model, 0, sizeof( Model ) ); + uluaUnloadModel( model ); return 0; } @@ -1125,8 +1124,7 @@ Unload mesh data from CPU and GPU int lmodelsUnloadMesh( lua_State* L ) { Mesh* mesh = uluaGetMesh( L, 1 ); - UnloadMesh( *mesh ); - memset( mesh, 0, sizeof( Mesh ) ); + uluaUnloadMesh( mesh ); return 0; } @@ -1910,14 +1908,7 @@ int lmodelsUnloadMaterial( lua_State* L ) { Material* material = uluaGetMaterial( L, 1 ); bool freeAll = lua_toboolean( L, 2 ); - if ( freeAll ) { - UnloadMaterial( *material ); - } - /* Custom UnloadMaterial if we don't want to free Shaders or Textures. */ - else { - unloadMaterial( material ); - } - memset( material, 0, sizeof( Material ) ); + uluaUnloadMaterial( material, freeAll ); return 0; } @@ -2164,8 +2155,7 @@ Unload animation data int lmodelsUnloadModelAnimation( lua_State* L ) { ModelAnimation* animation = uluaGetModelAnimation( L, 1 ); - UnloadModelAnimation( *animation ); - memset( animation, 0, sizeof( ModelAnimation ) ); + uluaUnloadModelAnimation( animation ); return 0; } @@ -2182,8 +2172,7 @@ int lmodelsUnloadModelAnimations( lua_State* L ) { while ( lua_next( L, t ) != 0 ) { if ( lua_isuserdata( L, -1 ) ) { ModelAnimation* animation = uluaGetModelAnimation( L, lua_gettop( L ) ); - UnloadModelAnimation( *animation ); - memset( animation, 0, sizeof( ModelAnimation ) ); + uluaUnloadModelAnimation( animation ); } i++; lua_pop( L, 1 ); @@ -1128,7 +1128,7 @@ Unload render batch system int lrlglUnloadRenderBatch( lua_State* L ) { rlRenderBatch* renderBatch = uluaGetRLRenderBatch( L, 1 ); - rlUnloadRenderBatch( *renderBatch ); + uluaUnloadRLRenderBatch( renderBatch ); return 0; } @@ -438,8 +438,7 @@ Unload font from GPU memory (VRAM) int ltextUnloadFont( lua_State* L ) { Font* font = uluaGetFont( L, 1 ); - UnloadFont( *font ); - memset( font, 0, sizeof( Font ) ); + uluaUnloadFont( font ); return 0; } @@ -905,7 +904,7 @@ Unload glyphInfo image from CPU memory (RAM) int ltextUnloadGlyphInfo( lua_State* L ) { GlyphInfo* glyph = uluaGetGlyphInfo( L, 1 ); - unloadGlyphInfo( glyph ); + uluaUnloadGlyphInfo( glyph ); return 0; } diff --git a/src/textures.c b/src/textures.c index b6ddcb7..a04e025 100644 --- a/src/textures.c +++ b/src/textures.c @@ -190,8 +190,7 @@ Unload image from CPU memory (RAM) int ltextureUnloadImage( lua_State* L ) { Image* image = uluaGetImage( L, 1 ); - UnloadImage( *image ); - memset( image, 0, sizeof( Image ) ); + uluaUnloadImage( image ); return 0; } @@ -1462,8 +1461,7 @@ Unload texture from GPU memory (VRAM) int ltextureUnloadTexture( lua_State* L ) { Texture* texture = uluaGetTexture( L, 1 ); - UnloadTexture( *texture ); - memset( texture, 0, sizeof( Texture ) ); + uluaUnloadTexture( texture ); return 0; } @@ -1491,8 +1489,7 @@ Unload render texture from GPU memory (VRAM) int ltextureUnloadRenderTexture( lua_State* L ) { RenderTexture* target = uluaGetRenderTexture( L, 1 ); - UnloadRenderTexture( *target ); - memset( target, 0, sizeof( RenderTexture ) ); + uluaUnloadRenderTexture( target ); return 0; } |