Reuh/ctruLua
1
0
Fork 0
mirror of https://github.com/ctruLua/ctruLua.git synced 2025-10-27 16:39:29 +00:00
Code Releases Activity

Fixed freeze when Lua tried to garbage collect a unloaded texture

Browse source
This commit is contained in:
Reuh 2015-08-22 17:52:50 +02:00
parent 2a5513473d
commit d662e5509d
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
sdcard/3ds/ctruLua/example.lua
View file

@ -8,29 +8,30 @@ local dMul = 1
local angle = 0 local angle = 0
local texture1 = gfx.texture.load("sdmc:/3ds/ctruLua/icon.png", gfx.texture.PLACE_VRAM, gfx.texture.TYPE_PNG); local texture1 = gfx.texture.load("sdmc:/3ds/ctruLua/icon.png", gfx.texture.PLACE_RAM, gfx.texture.TYPE_PNG);
if not texture1 then error("Giants ducks came from another planet") end if not texture1 then error("Giants ducks came from another planet") end
gfx.color.setBackground(gfx.color.RGBA8(200, 200, 200)) gfx.color.setBackground(gfx.color.RGBA8(200, 200, 200))
gfx.set3D(true) gfx.set3D(true)
local function drawStuffIn3D(depth) -- eye : -1 = left, 1 = right
local function drawStuffIn3D(eye)
gfx.text(2, 5, "Depth multiplicator: "..dMul) gfx.text(2, 5, "Depth multiplicator: "..dMul)
-- 3D stuff -- 3D stuff
local depth = math.floor(depth * dMul) local function d(depth) return math.ceil(eye * depth * dMul) end
gfx.color.setDefault(0x00FFFFFF) gfx.color.setDefault(0x00FFFFFF)
gfx.rectangle(240 + depth*5, 150, 120, 10) gfx.rectangle(240 + d(10), 150, 120, 10)
gfx.point(10 + depth*3, 20, 0xFF0000FF) gfx.point(10 + d(6), 20, 0xFF0000FF)
gfx.color.setDefault(0xFF0000FF) gfx.color.setDefault(0xFF0000FF)
gfx.rectangle(x + depth*math.ceil(5*math.sin(ctr.time()/500)), y, 20, 20, angle) gfx.rectangle(x + d(10*math.sin(ctr.time()/500)), y, 20, 20, angle)
gfx.line(50 - depth*3, 50, 75 + depth*2, 96, gfx.color.RGBA8(52, 10, 65)) gfx.line(50 + d(-6), 50, 75 + d(4), 96, gfx.color.RGBA8(52, 10, 65))
gfx.circle(125 - depth*4, 125, 16) gfx.circle(125 + d(-8), 125, 16)
end end
while ctr.run() do while ctr.run() do

1
sdcard/3ds/ctruLua/main.lua
View file

@ -37,6 +37,7 @@ while ctr.run() do
if f.name:match("%..+$") == ".lua" then if f.name:match("%..+$") == ".lua" then
dofile(curdir..f.name) dofile(curdir..f.name)
-- reset things the script could have changed -- reset things the script could have changed
gfx.set3D(false)
gfx.color.setDefault(0xFFFFFFFF) gfx.color.setDefault(0xFFFFFFFF)
gfx.color.setBackground(0x000000FF) gfx.color.setBackground(0x000000FF)
end end

5
source/texture.c
View file

@ -109,9 +109,10 @@ static int texture_drawPartBlend(lua_State *L) {
static int texture_unload(lua_State *L) { static int texture_unload(lua_State *L) {
texture_userdata *texture = luaL_checkudata(L, 1, "LTexture"); texture_userdata *texture = luaL_checkudata(L, 1, "LTexture");
if (texture->texture != NULL) sf2d_free_texture(texture->texture); if (texture->texture == NULL) return 0;
sf2d_free_texture(texture->texture);
texture->texture = NULL; texture->texture = NULL;
free(texture);
return 0; return 0;
} }