birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing the old hack code

Browse Source
This commit is contained in:
mriegger
2021-05-12 14:54:33 -07:00
parent 33f7da764e
commit 9b1f4c04e6
3 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp
+5 -13
View File
@@ -85,7 +85,6 @@ namespace AZ
m_decalData.Clear();
m_decalBufferHandler.Release();
m_materialAssets.clear();
}
DecalTextureArrayFeatureProcessor::DecalHandle DecalTextureArrayFeatureProcessor::AcquireDecal()
@@ -410,7 +409,7 @@ namespace AZ
int iter = m_textureArrayList.begin();
while (iter != -1)
{
const auto packedTexture = m_textureArrayList[iter].second.GetPackedTexture();
const auto& packedTexture = m_textureArrayList[iter].second.GetPackedTexture();
view->GetShaderResourceGroup()->SetImage(m_decalTextureArrayIndices[iter], packedTexture);
iter = m_textureArrayList.next(iter);
}
@@ -482,22 +481,15 @@ namespace AZ
return material;
}
void DecalTextureArrayFeatureProcessor::QueueMaterialLoadForDecal(const AZ::Data::AssetId material, const DecalHandle handle)
void DecalTextureArrayFeatureProcessor::QueueMaterialLoadForDecal(const AZ::Data::AssetId materialId, const DecalHandle handle)
{
// Note that another decal might have already queued this material for loading
if (m_materialLoadTracker.IsAssetLoading(material))
{
m_materialLoadTracker.TrackAssetLoad(handle, material);
return;
}
const auto materialAsset = QueueMaterialAssetLoad(materialId);
const auto materialAsset = QueueMaterialAssetLoad(material);
m_materialAssets.emplace(material, materialAsset);
m_materialLoadTracker.TrackAssetLoad(handle, material);
m_materialLoadTracker.TrackAssetLoad(handle, materialAsset);
if (materialAsset.IsLoading())
{
AZ::Data::AssetBus::MultiHandler::BusConnect(material);
AZ::Data::AssetBus::MultiHandler::BusConnect(materialId);
}
else if (materialAsset.IsReady())
{