mark scripts as scene dependencies

demo/demo/rollball.cpp

@@ -88,7 +88,7 @@ namespace demo {
 		// asset loader
 		auto* assetLoader = m_owner.service<fggl::assets::Loader>();
 		assetLoader->load("rollball.yml", fggl::entity::ENTITY_PROTOTYPE, entFactory);
-		assetLoader->load("rollball.yml", fggl::entity::ENTITY_SCENE, this);
+		assetLoader->loadChain( fggl::assets::make_asset_id_rt("core", "rollerball/rollball.yml"), this);
 
 		// collectable callbacks
 		/*auto* collectableCallbacks = world().get<fggl::phys::CollisionCallbacks>(prefabs.collectable);

fggl/assets/types.cpp

@@ -34,7 +34,8 @@ namespace fggl::assets {
 	}
 
 	AssetID asset_from_user(const std::string &input, const std::string &pack) {
-		if (input.find(':') != 0) {
+
+		if (input.find(':') != std::string::npos ) {
 			// probably fully qualified
 			#ifndef NDEBUG
 			util::internString(input.c_str());

fggl/entity/module.cpp

@@ -37,6 +37,34 @@ namespace fggl::entity {
 		factory->bind(math::Transform::guid, make_transform);
 	}
 
+	static assets::AssetTypeID is_scene(std::filesystem::path path) {
+		if ( path.extension() == ".yml" ) {
+			return ENTITY_SCENE;
+		}
+
+		return assets::INVALID_ASSET_TYPE;
+	}
+
+	bool get_scene_deps(const std::string& packName, std::filesystem::path packRoot, assets::ResourceRecord& rr) {
+
+		auto nodes = YAML::LoadAllFromFile( rr.m_path );
+		for ( auto& node : nodes ) {
+			auto scripts = node["scripts"];
+			if ( !scripts ) {
+				continue;
+			}
+
+			for (auto script : scripts) {
+				auto scriptName = script.as<std::string>();
+				auto scriptRef = assets::asset_from_user(scriptName, rr.m_pack);
+				rr.m_requires.push_back(scriptRef);
+			}
+		}
+
+		return true;
+	}
+
+
 	bool ECS::factory(modules::ModuleService service, modules::Services &services) {
 		if (service == EntityFactory::service) {
 			auto *factory = services.create<EntityFactory>(services);
@@ -53,6 +81,11 @@ namespace fggl::entity {
 			}, assets::LoadType::PATH);
 			assetLoader->setFactory(ENTITY_SCENE, load_scene, assets::LoadType::PATH);
 
+			// allow auto-detection
+			auto *checkin = services.get<assets::CheckinAdapted>();
+			checkin->setLoader(MIME_SCENE, assets::NEEDS_CHECKIN, is_scene);
+			checkin->setProcessor(MIME_SCENE, get_scene_deps);
+
 			return true;
 		}
 		return false;

include/fggl/assets/loader.hpp

@@ -88,6 +88,11 @@ namespace fggl::assets {
 					auto current = openSet.top();
 					openSet.pop();
 
+					if ( !m_checkin->exists(current) ) {
+						debug::warning("attempted to load chain with unknown assert, {} - abort!", current);
+						return;
+					}
+
 					// this WILL (probably) break if an asset ends up in the chain twice
 					loadOrder.push_back( current );
 					const auto& record = m_checkin->find(current);

include/fggl/entity/module.hpp

@@ -22,17 +22,21 @@
 #include "fggl/modules/module.hpp"
 #include "fggl/assets/loader.hpp"
 
+#include "fggl/assets/packed/adapter.hpp"
 #include "fggl/entity/loader/loader.hpp"
 
 namespace fggl::entity {
 
+	constexpr auto MIME_SCENE = assets::from_mime("x-fggl/scene");
+
 	struct ECS {
 		constexpr static const char *name = "fggl::entity::ECS";
 		constexpr static const std::array<modules::ModuleService, 1> provides = {
 			EntityFactory::service
 		};
-		constexpr static const std::array<modules::ModuleService, 1> depends = {
-			assets::Loader::service
+		constexpr static const std::array<modules::ModuleService, 2> depends = {
+			assets::Loader::service,
+			assets::CheckinAdapted::service
 		};
 		static bool factory(modules::ModuleService name, modules::Services &serviceManager);
 	};