Improve tile palette

src/main.c

···
 #include "keraforge/input.h"
+#include "keraforge/sprites.h"
+#include "keraforge/world.h"
 #include <keraforge.h>
 #include <raylib.h>
 #include <raymath.h>
···
 	menu_palette,
 } menu;
 static int target_fps = 60;
+static enum {
+	modal_play,
+	modal_edit,
+} modal;
+static char *modals[] = { "play", "edit" };
+static bool dirty = false;
 
 static kf_inputbind_t
 	inputbind_move_up,
···
 	inputbind_zoom_reset,
 	inputbind_zoom_in,
 	inputbind_zoom_out,
-	inputbind_toggle_fps_limit
+	inputbind_toggle_fps_limit,
+	inputbind_toggle_editor
 ;
 
 
···
 	inputbind_zoom_out   = kf_addinput("zoom_out",   KEY_MINUS,  KEY_NULL,   MOUSE_BUTTON_UNKNOWN, GAMEPAD_BUTTON_UNKNOWN,          GAMEPAD_AXIS_UNKNOWN);
 
 	inputbind_toggle_fps_limit = kf_addinput("toggle_fps_limit", KEY_NINE, KEY_NULL, MOUSE_BUTTON_UNKNOWN, GAMEPAD_BUTTON_UNKNOWN, GAMEPAD_AXIS_UNKNOWN);
+	inputbind_toggle_editor = kf_addinput("toggle_editor", KEY_EIGHT, KEY_NULL, MOUSE_BUTTON_UNKNOWN, GAMEPAD_BUTTON_UNKNOWN, GAMEPAD_AXIS_UNKNOWN);
 }
 
 static
···
 	cam.target.y = self->pos.y + (self->size.y / 2);
 }
 
+static
+void draw_palette(int *selected)
+{
+	int px = 80, py = 80;
+	DrawRectangle(px, py, 400, 400, BLACK);
+	DrawText("tiles :3", px + 10, py + 10, 20, WHITE);
+	py += 40;
+	int x = 0, y = 0;
+	int s = KF_TILE_SIZE_PX * 2;
+	for (int i = 1 ; i <= kf_tiles.count ; i++)
+	{
+		Rectangle r = {px + x*s, py + y*s, s, s};
+		kf_drawsprite_wh(kf_tiles.sheet[i], r.x, r.y, r.width, r.height, kf_tiles.sprite[i].x + 0, kf_tiles.sprite[i].y + 3);
+
+		if (*selected == i)
+			DrawRectangleLinesEx(r, 1, GOLD);
+
+		if (CheckCollisionPointRec(GetMousePosition(), r))
+		{
+			DrawRectangleLinesEx(r, 1, WHITE);
+			if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT))
+				*selected = i;
+		}
+
+		x += 1;
+		if (x >= 8)
+		{
+			x = 0;
+			y++;
+		}
+	}
+
+	if (kf_checkinputpress(inputbind_cancel))
+		setmenu(menu_none);
+};
+
 
 int main(int argc, const char *argv[])
 {
···
 		.mapcol = GRAY,
 		.sheet = &terrain,
 		.sprite = {0, 4},
-		.collide = true,
 	);
 	KF_ADDTILE(
 		.key = "debug",
···
 		.sheet = &terrain,
 		.sprite = {4, 4},
 	);
+	KF_ADDTILE(
+		.key = "brick",
+		.mapcol = RED,
+		.sheet = &terrain,
+		.sprite = {8, 0},
+		.collide = true,
+	);
 	printf("loaded %d tiles\n", kf_tiles.count);
 
 	struct kf_uiconfig *uiconfig = kf_ui_getconfig();
···
 		select.x = v.x / KF_TILE_SIZE_PX;
 		select.y = v.y / KF_TILE_SIZE_PX;
 
