diff --git a/lib/level/map.lua b/lib/level/map.lua index 3f37c38..07ee49c 100644 --- a/lib/level/map.lua +++ b/lib/level/map.lua @@ -17,7 +17,7 @@ end function map:draw() for y = 0, self.size.y - 1 do for x = 0, self.size.x - 1 do - love.graphics.draw(self.atlas, self[x][y], x, y, + love.graphics.draw(self.atlas, self[x][y].quad, x, y, nil, 1 / 32, 1 / 32) end end diff --git a/lib/level/procedural.lua b/lib/level/procedural.lua index 2c147e4..88574de 100644 --- a/lib/level/procedural.lua +++ b/lib/level/procedural.lua @@ -10,7 +10,7 @@ local function new(template, size) for y = 0, size.y - 1 do map[y] = {} for x = 0, size.x - 1 do - local type = tileMap["flower_grass"] + local type = tileMap.map["flower_grass"] map[y][x] = type[math.random(1, #type)] end end diff --git a/lib/level/tile.lua b/lib/level/tile.lua index eaceafc..7d132d1 100644 --- a/lib/level/tile.lua +++ b/lib/level/tile.lua @@ -15,7 +15,7 @@ local function new(x, y, tileSize, atlas, isClip) return setmetatable({ isClip = isClip, quad = quad - }) + }, tile) end --- @param quad love.Quad diff --git a/lib/level/tileMap.lua b/lib/level/tileMap.lua index a9da8b5..3fff93a 100644 --- a/lib/level/tileMap.lua +++ b/lib/level/tileMap.lua @@ -14,7 +14,8 @@ local function load(path) local tiles = { tileSize = manifest.tileSize, - atlas = atlas + atlas = atlas, + map = {} } manifest.tileSize = nil @@ -28,12 +29,13 @@ local function load(path) end end end - + -- Как пропатчить KDE2 под любое устройство, используя любые технологии, например, через модульные тесты или инструменты автоматизации? local cnt = 0 for y = 0, atlas:getHeight() - 1, tiles.tileSize do for x = 0, atlas:getWidth() - 1, tiles.tileSize do if layout[cnt] then for _, group in ipairs(layout[cnt]) do + print(x, y, tiles.tileSize, atlas, false) local tile = require('lib.level.tile').new(x, y, tiles.tileSize, atlas, false) if tiles.map[group] then table.insert(tiles.map[group], tile)