Subtiles, fix animations at high FPS

include/keraforge/graphics.h

···
 
 
 /* Number of frames since the game opened.
-   You should only use this for animations!
-   It's not consistent enough for precise timing use deltatime (kf_dts/kf_dtms) for that. */
+   Not consistent enough for precise timing! Use deltatime (kf_dts/kf_dtms) instead. */
 extern u64 kf_frame;
+/* Number of seconds since the game opened. */
+extern f64 kf_s;
 /* Deltatime in milliseconds */
 extern f32 kf_dtms;
 /* Deltatime in seconds. */

include/keraforge/world.h

···
 /* Represents a singular tile in the world. */
 struct kf_tile
 {
+	kf_tileid_t subid;
 	kf_tileid_t id;
 	kf_tiledatum_t data;
 };

src/actor.c

···
 	if (actor->vel.x != 0 || actor->vel.y != 0)
 		x += 7; /* walk sprites */
 
-	x += (kf_frame / 15) % 4;
+	x += (int)(kf_s * 5) % 4;
 
 	/* todo: run and jump */
 

src/graphics.c

···
 
 
 u64 kf_frame = 0;
+f64 kf_s = 0;
 f32 kf_dtms = 0;
 f32 kf_dts = 0;

src/main.c

···
+#include "keraforge/input.h"
 #include <keraforge.h>
 #include <raylib.h>
 #include <raymath.h>
···
 static Camera2D cam;
 static struct kf_vec2(u32) select = { 0, 0 };
 static int selected_tile = 0;
-static bool selected_menu_this_frame = false;
 static enum {
 	menu_none,
 	menu_palette,
-	menu_escape
 } menu;
+static int target_fps = 60;
 
 static kf_inputbind_t
 	inputbind_move_up,
···
 	inputbind_palette,
 	inputbind_zoom_reset,
 	inputbind_zoom_in,
-	inputbind_zoom_out
+	inputbind_zoom_out,
+	inputbind_toggle_fps_limit
 ;
 
 
···
 	inputbind_zoom_reset = kf_addinput("zoom_reset", KEY_ZERO,   KEY_NULL,   MOUSE_BUTTON_UNKNOWN, GAMEPAD_BUTTON_UNKNOWN,          GAMEPAD_AXIS_UNKNOWN);
 	inputbind_zoom_in    = kf_addinput("zoom_in",    KEY_EQUAL,  KEY_NULL,   MOUSE_BUTTON_UNKNOWN, GAMEPAD_BUTTON_UNKNOWN,          GAMEPAD_AXIS_UNKNOWN);
 	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);
 }
 
 static
 void setmenu(int m)
 {
 	menu = m;
-	selected_menu_this_frame = true;
 }
 
 static
···
 
 	// SetTraceLogLevel(LOG_WARNING);
 	InitWindow(800, 600, "Keraforge");
-	SetTargetFPS(60);
+	SetTargetFPS(target_fps);
 	SetExitKey(KEY_NULL);
 
 	loadbinds();
···
 	if (!kf_exists("data/map.bin"))
 	{
 		printf("-> creating world\n");
-		world = kf_world_new(128, 128, 1);
+		world = kf_world_new(4096, 4096, 2);
 		printf("-> saving world\n");
 		size_t len = kf_world_getsize(world);
 		printf("-> writing of %lu bytes\n", len);
···
 		if (kf_checkinputpress(inputbind_palette))
 			setmenu(menu_palette);
 		else if (kf_checkinputpress(inputbind_cancel) && menu == menu_none)
-			setmenu(menu_escape);
+			running = 0;
 		else if (kf_checkinputpress(inputbind_zoom_reset))
 			cam.zoom = 2;
 		else if (kf_checkinputpress(inputbind_zoom_in) && cam.zoom < 3.50f)
 			cam.zoom += 0.25f;
 		else if (kf_checkinputpress(inputbind_zoom_out) && cam.zoom > 1.00f)
 			cam.zoom -= 0.25f;
+		else if (kf_checkinputpress(inputbind_toggle_fps_limit))
+		{
+			target_fps = target_fps <= 0 ? 60 : 0;
+			SetTargetFPS(target_fps);
+		}
 
 		BeginDrawing();
 		ClearBackground(BLACK);
···
 		player->draw(world, player);
 		EndMode2D();
 
-		if (selected_menu_this_frame)
+		switch (menu)
 		{
-			selected_menu_this_frame = false;
-		}
-		else
-		{
-			switch (menu)
-			{
-			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);
-				break;
-			case menu_escape:
-				{
-				static int result = 1;
-				if (kf_ui_yesno("Exit game?", &result))
-				{
-					menu = menu_none;
-					if (result)
-						running = 0;
-					result = 1;
-				}
-				break;
-				}
-			}
+		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);
+			break;
 		}
 
 		DrawFPS(0, 0);
 		DrawText(TextFormat("%f", kf_dts), 0, 20, 20, RED);
+		DrawText(TextFormat("%f", kf_s), 0, 40, 20, RED);
 
 		EndDrawing();
 
 		kf_frame++;
 		kf_dts = GetFrameTime();
 		kf_dtms = kf_dts * 1000;
+		kf_s += kf_dts;
 	}
 
 	if (world)

src/math.c

···
-#include "keraforge/math.h"
 #include <keraforge.h>
 #include <raylib.h>
 #include <raymath.h>

src/world.c

···
-#include "keraforge/world.h"
 #include <keraforge.h>
 #include <raylib.h>
 #include <stdio.h>
···
 	world->height = height;
 	memset(world->map, 0, sizeof(struct kf_tile)*width*height);
 	for (size_t i = 0 ; i < width*height ; i++)
+	{
+		world->map[i].subid = fill;
 		world->map[i].id = fill;
+	}
 
 	u32 x;
 	for (u32 y = 0 ; y < height ; y++)
···
 	{
 		for (x = sx ; x < ex ; x++)
 		{
+			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 */
+			{
+				kf_drawsprite_wh(
+					kf_tiles.sheet[tile->subid],
+					x*KF_TILE_SIZE_PX,
+					y*KF_TILE_SIZE_PX,
+					KF_TILE_SIZE_PX,
+					KF_TILE_SIZE_PX,
+					kf_tiles.sprite[tile->subid].x + 2, /* 2,1 are offsets for the "middle" tile */
+					kf_tiles.sprite[tile->subid].y + 1
+				);
+			}
 			if (tile->id)
 			{
 				struct kf_vec2(u32) s = kf_getspritefortilebitmask(tile->data);

todo

···
   . World
     / Tiles
     . Actors
+    . Compression (perhaps https://github.com/google/brotli/)
   . Dialogue
     . Quests
   . Combat