-		if (kf_checkinputpress(inputbind_palette))
+		if (kf_checkinputpress(inputbind_palette) && modal == modal_edit)
 			setmenu(menu_palette);
 		else if (kf_checkinputpress(inputbind_cancel) && menu == menu_none)
 			running = 0;
···
 			target_fps = target_fps <= 0 ? 60 : 0;
 			SetTargetFPS(target_fps);
 		}
+		else if (kf_checkinputpress(inputbind_toggle_editor))
+		{
+			if (modal == modal_edit)
+				modal = modal_play;
+			else
+			{
+				modal = modal_edit;
+				dirty = true;
+			}
+		}
 
 		BeginDrawing();
 		ClearBackground(BLACK);
···
 		BeginMode2D(cam);
 		kf_world_draw(world, cam);
 		// kf_world_drawcolliders(world, player, cam);
-		if (select.x < world->width && select.y < world->height)
+		if (modal == modal_edit && menu == menu_none && select.x < world->width && select.y < world->height)
 		{
 			struct kf_tile *t = kf_world_gettile(world, select.x, select.y);
-			if (IsMouseButtonPressed(MOUSE_BUTTON_LEFT))
+			if (IsMouseButtonDown(MOUSE_BUTTON_LEFT))
 			{
 				t->id = (kf_tileid_t)selected_tile;
 				kf_world_updatetile(world, select.x, select.y, true);
 			}
+			else if (IsMouseButtonDown(MOUSE_BUTTON_RIGHT))
+				t->subid = (kf_tileid_t)selected_tile;
+			else if (IsMouseButtonPressed(MOUSE_BUTTON_MIDDLE))
+				selected_tile = t->id;
+
 			DrawRectangleLines(select.x * KF_TILE_SIZE_PX, select.y * KF_TILE_SIZE_PX, KF_TILE_SIZE_PX, KF_TILE_SIZE_PX, WHITE);
 			struct kf_vec2(u32) s = kf_getspritefortilebitmask(t->data);
 			DrawText(TextFormat("%d [0x%04x] (%d,%d) {%d,%d}", t->id, t->data, select.x, select.y, s.x, s.y), select.x * KF_TILE_SIZE_PX, select.y * KF_TILE_SIZE_PX - 10, 10, BLACK);
···
 		case menu_none:
 			break;
 		case menu_palette:
-			if (kf_ui_choice("Select tile", &kf_tiles.key[0], kf_tiles.count + 1, &selected_tile))
-				setmenu(menu_none);
+			draw_palette(&selected_tile);
 			break;
 		}
 
 		DrawFPS(0, 0);
 		DrawText(TextFormat("%f", kf_dts), 0, 20, 20, RED);
 		DrawText(TextFormat("%f", kf_s), 0, 40, 20, RED);
+		DrawText(TextFormat("%s", modals[modal]), 0, 60, 20, ORANGE);
 
 		EndDrawing();
 
···
 
 	if (world)
 	{
-		if (!kf_writebin("data/map.bin", (u8 *)world, kf_world_getsize(world)))
+		if (dirty && !kf_writebin("data/map.bin", (u8 *)world, kf_world_getsize(world)))
 			fprintf(stderr, "error: failed to save map.bin\n");
 		free(world);
 	}

src/world.c

···
 		{
 			KF_SANITY_CHECK(tile->subid <= kf_tiles.count, "erroneous subtile on map at %u,%u: %u (count=%u)", x, y, tile->subid, kf_tiles.count);
 			KF_SANITY_CHECK(tile->id <= kf_tiles.count, "erroneous tile on map at %u,%u: %u (count=%u)", x, y, tile->id, kf_tiles.count);
-			if (tile->data != 0x1111 && tile->subid) /* 0x1111: full tile, no subtile rendering needed */
+			if (tile->data != 0x1111 && tile->subid && tile->id) /* 0x1111: full tile, no subtile rendering needed */
 			{
 				kf_drawsprite_wh(
 					kf_tiles.sheet[tile->subid],