allow the entity factory to provided at calltime

demo/demo/rollball.cpp

@@ -85,7 +85,7 @@ namespace demo {
 
 		// asset loader
 		auto* assetLoader = m_owner.service<fggl::assets::Loader>();
-		assetLoader->load("rollball.yml", fggl::entity::PROTOTYPE_ASSET);
+		assetLoader->load("rollball.yml", fggl::entity::PROTOTYPE_ASSET, entFactory);
 		assetLoader->load("rollball.yml", fggl::entity::SCENE, this);
 
 		// collectable callbacks

fggl/entity/loader/loader.cpp

@@ -77,7 +77,7 @@ namespace fggl::entity {
 		return nullptr;
 	}
 
-	assets::AssetRefRaw load_prototype(assets::Loader* loader, EntityFactory *factory, const assets::AssetGUID &guid, assets::AssetData data) {
+	assets::AssetRefRaw load_prototype(assets::Loader* loader, const assets::AssetGUID &guid, assets::AssetData data, EntityFactory* factory) {
 		auto *filePath = std::get<assets::AssetPath *>(data);
 
 		// We need to process the prototypes, and load them into the asset system.

fggl/entity/module.cpp

@@ -45,7 +45,11 @@ namespace fggl::entity {
 			// we are responsible for prefabs...
 			auto *assetLoader = services.get<assets::Loader>();
 			assetLoader->setFactory(PROTOTYPE_ASSET, [factory](assets::Loader* loader, const assets::AssetGUID &a, assets::AssetData b, void* ptr) {
-				return load_prototype(loader, factory, a, b);
+				EntityFactory* facPtr = factory;
+				if ( ptr != nullptr ) {
+					facPtr = (EntityFactory*)ptr;
+				}
+				return load_prototype(loader, a, b, facPtr);
 			}, assets::LoadType::PATH);
 			assetLoader->setFactory(SCENE, load_scene, assets::LoadType::PATH);
 

include/fggl/entity/loader/loader.hpp

@@ -173,7 +173,7 @@ namespace fggl::entity {
 			}
 	};
 
-	assets::AssetRefRaw load_prototype(assets::Loader* loader, EntityFactory *factory, const assets::AssetGUID &guid, assets::AssetData data);
+	assets::AssetRefRaw load_prototype(assets::Loader* loader, const assets::AssetGUID &guid, assets::AssetData data, EntityFactory* factory);
 	assets::AssetRefRaw load_scene(assets::Loader* loader, const assets::AssetGUID& asset, assets::AssetData data, void* ptr);
 
 } // namespace fggl::entity