add creation params and geoemtrycreator reference to IAssetLoaderOverride, also ecapsulate better

Author: devshgraphicsprogramming

include/nbl/asset/IAssetManager.h

@@ -122,7 +122,7 @@ class NBL_API2 IAssetManager : public core::IReferenceCounted
         explicit IAssetManager(core::smart_refctd_ptr<system::ISystem>&& system, core::smart_refctd_ptr<CCompilerSet>&& compilerSet = nullptr) :
             m_system(std::move(system)),
             m_compilerSet(std::move(compilerSet)),
-            m_defaultLoaderOverride(this)
+            m_defaultLoaderOverride({.manager=this})
         {
             assert(IPreHashed::INVALID_HASH == static_cast<core::blake3_hash_t>(core::blake3_hasher{}));
             initializeMeshTools();

include/nbl/asset/interchange/IAssetLoader.h

@@ -11,6 +11,7 @@
 #include "nbl/system/ILogger.h"
 
 #include "nbl/asset/interchange/SAssetBundle.h"
+#include "nbl/asset/utils/CGeometryCreator.h"
 
 
 namespace nbl::asset
@@ -171,14 +172,35 @@ class NBL_API2 IAssetLoader : public virtual core::IReferenceCounted
 			protected:
 				constexpr static inline bool ASSET_MUTABILITY_ON_CACHE_INSERT = true;
 
-				IAssetManager* m_manager;
 				system::ISystem* m_system;
 
 			public:
-				NBL_API2 IAssetLoaderOverride(IAssetManager* _manager);
+				struct SCreationParams
+				{
+					IAssetManager* manager = nullptr;
+					core::smart_refctd_ptr<CGeometryCreator> geoCreator = nullptr;
+					//core::smart_refctd_ptr<CPolygonGeometryManipulator> polyGeoManip = nullptr;
+				};
+				NBL_API2 IAssetLoaderOverride(SCreationParams&& params);
+
+				//
+				inline IAssetManager* getManager() const {return m_creationParams.manager;}
 
 				//
-				inline IAssetManager* getManager() const {return m_manager;}
+				inline CGeometryCreator* getGeometryCreator()
+				{
+					if (!m_creationParams.geoCreator)
+						m_creationParams.geoCreator = core::make_smart_refctd_ptr<CGeometryCreator>();
+					return m_creationParams.geoCreator.get();
+				}
+
+				/*
+				inline CPolygonGeometryManipulator* getPolygonGeometryManipulator()
+				{
+					if (!m_creationParams.geoCreator)
+						m_creationParams.geoCreator = core::make_smart_refctd_ptr<CPolygonGeometryManipulator>();
+					return m_creationParams.polyGeoManip.get();
+				}*/
 
 				//!
 				template<class AssetT>
@@ -274,6 +296,9 @@ class NBL_API2 IAssetLoader : public virtual core::IReferenceCounted
 				//! After a successful load of an asset or sub-asset
 				//TODO change name
 				virtual void insertAssetIntoCache(SAssetBundle& asset, const std::string& supposedKey, const SAssetLoadParams& _params, const uint32_t hierarchyLevel);
+
+			private:
+				SCreationParams m_creationParams;
 		};
 
 	public:

src/nbl/asset/interchange/IAssetLoader.cpp

@@ -10,7 +10,7 @@ using namespace nbl::core;
 using namespace nbl::asset;
 
 // todo NEED DOCS
-IAssetLoader::IAssetLoaderOverride::IAssetLoaderOverride(IAssetManager* _manager) : m_manager(_manager), m_system(m_manager->getSystem())
+IAssetLoader::IAssetLoaderOverride::IAssetLoaderOverride(SCreationParams&& params) : m_creationParams(std::move(params))
 {
 }
 
@@ -20,19 +20,19 @@ SAssetBundle IAssetLoader::IAssetLoaderOverride::findCachedAsset(const std::stri
     if ((levelFlag & ECF_DUPLICATE_TOP_LEVEL) == ECF_DUPLICATE_TOP_LEVEL)
         return {};
 
-    auto found = m_manager->findAssets(inSearchKey, inAssetTypes);
+    auto found = getManager()->findAssets(inSearchKey, inAssetTypes);
     if (!found->size())
         return handleSearchFail(inSearchKey, ctx, hierarchyLevel);
     return chooseRelevantFromFound(found->begin(), found->end(), ctx, hierarchyLevel);
 }
 
 void IAssetLoader::IAssetLoaderOverride::insertAssetIntoCache(SAssetBundle& asset, const std::string& supposedKey, const SAssetLoadParams& _params, const uint32_t hierarchyLevel)
 {
-    m_manager->changeAssetKey(asset, supposedKey);
+	getManager()->changeAssetKey(asset, supposedKey);
 
     auto levelFlag = _params.cacheFlags >> (uint64_t(hierarchyLevel) * 2ull);
     if (!(levelFlag&ECF_DONT_CACHE_TOP_LEVEL))
-        m_manager->insertAssetIntoCache(asset,ASSET_MUTABILITY_ON_CACHE_INSERT);
+		getManager()->insertAssetIntoCache(asset,ASSET_MUTABILITY_ON_CACHE_INSERT);
 }
 
 SAssetBundle IAssetLoader::interm_getAssetInHierarchy(system::IFile* _file, const std::string& _supposedFilename, const IAssetLoader::SAssetLoadParams& _params, uint32_t _hierarchyLevel, IAssetLoader::IAssetLoaderOverride* _override)