(temp) progress

include/keraforge/time.h

···
 #include <time.h>
 
 
+#define kf_timeit(_msg, ...) \
+	do \
+	{ \
+		struct kf_timer __timer = { \
+			.mode = kf_timermode_stopwatch, \
+		}; \
+		kf_timer_start(&__timer); \
+		__VA_ARGS__; \
+		kf_timer_stop(&__timer); \
+		char __timerstr[BUFSIZ] = {0}; \
+		kf_timer_snprint(&__timer, __timerstr, sizeof(__timerstr)); \
+		kf_loginfo("took [%s] to %s", __timerstr, _msg); \
+	} \
+	while (0)
+
+
 enum kf_timermode
 {
 	/* Manually stopped timer. Upon stopping, age is
···
 void kf_timer_start(struct kf_timer *timer);
 void kf_timer_tick(struct kf_timer *timer);
 void kf_timer_stop(struct kf_timer *timer);
+size_t kf_timer_snprint(struct kf_timer *timer, char *buf, size_t bufsiz);
 
 
 #endif

include/keraforge/world.h

···
 /* Draw the part of the world visible to the given camera. */
 void kf_world_draw(struct kf_world *world, Camera2D camera);
 
-/* Save a world to map.bin(.xz). */
-int kf_world_save(struct kf_world *world, bool compress);
-/* Load a world from a map.bin(.xz). */
-int kf_world_load(struct kf_world **world, bool compressed);
+/* Save a world to map.bin(.xz). Set outfile to NULL to use the default. */
+int kf_world_save(struct kf_world *world, bool compress, char *outfile);
+/* Load a world from a map.bin(.xz). Set infile to NULL to use the default. */
+int kf_world_load(struct kf_world **world, bool compressed, char *infile);
 
 #endif

src/editor.c

···
 	kf_logdbg("exiting editor, world is %s", d ? "dirty" : "not dirty");
 
 	if (d)
-		kf_world_save(kf_window.room, false);
+		kf_timeit("save world", kf_world_save(kf_window.room, true, NULL));
 
 	free(kf_window.modal->data);
 	kf_window.modal->data = NULL;

src/graphics.c

···
 	kf_window.state = state;
 
 	struct kf_world *world = NULL;
-	kf_world_load(&world, false);
+	kf_timeit("load world", kf_world_load(&world, true, NULL));
 	kf_window.room = world;
 
 	kf_actorregistry.id[0] = "player";

src/time.c

···
+#include "keraforge/time.h"
 #include <keraforge.h>
+#include <time.h>
 
 
 void kf_timer_start(struct kf_timer *timer)
···
 
 void kf_timer_tick(struct kf_timer *timer)
 {
+	if (timer->stop)
+		return;
+
 	time_t now = time(NULL);
 	time_t dif = now - timer->now;
 	timer->age += dif;
···
 	case kf_timermode_stopwatch:
 		break;
 	case kf_timermode_repeat:
+		if (timer->age >= timer->length)
+		{
+			timer->age = 0;
+			if (timer->callback)
+				timer->callback(timer);
+		}
+		break;
 	case kf_timermode_oneshot:
+		if (timer->age >= timer->length)
+		{
+			timer->stop = now;
+			timer->age = 0;
+			if (timer->callback)
+				timer->callback(timer);
+		}
 		break;
 	}
 
 }
 
-void kf_timer_stop(struct kf_timer *timer);
+void kf_timer_stop(struct kf_timer *timer)
+{
+	time(&timer->stop);
+	if (timer->mode == kf_timermode_stopwatch)
+	{
+		timer->length = timer->stop - timer->start;
+		if (timer->callback)
+			timer->callback(timer);
+	}
+}
+
+size_t kf_timer_snprint(struct kf_timer *timer, char *buf, size_t bufsiz)
+{
+	size_t n = 0;
+	switch (timer->mode)
+	{
+	case kf_timermode_stopwatch:
+		n += strftime(buf, bufsiz, "%Hh:%Mm:%Ss", gmtime(&timer->length));
+		break;
+	case kf_timermode_repeat:
+	case kf_timermode_oneshot:
+		n += strftime(buf, bufsiz, "%Hh:%Mm:%Ss/", gmtime(&timer->age));
+		n += strftime(buf + n, bufsiz - n, "%Hh:%Mm:%Ss", gmtime(&timer->length));
+		break;
+	}
+	return n;
+}

src/world.c

···
 	}
 }
 
-int kf_world_save(struct kf_world *world, bool compress)
+int kf_world_save(struct kf_world *world, bool compress, char *outfile)
 {
-	char *outfile = compress ? _KF_MAPFILE_TMP : _KF_MAPFILE;
+	outfile = outfile ? outfile : (compress ? _KF_MAPFILE_TMP : _KF_MAPFILE);
 	struct bini_stream *bs = bini_new();
 	_kf_world_save_bs(world, bs);
 	if (!kf_writebin(outfile, bs->buffer, bs->len))
···
 	*pworld = world;
 }
 
-int kf_world_load(struct kf_world **pworld, bool compressed)
+int kf_world_load(struct kf_world **pworld, bool compressed, char *infile)
 {
 	if (compressed) /* decompress before loading */
 	{
···
 		}
 	}
 
-	char *infile = compressed ? _KF_MAPFILE_TMP : _KF_MAPFILE;
+	infile = infile ? infile : (compressed ? _KF_MAPFILE_TMP : _KF_MAPFILE);
 	kf_logdbg("loading world: %s", infile);
 
 	size_t len = 0;

tools/newgame.c

···
 	struct kf_world *world = NULL;
 
 	kf_loginfo("creating world");
-	world = kf_world_new(width, height, 2);
+	kf_timeit("create world", {
+		world = kf_world_new(width, height, 2);
+	});
 
 	/* path for our map.bin */
 	char worldpath[4096] = {0};
···
 	MakeDirectory(GetDirectoryPath(worldpath));
 
 	size_t len = kf_world_getsize(world);
-	kf_loginfo("saving world (%lu bytes uncompressed)", len);
-	kf_world_save(world, compress);
-	// if (!kf_writebin(worldpath, (u8 *)world, len))
-	// 	KF_THROW("failed to save %s", worldpath);
+	kf_loginfo("saving world to %s (%lu bytes uncompressed)", worldpath, len);
+	kf_timeit("save world", kf_world_save(world, compress, worldpath));
 
 	if (compress)
 	{
 		char worldxzpath[4096] = {0};
 		strcpy(worldxzpath, path);
 		strcpy(&worldxzpath[0] + strlen(path), "/map.bin.xz");
-		if (!kf_compress(worldpath, worldxzpath))
-			KF_THROW("failed to compress %s", worldpath);
+		kf_timeit("compress world", {
+			if (!kf_compress(worldpath, worldxzpath))
+			{
+				KF_THROW("failed to compress %s", worldpath);
+			}
+		});
 		remove(worldpath); /* no longer needed */
 	}