From 97d2fc1f3cef3c02fee36e416a8f2b5205940be2 Mon Sep 17 00:00:00 2001 From: iamcheeseman Date: Thu, 12 Mar 2026 17:00:24 -0400 Subject: show the tileset you're using --- src/objs/tilemap.lua | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/objs/tilemap.lua') diff --git a/src/objs/tilemap.lua b/src/objs/tilemap.lua index 8b1ab76..f1cdd15 100644 --- a/src/objs/tilemap.lua +++ b/src/objs/tilemap.lua @@ -107,7 +107,7 @@ function rebuild_tilemap(map) end end -local TILE_TEX = get_tex("res/img/tilesets.png") +TILE_TEX = get_tex("res/img/tilesets.png") local TILE_QUAD = lg.newQuad( 0, 0, TILESIZE, TILESIZE, @@ -150,3 +150,12 @@ function remove_tile(map, x, y) map.tiledata[ID(map, x, y)] = 0 map.needs_rebuild = true end + +function get_tileset_quad(tileset) + local start_y = (tileset - 1) * 4 * TILESIZE + return lg.newQuad( + 0, start_y, + 4 * TILESIZE, 4 * TILESIZE, + TILE_TEX:getDimensions() + ) +end -- cgit v1.3-2-g0d8e From 2b3245f44fecbf2e426bb28f522a24e00662c610 Mon Sep 17 00:00:00 2001 From: iamcheeseman Date: Thu, 12 Mar 2026 18:10:06 -0400 Subject: Make the room editor un-hacked in --- main.lua | 6 +++- res/img/tilesets.png | Bin 3075 -> 2968 bytes src/objs/player.lua | 38 ------------------------- src/objs/room_editor.lua | 71 +++++++++++++++++++++++++++++++++++++++++++++++ src/objs/tilemap.lua | 4 +++ 5 files changed, 80 insertions(+), 39 deletions(-) create mode 100644 src/objs/room_editor.lua (limited to 'src/objs/tilemap.lua') diff --git a/main.lua b/main.lua index ed1a48a..2453b53 100644 --- a/main.lua +++ b/main.lua @@ -12,7 +12,8 @@ function love.load() event_bind(scn.on_draw, "Sprite", sprite_draw_sys) event_bind(scn.on_draw, "Tilemap", tilemap_draw_sys) - event_bind(scn.on_ui, "Player", player_ui_sys) + event_bind(scn.on_update, "Room_Editor", room_editor_ui_sys) + event_bind(scn.on_ui, "Room_Editor", tile_place_sys) set_scene(scn) @@ -25,6 +26,9 @@ function love.load() scn.tilemap = tilemap set_tile(tilemap, 0, 0, 1) + + local room_editor = new_entity() + add_comp(room_editor, "Room_Editor") end function love.update(dt) diff --git a/res/img/tilesets.png b/res/img/tilesets.png index d6f4521..ddd69ba 100644 Binary files a/res/img/tilesets.png and b/res/img/tilesets.png differ diff --git a/src/objs/player.lua b/src/objs/player.lua index 4b75cb3..1e41523 100644 --- a/src/objs/player.lua +++ b/src/objs/player.lua @@ -14,49 +14,11 @@ function body_sys(ent, dt) ent.y = ent.box.y end -local tile = 1 - function player_movement_sys(player, dt) local inpx, inpy = input_direction("Left", "Right", "Up", "Down") inpx, inpy = normalize(inpx, inpy) player.vx = dlerp(player.vx, inpx * PLAYER_SPEED, 25 * dt) player.vy = dlerp(player.vy, inpy * PLAYER_SPEED, 25 * dt) - - -- Testicle stuff, remove when testising is no longer needed - if not im.has_focus() then - if is_input_pressed("Right_Click") then - local scn = get_current_scene() - assert(scn, "no scene set.") - - local mx, my = get_mouse_pos() - local tx, ty = to_tile_coords(mx, my) - set_tile(scn.tilemap, tx, ty, tile) - end - if is_input_pressed("Left_Click") then - local scn = get_current_scene() - assert(scn, "no scene set.") - - local mx, my = get_mouse_pos() - local tx, ty = to_tile_coords(mx, my) - remove_tile(scn.tilemap, tx, ty) - end - end -end - -function player_ui_sys(_) - im.begin_window("Room Editor", 120, 5, 180, 320, {}) - im.layout({0.5, 0.75, 1}) - im.text("Tile: " .. tostring(tile)) - if im.button(" - ") then - tile = math.max(tile - 1, 0) - end - if im.button("+ ") then - tile = tile + 1 - end - im.layout() - - im.image(TILE_TEX, get_tileset_quad(tile)) - im.end_window() end function new_player(x, y) diff --git a/src/objs/room_editor.lua b/src/objs/room_editor.lua new file mode 100644 index 0000000..baee368 --- /dev/null +++ b/src/objs/room_editor.lua @@ -0,0 +1,71 @@ +register_input("Next_Tileset", {{"key", "t"}}) +register_input("Prev_Tileset", {{"key", "r"}}) + +register_comp("Room_Editor", function(ent) + ent.room_editor = { + tile = 1, + } +end) + +function tile_place_sys(ent) + local room_editor = ent.room_editor + + if not im.has_focus() then + if is_input_pressed("Right_Click") then + local scn = get_current_scene() + assert(scn, "no scene set.") + + local mx, my = get_mouse_pos() + local tx, ty = to_tile_coords(mx, my) + set_tile(scn.tilemap, tx, ty, room_editor.tile) + end + if is_input_pressed("Left_Click") then + local scn = get_current_scene() + assert(scn, "no scene set.") + + local mx, my = get_mouse_pos() + local tx, ty = to_tile_coords(mx, my) + remove_tile(scn.tilemap, tx, ty) + end + end + + if is_input_just_pressed("Next_Tileset") then + room_editor.tile = math.min(room_editor.tile + 1, get_tileset_count()) + end + if is_input_just_pressed("Prev_Tileset") then + room_editor.tile = math.max(room_editor.tile - 1, 1) + end +end + +function room_editor_ui_sys(ent) + local room_editor = ent.room_editor + im.begin_window("Room Editor", 120, 5, 180, 320, {}) + -- im.layout({0.5, 0.75, 1}) + im.text("Tile: " .. tostring(room_editor.tile)) + -- if im.button(" - ") then + -- tile = math.max(tile - 1, 1) + -- end + -- if im.button("+ ") then + -- tile = tile + 1 + -- end + im.layout({0.1, 0.6, 1}) + + for tileset_id=1, get_tileset_count() do + local text = " " + if tileset_id == room_editor.tile then + text = "*" + elseif tileset_id == room_editor.tile - 1 then + text = "r" + elseif tileset_id == room_editor.tile + 1 then + text = "t" + end + im.text(text) + if im.button("select") then + room_editor.tile = tileset_id + end + im.image(TILE_TEX, get_tileset_quad(tileset_id)) + end + + im.layout() + im.end_window() +end diff --git a/src/objs/tilemap.lua b/src/objs/tilemap.lua index f1cdd15..cb29a40 100644 --- a/src/objs/tilemap.lua +++ b/src/objs/tilemap.lua @@ -159,3 +159,7 @@ function get_tileset_quad(tileset) TILE_TEX:getDimensions() ) end + +function get_tileset_count() + return TILE_TEX:getHeight() / (4 * TILESIZE) +end -- cgit v1.3-2-g0d8e