From 839b513d0fd4c8970ceb788553bce8f88cc75a12 Mon Sep 17 00:00:00 2001 From: Randy McShandy Date: Thu, 12 Feb 2026 23:26:56 -0600 Subject: [PATCH] Add a test side-scroll map that can change keymaps, some asset management fixes, and an extra tilesheet for layer work. --- main/assets.lua | 17 +- .../Tilesheet/monochrome_ba_packed.png | Bin 0 -> 22392 bytes main/control.lua | 15 +- main/main.lua | 2 - main/render.lua | 10 +- main/tiled/side_scroll.lua | 229 ++++++++++++++++++ main/tiled/side_scroll.tmx | 90 +++++++ main/tiled/test_1.lua | 6 +- main/tiled/test_1.tmx | 4 +- 9 files changed, 361 insertions(+), 12 deletions(-) create mode 100644 main/assets/tilesets/kenney_1_bit/Tilesheet/monochrome_ba_packed.png create mode 100644 main/tiled/side_scroll.lua create mode 100644 main/tiled/side_scroll.tmx diff --git a/main/assets.lua b/main/assets.lua index d8879ba..4351fdd 100644 --- a/main/assets.lua +++ b/main/assets.lua @@ -35,13 +35,19 @@ function assets.integrate_object_layers(pmap) new_layer.offsetx, new_layer.offsetx = layer.offsetx, layer.offsety new_layer.objects = layer.objects - -- Match objects in each layer to a pre-loaded asset-object + -- Match objects in each layer to a pre-loaded asset-object. + -- If an object (like the player) appears in multiple maps, + -- track unique instances of that object's positional info + -- for hot swapping on a map change. Otherwise, each initial load + -- of a map will override the first position an object is drawn in (and worse). for ok,ov in pairs(new_layer.objects) do local object = assets.get_object(ov.name) if object then object.image = love.graphics.newImage(object.path) - object.vec.x = ov.x - object.vec.y = ov.y + pmap[ov.name] = {} + -- Tiled does y values from the bottom of the sprite so pull up 1 + pmap[ov.name].vec = vector.new_xy(ov.x, ov.y - pmap.tileheight) + pmap[ov.name].name = ov.name end end @@ -139,9 +145,14 @@ assets.store_object('Player', { end }) +function assets.all_objects() + return AssetTables[AssetClass.Object] +end + -- STI only supports images for tilesheet sources in a tilemap, not a tsx file -- Mostly just embed the tileset in Tiled so it knows to reference the original -- tilesheet png directly. assets.store_map('test_map_1', 'tiled/test_1.lua') +assets.store_map('side_scroll', 'tiled/side_scroll.lua') return assets diff --git a/main/assets/tilesets/kenney_1_bit/Tilesheet/monochrome_ba_packed.png b/main/assets/tilesets/kenney_1_bit/Tilesheet/monochrome_ba_packed.png new file mode 100644 index 0000000000000000000000000000000000000000..0036d2bd192221443217e581022030bca2391767 GIT binary patch literal 22392 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 literal 0 HcmV?d00001 diff --git a/main/control.lua b/main/control.lua index daac70a..f4007f4 100644 --- a/main/control.lua +++ b/main/control.lua @@ -60,9 +60,22 @@ control.keymap['global']['x'] = { end, } +control.keymap['global']['c'] = { + control = control.ControlType.System, + system_action = function(key) + render.activate_map('side_scroll') + end, +} + +control.keymap['global']['v'] = { + control = control.ControlType.System, + system_action = function(key) + render.activate_map('test_map_1') + end, +} + function control.search_keymap(key, keymap) local key_found = false - --for k,v in pairs(control.keymap.active_keymap) do for k,v in pairs(keymap) do if key == k then key_found = true diff --git a/main/main.lua b/main/main.lua index cc3e4ef..b0ab403 100644 --- a/main/main.lua +++ b/main/main.lua @@ -15,8 +15,6 @@ local render = require('render') player = player_module.player function love.load() - print(love.graphics.getRendererInfo()) - love.graphics.setFont(assets.get_font('Cuneiform36')) love.audio.play(assets.get_source('intro')) diff --git a/main/render.lua b/main/render.lua index a176880..e457878 100644 --- a/main/render.lua +++ b/main/render.lua @@ -40,7 +40,15 @@ render.activate_map = function(new_map_name) success = true render.map.active_map = new_map render.active_viewclass = render.ViewClassData[new_map.properties.viewclass] - utils.shallow_dump(render.map.active_map.properties) + + -- Find all objects in the map we're switching to, and update their positional + -- info with the unique copy stored in each map. + for key,object in pairs(assets.all_objects()) do + local object_in_map = render.map.active_map[key] + if object_in_map then + object.vec = object_in_map.vec + end + end love.event.push('map_changed', new_map_name) end diff --git a/main/tiled/side_scroll.lua b/main/tiled/side_scroll.lua new file mode 100644 index 0000000..1b2c4c4 --- /dev/null +++ b/main/tiled/side_scroll.lua @@ -0,0 +1,229 @@ +return { + version = "1.10", + luaversion = "5.1", + tiledversion = "1.11.2", + class = "", + orientation = "orthogonal", + renderorder = "right-up", + width = 30, + height = 20, + tilewidth = 16, + tileheight = 16, + nextlayerid = 5, + nextobjectid = 2, + properties = { + ["viewclass"] = "sidescroll" + }, + tilesets = { + { + name = "monochrome_bw_packed", + firstgid = 1, + class = "", + tilewidth = 16, + tileheight = 16, + spacing = 0, + margin = 0, + columns = 49, + image = "../assets/tilesets/kenney_1_bit/Tilesheet/monochrome_bw_packed.png", + imagewidth = 784, + imageheight = 352, + objectalignment = "unspecified", + tilerendersize = "tile", + fillmode = "stretch", + tileoffset = { + x = 0, + y = 0 + }, + grid = { + orientation = "orthogonal", + width = 16, + height = 16 + }, + properties = {}, + wangsets = {}, + tilecount = 1078, + tiles = {} + }, + { + name = "monochrome_ba_packed", + firstgid = 1079, + class = "", + tilewidth = 16, + tileheight = 16, + spacing = 0, + margin = 0, + columns = 49, + image = "../assets/tilesets/kenney_1_bit/Tilesheet/monochrome_ba_packed.png", + imagewidth = 784, + imageheight = 352, + objectalignment = "unspecified", + tilerendersize = "tile", + fillmode = "stretch", + tileoffset = { + x = 0, + y = 0 + }, + grid = { + orientation = "orthogonal", + width = 16, + height = 16 + }, + properties = {}, + wangsets = {}, + tilecount = 1078, + tiles = {} + } + }, + layers = { + { + type = "tilelayer", + x = 0, + y = 0, + width = 30, + height = 20, + id = 1, + name = "Background", + class = "", + visible = true, + opacity = 1, + offsetx = 0, + offsety = 0, + parallaxx = 1, + parallaxy = 1, + properties = {}, + encoding = "lua", + data = { + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 106, 100, 106, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 106, 99, 99, 1, 1, 105, 106, 1, 106, 99, 99, 100, 100, 1, 1, 99, 106, 100, 99, 99, 100, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 99, 106, 106, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 99, 105, 106, 106, 99, 99, 99, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 + } + }, + { + type = "tilelayer", + x = 0, + y = 0, + width = 30, + height = 20, + id = 3, + name = "CityWalls_bg", + class = "", + visible = true, + opacity = 1, + offsetx = 0, + offsety = 0, + parallaxx = 1, + parallaxy = 1, + properties = {}, + encoding = "lua", + data = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 206, 1610612941, 2684354766, 0, 0, 0, 0, 0, 0, 0, 0, 0, 206, 1610612941, 2684354766, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 205, 1, 3221225677, 0, 0, 0, 0, 0, 0, 0, 0, 0, 205, 1, 3221225677, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 206, 1610612943, 1610612941, 1610612943, 2684354766, 0, 0, 0, 0, 0, 0, 0, 206, 1610612943, 1610612941, 1610612943, 2684354766, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 205, 1, 1, 1, 205, 0, 0, 0, 0, 0, 0, 0, 205, 0, 0, 0, 205, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + } + }, + { + type = "objectgroup", + draworder = "topdown", + id = 4, + name = "Object Layer 1", + class = "", + visible = true, + opacity = 1, + offsetx = 0, + offsety = 0, + parallaxx = 1, + parallaxy = 1, + properties = {}, + objects = { + { + id = 1, + name = "Player", + type = "", + shape = "rectangle", + x = 112, + y = 256, + width = 16, + height = 16, + rotation = 0, + gid = 515, + visible = true, + properties = {} + } + } + }, + { + type = "tilelayer", + x = 0, + y = 0, + width = 30, + height = 20, + id = 2, + name = "CityWalls_fg", + class = "", + visible = true, + opacity = 1, + offsetx = 0, + offsety = 0, + parallaxx = 1, + parallaxy = 1, + properties = {}, + encoding = "lua", + data = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 209, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 209, 0, 0, 0, 0, 0, 0, 0, 0, 0, 209, 0, 0, 0, + 0, 0, 0, 0, 205, 0, 209, 0, 0, 0, 0, 0, 0, 0, 209, 0, 205, 0, 209, 0, 0, 0, 0, 0, 0, 0, 3221225677, 0, 0, 0, + 0, 0, 0, 0, 207, 2684354765, 1610612943, 2684354765, 1610612943, 2684354765, 2684354765, 2684354765, 1610612943, 2684354765, 1610612943, 2684354765, 1610612943, 2684354765, 1610612943, 2684354765, 1610612943, 2684354765, 2684354765, 2684354765, 1610612943, 2684354765, 3221225679, 0, 0, 0, + 0, 0, 0, 0, 205, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3221225677, 0, 0, 0, + 0, 0, 0, 0, 205, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 256, 2684354815, 2684354816, 1, 1, 1, 1, 1, 1, 1, 1, 3221225677, 0, 0, 0, + 0, 0, 0, 0, 205, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 255, 254, 3221225727, 1, 1, 1, 1, 1, 1, 1, 1, 3221225677, 0, 0, 0 + } + } + } +} diff --git a/main/tiled/side_scroll.tmx b/main/tiled/side_scroll.tmx new file mode 100644 index 0000000..ae974c3 --- /dev/null +++ b/main/tiled/side_scroll.tmx @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,106,100,106,1,1,1,1,1,1,1,1,1,1,1,1, +1,1,106,99,99,1,1,105,106,1,106,99,99,100,100,1,1,99,106,100,99,99,100,1,1,1,1,1,1,1, +1,1,1,1,1,99,106,106,1,1,1,1,1,1,1,1,1,1,1,1,1,1,99,105,106,106,99,99,99,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, +1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,206,1610612941,2684354766,0,0,0,0,0,0,0,0,0,206,1610612941,2684354766,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,205,1,3221225677,0,0,0,0,0,0,0,0,0,205,1,3221225677,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,206,1610612943,1610612941,1610612943,2684354766,0,0,0,0,0,0,0,206,1610612943,1610612941,1610612943,2684354766,0,0,0,0,0, +0,0,0,0,0,0,0,0,205,1,1,1,205,0,0,0,0,0,0,0,205,0,0,0,205,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + + + + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,209,0,0,0,0,0,0,0,0,0,0,0,209,0,0,0,0,0,0,0,0,0,209,0,0,0, +0,0,0,0,205,0,209,0,0,0,0,0,0,0,209,0,205,0,209,0,0,0,0,0,0,0,3221225677,0,0,0, +0,0,0,0,207,2684354765,1610612943,2684354765,1610612943,2684354765,2684354765,2684354765,1610612943,2684354765,1610612943,2684354765,1610612943,2684354765,1610612943,2684354765,1610612943,2684354765,2684354765,2684354765,1610612943,2684354765,3221225679,0,0,0, +0,0,0,0,205,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3221225677,0,0,0, +0,0,0,0,205,1,1,1,1,1,1,1,1,1,1,256,2684354815,2684354816,1,1,1,1,1,1,1,1,3221225677,0,0,0, +0,0,0,0,205,1,1,1,1,1,1,1,1,1,1,255,254,3221225727,1,1,1,1,1,1,1,1,3221225677,0,0,0 + + + diff --git a/main/tiled/test_1.lua b/main/tiled/test_1.lua index b11069d..3e6823c 100644 --- a/main/tiled/test_1.lua +++ b/main/tiled/test_1.lua @@ -4,7 +4,7 @@ return { tiledversion = "1.11.2", class = "", orientation = "orthogonal", - renderorder = "right-down", + renderorder = "left-up", width = 30, height = 20, tilewidth = 16, @@ -236,8 +236,8 @@ return { name = "Player", type = "", shape = "rectangle", - x = 48, - y = 144, + x = 16, + y = 32, width = 16, height = 16, rotation = 0, diff --git a/main/tiled/test_1.tmx b/main/tiled/test_1.tmx index d719bf4..3c96aa4 100644 --- a/main/tiled/test_1.tmx +++ b/main/tiled/test_1.tmx @@ -1,5 +1,5 @@ - + @@ -133,6 +133,6 @@ - + -- 2.56.0