diff --git a/sonic-boost.love/core/modules/assets/fonts.lua b/sonic-boost.love/core/modules/assets/fonts.lua index c4d0879..f5734f7 100644 --- a/sonic-boost.love/core/modules/assets/fonts.lua +++ b/sonic-boost.love/core/modules/assets/fonts.lua @@ -107,9 +107,9 @@ function Font:print(text, x, y, align, r, sx, sy, ox, oy, kx, ky) self:set() if (self.spacing.active) then - utils.draw.printWithSpacing(text, self.spacing.size, align, x, y, r, sx, sy, ox, oy, kx, ky) + utils.graphics.printWithSpacing(text, self.spacing.size, align, x, y, r, sx, sy, ox, oy, kx, ky) else - utils.draw.print(text, align, x, y, r, sx, sy, ox, oy, kx, ky) + utils.graphics.print(text, align, x, y, r, sx, sy, ox, oy, kx, ky) end end @@ -138,7 +138,7 @@ end function Font:applyFilterShadow(text, x, y, limit, align, r, sx, sy, ox, oy, kx, ky) love.graphics.setColor(0, 0, 0, 1) self:printf(text, x+1, y+1, limit, align, align, r, sx, sy, ox, oy, kx, ky) - utils.draw.resetColor() + utils.graphics.resetColor() end function Font:applyFilterBorder(text, x, y, limit, align, r, sx, sy, ox, oy, kx, ky) @@ -155,7 +155,7 @@ function Font:applyFilterBorder(text, x, y, limit, align, r, sx, sy, ox, oy, kx, self:printf(text, x , y+1, limit, align, r, sx, sy, ox, oy, kx, ky) self:printf(text, x+1, y+1, limit, align, r, sx, sy, ox, oy, kx, ky) - utils.draw.resetColor() + utils.graphics.resetColor() end function Font:applyFilterDoubleBorder(text, x, y, limit, align, r, sx, sy, ox, oy, kx, ky) @@ -172,7 +172,7 @@ function Font:applyFilterDoubleBorder(text, x, y, limit, align, r, sx, sy, ox, o self:printf(text, x , y+2, limit, align, r, sx, sy, ox, oy, kx, ky) self:printf(text, x+2, y+2, limit, align, r, sx, sy, ox, oy, kx, ky) - utils.draw.resetColor() + utils.graphics.resetColor() end return Font diff --git a/sonic-boost.love/scenes/subgame/sonic-boost/actors/parent.lua b/sonic-boost.love/scenes/subgame/sonic-boost/actors/parent.lua index 8d90b1e..4a8e411 100644 --- a/sonic-boost.love/scenes/subgame/sonic-boost/actors/parent.lua +++ b/sonic-boost.love/scenes/subgame/sonic-boost/actors/parent.lua @@ -154,7 +154,7 @@ function ParentEntity:drawEcho() end function ParentEntity:drawSprite(tx, ty) - utils.draw.resetColor() + utils.graphics.resetColor() local x, y, z = self:getSpritePosition() @@ -185,16 +185,16 @@ function ParentEntity:drawHitBox() local r, g, b, a = self.debugColor.r, self.debugColor.g, self.debugColor.b, self.debugColor.a - --utils.draw.box(self.x, self.y + self.z + self.h, self.w, self.d, self.h, r, g, b, a) - --utils.draw.box(x - (self.w/2), y - (self.w/2) - self.z, self.w, self.h, r, g, b, a) - --utils.draw.box(x - (self.w/2), y - (self.w/2) - self.z, self.w, self.d, r, g, b, a) - --utils.draw.box(x - (self.w/2), y + (self.w/2) - self.z - self.d, self.w, self.d, r, g, b, a) - --utils.draw.box(x - (self.w/2), y - (self.w/2) - self.z - self.d, self.w, self.h, r, g, b, a) - --utils.draw.box(x - (self.w/2), y + (self.w/2) - self.z - self.d, self.w, self.d, r, g, b, a) + --utils.graphics.box(self.x, self.y + self.z + self.h, self.w, self.d, self.h, r, g, b, a) + --utils.graphics.box(x - (self.w/2), y - (self.w/2) - self.z, self.w, self.h, r, g, b, a) + --utils.graphics.box(x - (self.w/2), y - (self.w/2) - self.z, self.w, self.d, r, g, b, a) + --utils.graphics.box(x - (self.w/2), y + (self.w/2) - self.z - self.d, self.w, self.d, r, g, b, a) + --utils.graphics.box(x - (self.w/2), y - (self.w/2) - self.z - self.d, self.w, self.h, r, g, b, a) + --utils.graphics.box(x - (self.w/2), y + (self.w/2) - self.z - self.d, self.w, self.d, r, g, b, a) - utils.draw.box(x - (self.w/2), y - (self.h/2), self.w, self.h, r/5, g/5, b/5, 1) + utils.graphics.box(x - (self.w/2), y - (self.h/2), self.w, self.h, r/5, g/5, b/5, 1) - utils.draw.box(x - (self.w/2), y - z - self.d, self.w, self.d, r, g, b, 1) + utils.graphics.box(x - (self.w/2), y - z - self.d, self.w, self.d, r, g, b, 1) end diff --git a/sonic-boost.love/scenes/subgame/sonic-boost/actors/rail.lua b/sonic-boost.love/scenes/subgame/sonic-boost/actors/rail.lua index 2fbf243..c7634eb 100644 --- a/sonic-boost.love/scenes/subgame/sonic-boost/actors/rail.lua +++ b/sonic-boost.love/scenes/subgame/sonic-boost/actors/rail.lua @@ -15,12 +15,12 @@ function Rail:new(world, x, y, z, id) end function Rail:draw() - utils.draw.resetColor( ) + utils.graphics.resetColor( ) love.graphics.draw(self.world.textures.rail, self.world.quads.rails[self.railid], self.x + math.floor(self.y / 2), self.y - self.z -(self.d / 2)) end function Rail:drawEcho() - utils.draw.resetColor( ) + utils.graphics.resetColor( ) love.graphics.draw(self.world.textures.rail, self.world.quads.rails[self.railid], self.x + math.floor(self.y / 2) + self.world.width, self.y - self.z -(self.d / 2)) end diff --git a/sonic-boost.love/scenes/subgame/sonic-boost/controller/init.lua b/sonic-boost.love/scenes/subgame/sonic-boost/controller/init.lua index 8a15e2a..db539da 100644 --- a/sonic-boost.love/scenes/subgame/sonic-boost/controller/init.lua +++ b/sonic-boost.love/scenes/subgame/sonic-boost/controller/init.lua @@ -147,7 +147,7 @@ function Controller:draw() self.world:draw() self.camera.view:detach() - utils.draw.resetColor() + utils.graphics.resetColor() self.hud:draw() if self.pause == true then diff --git a/sonic-boost.love/scenes/subgame/sonic-boost/controller/world.lua b/sonic-boost.love/scenes/subgame/sonic-boost/controller/world.lua index 09485e1..287e570 100644 --- a/sonic-boost.love/scenes/subgame/sonic-boost/controller/world.lua +++ b/sonic-boost.love/scenes/subgame/sonic-boost/controller/world.lua @@ -166,7 +166,7 @@ function World:drawChunk(x, y, chunkid, turn) love.graphics.setColor(.75, .75, .75, 1) end self:drawTile(tilex, tiley, tileid, variant) - utils.draw.resetColor() + utils.graphics.resetColor() end end end