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

Merge pull request #5897 from aws-lumberyard-dev/Atom/guthadam/fix_model_previews

Browse Source 
Fixed a bug with model previews and thumbnails.
This commit is contained in:
Guthrie Adams
2021-11-29 10:29:24 -06:00
committed by GitHub
parent cbb5179b4c 357648a424
commit ff631ac07c
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.cpp
+11 -6
View File
@@ -22,9 +22,9 @@ namespace AZ
{
namespace SharedPreviewUtils
{
AZStd::unordered_set<AZ::Uuid> GetSupportedAssetTypes()
AZStd::vector<AZ::Uuid> GetSupportedAssetTypes()
{
return { RPI::AnyAsset::RTTI_Type(), RPI::MaterialAsset::RTTI_Type(), RPI::ModelAsset::RTTI_Type() };
return { RPI::ModelAsset::RTTI_Type(), RPI::MaterialAsset::RTTI_Type(), RPI::AnyAsset::RTTI_Type() };
}
bool IsSupportedAssetType(AzToolsFramework::Thumbnailer::SharedThumbnailKey key)
@@ -46,11 +46,15 @@ namespace AZ
foundIt, &AzToolsFramework::AssetSystemRequestBus::Events::GetAssetsProducedBySourceUUID,
sourceKey->GetSourceUuid(), productsAssetInfo);
for (const auto& assetInfo : productsAssetInfo)
// Search the product assets for a matching asset type ID in the order of the supported type IDs, which are organized by priority
for (const auto& typeId : supportedTypeIds)
{
if (supportedTypeIds.find(assetInfo.m_assetType) != supportedTypeIds.end())
for (const auto& assetInfo : productsAssetInfo)
{
return assetInfo;
if (assetInfo.m_assetType == typeId)
{
return assetInfo;
}
}
}
return AZ::Data::AssetInfo();
@@ -59,7 +63,8 @@ namespace AZ
// if it's a product thumbnail key just return its assetId
AZ::Data::AssetInfo assetInfo;
auto productKey = azrtti_cast<const AzToolsFramework::AssetBrowser::ProductThumbnailKey*>(key.data());
if (productKey && supportedTypeIds.find(productKey->GetAssetType()) != supportedTypeIds.end())
if (productKey &&
AZStd::find(supportedTypeIds.begin(), supportedTypeIds.end(), productKey->GetAssetType()) != supportedTypeIds.end())
{
AZ::Data::AssetCatalogRequestBus::BroadcastResult(
assetInfo, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetInfoById, productKey->GetAssetId());
Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.h
+1 -1
View File
@@ -21,7 +21,7 @@ namespace AZ
namespace SharedPreviewUtils
{
//! Get the set of all asset types supported by the shared preview
AZStd::unordered_set<AZ::Uuid> GetSupportedAssetTypes();
AZStd::vector<AZ::Uuid> GetSupportedAssetTypes();
//! Determine if a thumbnail key has an asset supported by the shared preview
bool IsSupportedAssetType(AzToolsFramework::Thumbnailer::SharedThumbnailKey key);