asset manager validates asset ids

Author: malytomas

sources/libcore/assets/assetsManager.cpp

@@ -524,6 +524,7 @@ namespace cage
 
 	void AssetsManager::load(uint32 assetId)
 	{
+		CAGE_ASSERT(assetId != 0 && assetId != m);
 		AssetsManagerImpl *impl = (AssetsManagerImpl *)this;
 		ScopeLock lock(impl->privateMutex);
 		auto &c = impl->privateIndex[assetId];
@@ -538,6 +539,7 @@ namespace cage
 
 	void AssetsManager::unload(uint32 assetId)
 	{
+		CAGE_ASSERT(assetId != 0 && assetId != m);
 		AssetsManagerImpl *impl = (AssetsManagerImpl *)this;
 		ScopeLock lock(impl->privateMutex);
 		CAGE_ASSERT(impl->privateIndex.count(assetId) == 1);
@@ -555,6 +557,7 @@ namespace cage
 
 	void AssetsManager::reload(uint32 assetId)
 	{
+		CAGE_ASSERT(assetId != 0 && assetId != m);
 		AssetsManagerImpl *impl = (AssetsManagerImpl *)this;
 		ScopeLock lock(impl->privateMutex);
 		auto it = impl->privateIndex.find(assetId);
@@ -698,6 +701,7 @@ namespace cage
 
 	void AssetsManager::load_(uint32 scheme, uint32 assetId, const String &textId, Holder<void> &&value)
 	{
+		CAGE_ASSERT(assetId != 0 && assetId != m);
 		AssetsManagerImpl *impl = (AssetsManagerImpl *)this;
 		CAGE_ASSERT(scheme < impl->schemes.size());
 		ScopeLock lock(impl->privateMutex);
@@ -711,6 +715,7 @@ namespace cage
 
 	void AssetsManager::load_(uint32 scheme, uint32 assetId, const String &textId, const AssetsScheme &customScheme, Holder<void> &&customData)
 	{
+		CAGE_ASSERT(assetId != 0 && assetId != m);
 		AssetsManagerImpl *impl = (AssetsManagerImpl *)this;
 		CAGE_ASSERT(scheme < impl->schemes.size());
 		CAGE_ASSERT(customScheme.threadIndex == m);
@@ -737,6 +742,7 @@ namespace cage
 
 	Holder<void> AssetsManager::get_(uint32 scheme, uint32 assetId) const
 	{
+		CAGE_ASSERT(assetId != 0 && assetId != m);
 		const AssetsManagerImpl *impl = (const AssetsManagerImpl *)this;
 		const auto &schemes = impl->schemes;
 		const auto &publicIndex = impl->publicIndex;

sources/libcore/assets/assetsOnDemand.cpp

@@ -100,6 +100,7 @@ namespace cage
 
 	Holder<void> AssetsOnDemand::get_(uint32 scheme, uint32 assetId, bool autoLoad)
 	{
+		CAGE_ASSERT(assetId != 0 && assetId != m);
 		AssetOnDemandImpl *impl = (AssetOnDemandImpl *)this;
 		auto r = impl->assets->get_(scheme, assetId);
 		impl->update(!!r, assetId, autoLoad);

sources/libengine/graphics/renderPipeline.cpp

@@ -453,27 +453,28 @@ namespace cage
 				for (uint32 i = 0; i < MaxTexturesCountPerMaterial; i++)
 				{
 					const uint32 n = sh.mesh->textureNames[i];
+					if (n == 0)
+						continue;
 					textures[i] = assets->get<AssetSchemeIndexTexture, Texture>(n);
-					if (textures[i])
+					if (!textures[i])
+						continue;
+					if (i < 3)
 					{
-						if (i < 3)
+						switch (textures[i]->target())
 						{
-							switch (textures[i]->target())
-							{
-								case GL_TEXTURE_2D_ARRAY:
-									renderQueue->bind(textures[i], CAGE_SHADER_TEXTURE_ALBEDO_ARRAY + i);
-									break;
-								case GL_TEXTURE_CUBE_MAP:
-									renderQueue->bind(textures[i], CAGE_SHADER_TEXTURE_ALBEDO_CUBE + i);
-									break;
-								default:
-									renderQueue->bind(textures[i], CAGE_SHADER_TEXTURE_ALBEDO + i);
-									break;
-							}
+							case GL_TEXTURE_2D_ARRAY:
+								renderQueue->bind(textures[i], CAGE_SHADER_TEXTURE_ALBEDO_ARRAY + i);
+								break;
+							case GL_TEXTURE_CUBE_MAP:
+								renderQueue->bind(textures[i], CAGE_SHADER_TEXTURE_ALBEDO_CUBE + i);
+								break;
+							default:
+								renderQueue->bind(textures[i], CAGE_SHADER_TEXTURE_ALBEDO + i);
+								break;
 						}
-						else
-							renderQueue->bind(textures[i], CAGE_SHADER_TEXTURE_CUSTOM);
 					}
+					else
+						renderQueue->bind(textures[i], CAGE_SHADER_TEXTURE_CUSTOM);
 				}
 				updateShaderRoutinesForTextures(textures, uniOptions);
 

sources/libengine/gui/items.cpp

@@ -371,7 +371,8 @@ namespace cage
 	void ImageItem::assign(const GuiImageComponent &value)
 	{
 		image = value;
-		texture = hierarchy->impl->assetOnDemand->get<AssetSchemeIndexTexture, Texture>(value.textureName);
+		if (value.textureName)
+			texture = hierarchy->impl->assetOnDemand->get<AssetSchemeIndexTexture, Texture>(value.textureName);
 	}
 
 	void ImageItem::apply(const GuiImageFormatComponent &f)