YAGNI: Simplify asset workflow, remove reflected factories, etc. (#33)

* [WIP] Simplify Enemy spawn flow, fix race in `Resources`.

* Remove `EnemySpawner`, `EnemyFactoryBuilder`.

* Remove `WorldSpec`, add `AssetManifest`.

Hard-code manifest in game.cpp.

* Refactor asset loading into a dedicated scene.

* Remove `setup()`, can be done in constructors now.

* Misc cleanup.

Author: karnkaul

assets/worlds/playground.json

@@ -1,5 +1,5 @@
-#include <spaced/game/asset_list.hpp>
-#include <spaced/game/asset_loader.hpp>
+#include <spaced/assets/asset_list.hpp>
+#include <spaced/assets/asset_loader.hpp>
 #include <spaced/services/resources.hpp>
 
 namespace spaced {
@@ -37,31 +37,12 @@ auto AssetList::add_audio_clip(std::string uri) -> AssetList& {
 	return *this;
 }
 
-auto AssetList::read_world_spec(std::string_view const uri) -> WorldSpec {
-	if (uri.empty()) { return {}; }
-
-	auto const json = m_loader.load_json(uri);
-	if (!json) { return {}; }
-
-	auto ret = WorldSpec{};
-	ret.name = json["name"].as_string();
-	ret.background_tint = json["background_tint"].as_string();
-
-	if (auto const& player = json["player"]) {
-		ret.player.tint = player["tint"].as_string();
-		ret.player.exhaust_emitter = player["exhaust_emitter"].as_string();
-		ret.player.death_emitter = player["death_emitter"].as_string();
-		add_particle_emitter(ret.player.exhaust_emitter);
-		add_particle_emitter(ret.player.death_emitter);
-	}
-
-	for (auto const& enemy_factory : json["enemy_factories"].array_view()) {
-		add_particle_emitter(enemy_factory["death_emitter"].as<std::string>());
-		for (auto const& death_sfx : enemy_factory["death_sfx"].array_view()) { add_audio_clip(death_sfx.as<std::string>()); }
-		ret.enemy_factories.push_back(enemy_factory);
-	}
-
-	return ret;
+void AssetList::add_manifest(AssetManifest manifest) {
+	for (auto& uri : manifest.textures) { add_texture(std::move(uri), false); }
+	for (auto& uri : manifest.mip_mapped_textures) { add_texture(std::move(uri), true); }
+	for (auto& uri : manifest.fonts) { add_font(std::move(uri)); }
+	for (auto& uri : manifest.audio_clips) { add_audio_clip(std::move(uri)); }
+	for (auto& uri : manifest.particle_emitters) { add_particle_emitter(std::move(uri)); }
 }
 
 auto AssetList::build_task_stages() const -> std::vector<AsyncExec::Stage> {

src/spaced/spaced/game/asset_list.cpp renamed to src/spaced/spaced/assets/asset_list.cpp

@@ -1,7 +1,7 @@
 #pragma once
 #include <bave/loader.hpp>
+#include <spaced/assets/asset_manifest.hpp>
 #include <spaced/async_exec.hpp>
-#include <spaced/game/world_spec.hpp>
 #include <spaced/services/services.hpp>
 #include <set>
 
@@ -18,7 +18,7 @@ class AssetList {
 	auto add_particle_emitter(std::string uri) -> AssetList&;
 	auto add_audio_clip(std::string uri) -> AssetList&;
 
-	auto read_world_spec(std::string_view uri) -> WorldSpec;
+	void add_manifest(AssetManifest manifest);
 
 	[[nodiscard]] auto build_task_stages() const -> std::vector<AsyncExec::Stage>;
 

src/spaced/spaced/game/asset_list.hpp renamed to src/spaced/spaced/assets/asset_list.hpp

@@ -1,7 +1,7 @@
 #include <bave/graphics/particle_system.hpp>
 #include <bave/json_io.hpp>
 #include <bave/logger.hpp>
-#include <spaced/game/asset_loader.hpp>
+#include <spaced/assets/asset_loader.hpp>
 #include <mutex>
 
 namespace spaced {

src/spaced/spaced/game/asset_loader.cpp renamed to src/spaced/spaced/assets/asset_loader.cpp

@@ -0,0 +1,13 @@
+#pragma once
+#include <string>
+#include <vector>
+
+namespace spaced {
+struct AssetManifest {
+	std::vector<std::string> textures{};
+	std::vector<std::string> mip_mapped_textures{};
+	std::vector<std::string> fonts{};
+	std::vector<std::string> audio_clips{};
+	std::vector<std::string> particle_emitters{};
+};
+} // namespace spaced

src/spaced/spaced/game/asset_loader.hpp renamed to src/spaced/spaced/assets/asset_loader.hpp

@@ -6,14 +6,14 @@
 namespace spaced {
 using namespace std::chrono_literals;
 
-AsyncExec::AsyncExec(std::span<Task const> tasks) {
+AsyncExec::AsyncExec(std::vector<Task> tasks) {
 	if (tasks.empty()) { return; }
 
 	m_total = static_cast<int>(tasks.size());
 	enqueue(tasks);
 }
 
-AsyncExec::AsyncExec(std::span<Stage> stages) {
+AsyncExec::AsyncExec(std::vector<Stage> stages) {
 	if (stages.empty()) { return; }
 	std::move(stages.begin(), stages.end(), std::back_inserter(m_stages));
 	m_total = std::accumulate(m_stages.begin(), m_stages.end(), 0, [](int count, auto const& tasks) { return static_cast<int>(tasks.size()) + count; });

src/spaced/spaced/assets/asset_manifest.hpp

@@ -14,8 +14,8 @@ class AsyncExec {
 
 	struct Status;
 
-	explicit AsyncExec(std::span<Task const> tasks);
-	explicit AsyncExec(std::span<Stage> stages);
+	explicit AsyncExec(std::vector<Task> tasks);
+	explicit AsyncExec(std::vector<Stage> stages);
 
 	auto update() -> Status;