diff --git a/sonic-bluestreak.love/assets/backgrounds/dumbtestmap.png b/sonic-bluestreak.love/assets/backgrounds/dumbtestmap.png new file mode 100644 index 0000000..ab402b5 Binary files /dev/null and b/sonic-bluestreak.love/assets/backgrounds/dumbtestmap.png differ diff --git a/sonic-bluestreak.love/game/modules/world/maps/test.lua b/sonic-bluestreak.love/game/modules/world/maps/test.lua index 5deb5a3..75295e2 100644 --- a/sonic-bluestreak.love/game/modules/world/maps/test.lua +++ b/sonic-bluestreak.love/game/modules/world/maps/test.lua @@ -3,21 +3,18 @@ local TestMap = BaseMap:extend() function TestMap:new(world) TestMap.super.new(self, world) - self:setPadding(0, 96, 0, 0) + --self:setPadding(0, 0, 0, 0) - self.background = love.graphics.newImage("assets/backgrounds/parallax/test-back.png") + self.background = love.graphics.newImage("assets/backgrounds/dumbtestmap.png") end function TestMap:loadCollisions() - self.world:newCollision("wall", 0, 0, -16, 8*64, 8*32, 16) - self.world:newCollision("wall", 64*1, 32*1, 0, 64*1, 32*3, 48) - self.world:newCollision("wall", 64*4, 32*1, 0, 64*3, 32*1, 48) - self.world:newCollision("wall", 64*6, 32*4, 0, 64*1, 32*3, 48) - self.world:newCollision("wall", 64*1, 32*6, 0, 64*3, 32*1, 48) + local w, h = self:getDimensions() + self.world:newCollision("floor", 0, 0, -16, w, h, 16) end function TestMap:getDimensions() - return 8*64, 8*32 + return self.background:getDimensions() end function TestMap:loadPlayers() @@ -30,19 +27,20 @@ end function TestMap:draw() -- Empty Placeholder function + love.graphics.draw(self.background, 0, 0) end function TestMap:drawParallax(x, y, w, h) - local imax, jmax = (w/32)+1, (h/32)+1 - local x, y = x or 0, y or 0 - local x = math.floor(x/4) % 32 - local y = math.floor((y+96)/6) % 32 - - for i=0, math.ceil(imax) do - for j=0, math.ceil(jmax) do - love.graphics.draw(self.background, (i-1)*32-x, (j-1)*32-y) - end - end + -- local imax, jmax = (w/32)+1, (h/32)+1 + -- local x, y = x or 0, y or 0 + -- local x = math.floor(x/4) % 32 + -- local y = math.floor((y+96)/6) % 32 + -- + -- for i=0, math.ceil(imax) do + -- for j=0, math.ceil(jmax) do + -- love.graphics.draw(self.background, (i-1)*32-x, (j-1)*32-y) + -- end + -- end end return TestMap