allow overriding asset schemes

Author: malytomas

sources/include/cage-core/assetsManager.h

@@ -14,7 +14,12 @@ namespace cage
 		template<uint32 Scheme, class T>
 		void defineScheme(const AssetsScheme &value)
 		{
-			defineScheme_(detail::typeHash<T>(), Scheme, value);
+			defineScheme_(detail::typeHash<T>(), Scheme, value, false);
+		}
+		template<uint32 Scheme, class T>
+		void defineSchemeOverride(const AssetsScheme &value)
+		{
+			defineScheme_(detail::typeHash<T>(), Scheme, value, true);
 		}
 
 		// begin thread-safe methods
@@ -62,7 +67,7 @@ namespace cage
 		EventDispatcher<bool(uint32 requestId, String &foundName, Holder<File> &foundFile)> findAsset; // this event is called from loading threads
 
 	private:
-		void defineScheme_(uint32 typeHash, uint32 scheme, const AssetsScheme &value);
+		void defineScheme_(uint32 typeHash, uint32 scheme, const AssetsScheme &value, bool allowOverride);
 		void load_(uint32 scheme, uint32 assetId, const String &textId, Holder<void> &&value);
 		void load_(uint32 scheme, uint32 assetId, const String &textId, const AssetsScheme &customScheme, Holder<void> &&customData);
 		Holder<void> get_(uint32 scheme, uint32 assetId) const;

sources/libcore/assets/assetsManager.cpp

@@ -700,14 +700,17 @@ namespace cage
 		return impl->workingCounter == 0 && impl->existsCounter == 0;
 	}
 
-	void AssetsManager::defineScheme_(uint32 typeHash, uint32 scheme, const AssetsScheme &value)
+	void AssetsManager::defineScheme_(uint32 typeHash, uint32 scheme, const AssetsScheme &value, bool allowOverride)
 	{
 		AssetsManagerImpl *impl = (AssetsManagerImpl *)this;
 		CAGE_ASSERT(typeHash != m);
 		CAGE_ASSERT(scheme < impl->schemes.size());
 		CAGE_ASSERT(value.typeHash == typeHash);
 		CAGE_ASSERT(value.threadIndex == m || value.threadIndex < impl->customProcessingQueues.size());
-		CAGE_ASSERT(impl->schemes[scheme].typeHash == m); // the scheme was not defined previously
+		if (!allowOverride)
+		{
+			CAGE_ASSERT(impl->schemes[scheme].typeHash == m); // the scheme was not defined previously
+		}
 		impl->schemes[scheme] = value;
 	}
 

sources/libengine/assets/model.cpp

@@ -12,7 +12,7 @@ namespace cage
 	{
 		void processLoad(AssetContext *context)
 		{
-			Holder<Model> msh = newModel();
+			Holder<Model> model = newModel();
 
 			Deserializer des(context->originalData);
 			ModelHeader data;
@@ -22,31 +22,31 @@ namespace cage
 			mat.resize(data.materialSize);
 			des.read(mat);
 
-			Holder<Mesh> poly = newMesh();
-			poly->importBuffer(des.read(des.available()));
+			Holder<Mesh> mesh = newMesh();
+			mesh->importBuffer(des.read(des.available()));
 
-			msh->importMesh(+poly, mat);
-			msh->setBoundingBox(data.box);
+			model->importMesh(+mesh, mat);
+			model->setBoundingBox(data.box);
 
-			msh->importTransform = data.importTransform;
+			model->importTransform = data.importTransform;
 			for (int i = 0; i < MaxTexturesCountPerMaterial; i++)
-				msh->textureNames[i] = data.textureNames[i];
-			msh->shaderName = data.shaderName;
-			msh->flags = data.renderFlags;
-			msh->layer = data.renderLayer;
-			msh->bones = data.skeletonBones;
+				model->textureNames[i] = data.textureNames[i];
+			model->shaderName = data.shaderName;
+			model->flags = data.renderFlags;
+			model->layer = data.renderLayer;
+			model->bones = data.skeletonBones;
 
-			msh->setDebugName(context->textId); // last command to apply it to all subresources
+			model->setDebugName(context->textId); // last command to apply it to all subresources
 
-			context->assetHolder = std::move(msh).cast<void>();
+			context->assetHolder = std::move(model).cast<void>();
 		}
 	}
 
 	AssetsScheme genAssetSchemeModel(uint32 threadIndex)
 	{
 		AssetsScheme s;
 		s.threadIndex = threadIndex;
-		s.load.bind<&processLoad>();
+		s.load.bind<processLoad>();
 		s.typeHash = detail::typeHash<Model>();
 		return s;
 	}