actor progress

include/keraforge/actor.h

···
 
 /* Create a new actor. */
 struct kf_actor *kf_actor_new(char *key);
+/* Register a new actor and return its integer ID. */
+int kf_actor_register(char *key);
 
 /* Load a spritesheet, filling in the details for loading character spritesheets. */
 struct kf_spritesheet kf_actor_loadspritesheet(char *filename);

src/actor.c

···
 	return actor;
 }
 
+int kf_actor_register(char *key)
+{
+	int id = kf_actorregistry.count++;
+	kf_actorregistry.key[id] = key;
+	return id;
+}
+
 struct kf_spritesheet kf_actor_loadspritesheet(char *filename)
 {
 	return kf_loadspritesheet(filename, 20, 20);
···
 	return 1;
 }
 
-int kf_loadactors(void)
-{
-	// char *infile = compress ? _KF_ACTORFILE_TMP : _KF_ACTORFILE;
-	char *infile = _KF_ACTORFILE;
+// int kf_loadactors(void)
+// {
+// 	// char *infile = compress ? _KF_ACTORFILE_TMP : _KF_ACTORFILE;
+// 	char *infile = _KF_ACTORFILE;
 
-	size_t len = 0;
-	struct bini_stream bs = {
-		.mode = BINI_STREAM,
-		.buffer = kf_readbin(infile, &len),
-	};
-	if (!bs.buffer)
-		KF_THROW("failed to read/open %s", infile);
-	bs.cap = len;
-	bs.len = len;
-	kf_logdbg("loaded actors into binary stream: len=%lu", len);
+// 	size_t len = 0;
+// 	struct bini_stream bs = {
+// 		.mode = BINI_STREAM,
+// 		.buffer = kf_readbin(infile, &len),
+// 	};
+// 	if (!bs.buffer)
+// 		KF_THROW("failed to read/open %s", infile);
+// 	bs.cap = len;
+// 	bs.len = len;
+// 	kf_logdbg("loaded actors into binary stream: len=%lu", len);
 
-	const size_t nactors = bini_rlu(&bs);
+// 	const size_t nactors = bini_rlu(&bs);
 
-	for (size_t i = 0 ; i < nactors ; i++)
-	{
-		char key[4096] = {0};
-		bini_rstr(&bs, key);
-		int id = kf_actor_getregistryid(key);
-		if (id == -1)
-			continue;
-		struct kf_actor *actor = kf_actor_new(key, k, f32 width, f32 height, bool collides)
-		kf_actorregistry.deserialize[id](actor, &bs);
-	}
+// 	for (size_t i = 0 ; i < nactors ; i++)
+// 	{
+// 		char key[4096] = {0};
+// 		bini_rstr(&bs, key);
+// 		int id = kf_actor_getregistryid(key);
+// 		if (id == -1)
+// 			continue;
+// 		struct kf_actor *actor = kf_actor_new(key, k, f32 width, f32 height, bool collides)
+// 		kf_actorregistry.deserialize[id](actor, &bs);
+// 	}
 
-	kf_logdbg("loaded %d actors", nactors);
+// 	kf_logdbg("loaded %d actors", nactors);
 
-	free(bs.buffer);
+// 	free(bs.buffer);
 
-	return 1;
-}
+// 	return 1;
+// }

src/graphics.c

···
 	kf_timeit("load world", kf_world_load(&world, true, NULL));
 	kf_window.room = world;
 
-	kf_actorregistry.id[0] = "player";
-	kf_actorregistry.serialize[0] = kf_player_serialize;
-	kf_actorregistry.deserialize[0] = kf_player_deserialize;
-	kf_actorregistry.count++;
+	int idplayer = kf_actor_register("player");
+	kf_actorregistry.serialize[idplayer] = kf_player_serialize;
+	kf_actorregistry.deserialize[idplayer] = kf_player_deserialize;
+	kf_actorregistry.sprite[idplayer] = kf_actor_loadspritesheet("data/res/img/char/template.png");
+	kf_actorregistry.tick[idplayer] = kf_player_tick;
+	kf_actorregistry.draw[idplayer] = kf_player_draw;
 
-	struct kf_actor *player = kf_actor_new("player", kf_actor_loadspritesheet("data/res/img/char/template.png"), 10, 10, true);
+	struct kf_actor *player = kf_actor_new("player");
+	player->size.x = 10;
+	player->size.y = 10;
+	player->collide = true;
 	player->sizeoffset.y = 6;
-	player->tick = kf_player_tick;
-	player->draw = kf_player_draw;
 	player->controlled = true;
 	if (is_new_state) /* place the player in the centre of the room */
 	{
···
 	player->pos.y = state->player.pos.y;
 	kf_window.player = player;
 
-	struct kf_actor *player2 = kf_actor_new("player", kf_actor_loadspritesheet("data/res/img/char/whom.png"), 10, 10, true);
+	int idplayer2 = kf_actor_register("player2");
+	kf_actorregistry.serialize[idplayer2] = kf_player_serialize;
+	kf_actorregistry.deserialize[idplayer2] = kf_player_deserialize;
+	kf_actorregistry.sprite[idplayer2] = kf_actor_loadspritesheet("data/res/img/char/whom.png");
+	kf_actorregistry.tick[idplayer2] = kf_player_tick;
+	kf_actorregistry.draw[idplayer2] = kf_player_draw;
+
+	struct kf_actor *player2 = kf_actor_new("player2");
+	player2->size.x = 10;
+	player2->size.y = 10;
+	player2->collide = false;
 	player2->sizeoffset.y = 6;
-	player2->tick = kf_player_tick; /* when controlled is false, player_tick won't process keybinds */
-	player2->draw = kf_player_draw;
 	player2->pos.x = player->pos.x;
 	player2->pos.y = player->pos.y - 24;
 
···
 {
 	// kf_window.player->tick(kf_window.player);
 	for (struct kf_actor *actor = kf_actors ; actor != NULL ; actor = actor->next)
-		actor->tick(actor);
+		kf_actorregistry.tick[actor->id](actor);
 
 	Vector2 v = GetScreenToWorld2D(GetMousePosition(), kf_window.cam);
 	kf_window.select.x = v.x / KF_TILE_SIZE_PX;
···
 	// kf_world_drawcolliders(world, player, cam);
 	// kf_window.player->draw(kf_window.player);
 	for (struct kf_actor *actor = kf_actors ; actor != NULL ; actor = actor->next)
-		actor->draw(actor);
+		kf_actorregistry.draw[actor->id](actor);
 }
 
 static