Level drawing and new arguments + README update

CMakeLists.txt

@@ -8,13 +8,15 @@ include_directories(include)
 
 set(SOURCES
 	src/main.c
-	src/level.c)
+	src/level.c
+	src/draw.c
+)
 
 set(FLAGS
 	-Wall -Wextra -Wshadow -Wswitch-default -Wswitch-enum
 	-Wunreachable-code -Wstrict-prototypes -Wmissing-prototypes
 	-Wold-style-definition -Werror-implicit-function-declaration
-	-g -Os)
+	-Os)
 
 add_executable(${PROJECT_NAME} ${SOURCES} ${SOURCES_RAYLIB})
 

README

@@ -15,6 +15,12 @@ $ mkdir sle/build && cd sle/build
 $ cmake ..
 $ make
 
+RUN
+===
+$ <SLE binary path> <tileset> <KBLE level to open>
+Example:
+$ build/sle assets/tileset.png sample.kble
+
 LICENSE
 =======
 Copyright (C) 2021 KikooDX <kikoodx@paranoici.org>

include/conf.h

@@ -1,8 +1,11 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
 /* Copyright (C) 2021 KikooDX */
-
 #pragma once
 
 static const int window_width = 396;
 static const int window_height = 224;
+static const int draw_offset_x = -2;
+static const int draw_offset_y = -8;
+static const int tile_width = 16;
+static const int tile_height = 16;
 static const int target_fps = 60;

include/draw.h

@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2021 KikooDX */
+#pragma once
+
+#include "level.h"
+#include <raylib.h>
+
+void level_draw(struct Level level, Texture2D tileset);

include/level.h

@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
 /* Copyright (C) 2021 KikooDX */
-
 #pragma once
 
 typedef unsigned int tile_t;

src/draw.c

@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright (C) 2021 KikooDX */
+
+#include "conf.h"
+#include "level.h"
+#include <raylib.h>
+#include <stdlib.h>
+
+void level_draw(struct Level level, Texture2D tileset)
+{
+	int x;
+	int y;
+	for (x = 0; x < level.width; x += 1) {
+		for (y = 0; y < level.height; y += 1) {
+			const int tile =
+			    level.data[x + y * level.width];
+			Rectangle tile_rect = {
+			    (int)(tile % tileset.width) * tile_width,
+			    (int)(tile / tileset.width) * tile_width,
+			    tile_width, tile_height};
+			Vector2 tile_pos = {
+			    x * tile_width + draw_offset_x,
+			    y * tile_height + draw_offset_y};
+			if (tile)
+				DrawTextureRec(tileset, tile_rect,
+				               tile_pos, WHITE);
+		}
+	}
+}

src/level.c

@@ -1,12 +1,11 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
 /* Copyright (C) 2021 KikooDX */
 
+#include "level.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "level.h"
-
 static const int kble_fmt_version = 0;
 
 static char read_byte(FILE *file);

src/main.c

@@ -1,23 +1,19 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later */
 /* Copyright (C) 2021 KikooDX */
 
+#include "conf.h"
+#include "draw.h"
+#include "level.h"
 #include <assert.h>
 #include <raylib.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "conf.h"
-#include "level.h"
-
 int main(int argc, char **argv)
 {
 	struct Level level;
 	level.data = NULL;
 
-	/* initialize raylib */
-	InitWindow(window_width, window_height, "SLE");
-	SetTargetFPS(target_fps);
-
 	/* check for argument count */
 	if (argc != 3) {
 		fprintf(stderr, "ERROR: expected 2 arguments, got %d\n",
@@ -25,8 +21,25 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	};
 
+	/* initialize raylib */
+	InitWindow(window_width, window_height, "SLE");
+	SetTargetFPS(target_fps);
+	/* load textures */
+	const Texture2D tileset = LoadTexture(argv[1]);
+	assert(tileset.width > 0);
+
 	/* load level */
-	level_read(&level, argv[1]);
+	level_read(&level, argv[2]);
+
+	while (!WindowShouldClose()) {
+		/* draw */
+		BeginDrawing();
+
+		ClearBackground(BLACK);
+		level_draw(level, tileset);
+
+		EndDrawing();
+	}
 
 	/* save level */
 	level_write(level, argv[2]);
@@ -34,8 +47,6 @@ int main(int argc, char **argv)
 	/* deinit */
 	level_free(&level);
 
-	for (;;) {}
-
 	CloseWindow();
 
 	return EXIT_SUCCESS;