From c586fb733d66ff643d88adabd4317b6f49539b46 Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Sat, 21 Aug 2021 17:05:49 +0200 Subject: [PATCH] fix: replace drawAnimation by draw --- sonic-radiance.love/birb/modules/assets/types/sprites.lua | 6 +++--- .../birb/modules/world/actors/utils/sprites.lua | 2 +- sonic-radiance.love/game/modules/gui/emblem.lua | 2 +- sonic-radiance.love/scenes/battlesystem/actors/parent.lua | 4 ++-- .../scenes/menus/debugmenus/animation/init.lua | 2 +- sonic-radiance.love/scenes/overworld/actors/encounter.lua | 2 +- .../scenes/overworld/actors/player/actions.lua | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sonic-radiance.love/birb/modules/assets/types/sprites.lua b/sonic-radiance.love/birb/modules/assets/types/sprites.lua index b7cf49d..7f21a22 100644 --- a/sonic-radiance.love/birb/modules/assets/types/sprites.lua +++ b/sonic-radiance.love/birb/modules/assets/types/sprites.lua @@ -97,11 +97,11 @@ end -- DRAW FUNCTIONS -- Draw sprites using these functions -function Sprite:drawAnimation(x, y, r, sx, sy, ox, oy, kx, ky) +function Sprite:draw(x, y, r, sx, sy, ox, oy, kx, ky) self.animator:draw(x, y, r, sx, sy, ox, oy, kx, ky) end -function Sprite:drawAnimationMask(x, y, r, sx, sy, ox, oy, kx, ky) +function Sprite:drawMask(x, y, r, sx, sy, ox, oy, kx, ky) self.animator:drawMask(x, y, r, sx, sy, ox, oy, kx, ky) end @@ -122,7 +122,7 @@ function Sprite:drawPart(x, y, w, h, r, sx, sy, ox, oy, kx, ky) end love.graphics.setScissor(x - ox, y - oy, w, h) - self:drawAnimation(x, y, r, sx, sy, ox, oy, kx, ky) + self:draw(x, y, r, sx, sy, ox, oy, kx, ky) love.graphics.setScissor( ) end diff --git a/sonic-radiance.love/birb/modules/world/actors/utils/sprites.lua b/sonic-radiance.love/birb/modules/world/actors/utils/sprites.lua index 293f378..2a1012d 100644 --- a/sonic-radiance.love/birb/modules/world/actors/utils/sprites.lua +++ b/sonic-radiance.love/birb/modules/world/actors/utils/sprites.lua @@ -112,7 +112,7 @@ function Sprite:draw(x, y, r, sx, sy, ox, oy, kx, ky) if (self.spriteClone ~= nil) then self.spriteClone:draw(x, y, r, sx, sy, ox, oy, kx, ky) else - self.assets.sprites[self.name]:drawAnimation(x, y, r, sx, sy, ox, oy, kx, ky) + self.assets.sprites[self.name]:draw(x, y, r, sx, sy, ox, oy, kx, ky) end end end diff --git a/sonic-radiance.love/game/modules/gui/emblem.lua b/sonic-radiance.love/game/modules/gui/emblem.lua index 6d15a80..2721a9a 100644 --- a/sonic-radiance.love/game/modules/gui/emblem.lua +++ b/sonic-radiance.love/game/modules/gui/emblem.lua @@ -18,7 +18,7 @@ function Emblem:drawForeground(x, y) local emblem2 = "m_" .. self.abstract.data.class core.screen:setScissor(x, y-16, 32, 40) if (self.abstract.hp > 0) then - self.assets.sprites[self.charid]:drawAnimation(x+14, y+14) + self.assets.sprites[self.charid]:draw(x+14, y+14) else greyscale.startShader() self.assets.sprites[self.charid]:drawFrame(1, x+14, y+14) diff --git a/sonic-radiance.love/scenes/battlesystem/actors/parent.lua b/sonic-radiance.love/scenes/battlesystem/actors/parent.lua index e74441f..d1d5d63 100644 --- a/sonic-radiance.love/scenes/battlesystem/actors/parent.lua +++ b/sonic-radiance.love/scenes/battlesystem/actors/parent.lua @@ -200,7 +200,7 @@ function Parent:drawSprite(tx, ty) if (self.sprite.clone ~= nil) then self.sprite.clone:draw(x + tx, y + ty, 0, sx, sy, self.sprite.ox, self.sprite.oy) else - self.assets.sprites[self.sprite.name]:drawAnimation(x + tx, y + ty, 0, sx, sy, self.sprite.ox, self.sprite.oy) + self.assets.sprites[self.sprite.name]:draw(x + tx, y + ty, 0, sx, sy, self.sprite.ox, self.sprite.oy) end end end @@ -285,7 +285,7 @@ function Parent:drawShadow() local x, y = self.world.map:gridToPixel(self.x, self.y, true) self.assets.images["actorsShadow"]:draw(x, y, 0, self.sprite.sx, self.sprite.sy, 12, 5) if (self.isSelected == true) then - self.assets.sprites["cursorground"]:drawAnimation(x - 2, y - 1, 0, 1, 1, 12, 5) + self.assets.sprites["cursorground"]:draw(x - 2, y - 1, 0, 1, 1, 12, 5) end end diff --git a/sonic-radiance.love/scenes/menus/debugmenus/animation/init.lua b/sonic-radiance.love/scenes/menus/debugmenus/animation/init.lua index 853aabb..023f999 100644 --- a/sonic-radiance.love/scenes/menus/debugmenus/animation/init.lua +++ b/sonic-radiance.love/scenes/menus/debugmenus/animation/init.lua @@ -54,7 +54,7 @@ end function CharAnimViewer:draw() self.background:draw() if (self.sprite ~= nil) then - self.sprite:drawAnimation(424/2, 240/1.5) + self.sprite:draw(424/2, 240/1.5) end end diff --git a/sonic-radiance.love/scenes/overworld/actors/encounter.lua b/sonic-radiance.love/scenes/overworld/actors/encounter.lua index 9cccda1..53aa5c3 100644 --- a/sonic-radiance.love/scenes/overworld/actors/encounter.lua +++ b/sonic-radiance.love/scenes/overworld/actors/encounter.lua @@ -30,7 +30,7 @@ function Encounter:drawCharset(charset, charId) self.assets.images["shadow"]:draw(x, y + 11) utils.graphics.resetColor() - self.assets.sprites["encounter"]:drawAnimation(x - 1, y + 10) + self.assets.sprites["encounter"]:draw(x - 1, y + 10) end return Encounter \ No newline at end of file diff --git a/sonic-radiance.love/scenes/overworld/actors/player/actions.lua b/sonic-radiance.love/scenes/overworld/actors/player/actions.lua index 4d82e2c..3aa3dfe 100644 --- a/sonic-radiance.love/scenes/overworld/actors/player/actions.lua +++ b/sonic-radiance.love/scenes/overworld/actors/player/actions.lua @@ -219,7 +219,7 @@ function PlayerActions:drawActionEffect() dy = -8 end local x, y = self.x + 8 - dx, self.y + 8 - self.z + dy - self.assets.sprites["dash"]:drawAnimation(x, y, math.rad(self.charsetManager.angle[self.charDir])) + self.assets.sprites["dash"]:draw(x, y, math.rad(self.charsetManager.angle[self.charDir])) end if (self.currentAction == "punch") then local dx, dy = utils.math.lengthdir(20, math.rad(self.charsetManager.angle[self.charDir])) @@ -227,7 +227,7 @@ function PlayerActions:drawActionEffect() dy = 8 end local x, y = self.x + 8 - dx, self.y + 8 - self.z + dy - self.assets.sprites["punch"]:drawAnimation(x, y, math.rad(self.charsetManager.angle[self.charDir])) + self.assets.sprites["punch"]:draw(x, y, math.rad(self.charsetManager.angle[self.charDir])) end end