diff --git a/main.lua b/main.lua index 9e5b46e..061b560 100644 --- a/main.lua +++ b/main.lua @@ -23,6 +23,10 @@ local pressed = {false,false,false} -- break -- end +local gf = myTypes.Sprite("sprites/GF_assets.png", "sprites/GF_assets.json") +gf.position = myTypes.Vector2(30, 30) +gf:PlayAnimation("GF Dancing Beat", 24, true) + function love.update(dt) if curState and curState.loaded then if stateLoaded then @@ -33,6 +37,7 @@ function love.update(dt) end elseif not curState then if love.keyboard.isDown("return") then + gf:Destroy() curState = state(curSong, curDiff) curState.load() elseif love.keyboard.isDown("down") and not pressed[1] then @@ -70,6 +75,7 @@ function love.update(dt) elseif not love.keyboard.isDown("left") then pressed[3] = false end + myTypes.updateSprites(dt) end end @@ -77,6 +83,7 @@ function love.draw() if curState and stateLoaded then curState.draw() else - love.graphics.print(string.format("Song: %s, Difficulty: %s, List: %s", curSong, curDiff, logging.dump(curDiffList)), x, y, r, sx, sy, ox, oy, kx, ky) + myTypes.drawSprites() + love.graphics.print(string.format("Song: %s, Difficulty: %s, List: %s", curSong, curDiff, logging.dump(curDiffList)), love.graphics.newFont(15, "light"), love.graphics:getWidth()/2, love.graphics:getHeight()/2 + 150, 0, 1, 1, 200) end end