some cleanup

This commit is contained in:
mnaumov
2021-06-08 19:35:40 -07:00
parent 672b9fd956
commit 2923d8b962
5 changed files with 12 additions and 19 deletions
@@ -211,21 +211,17 @@ namespace AZ
void EditorMeshComponent::OnModelReady(const Data::Asset<RPI::ModelAsset>& /*modelAsset*/, const Data::Instance<RPI::Model>& /*model*/)
{
m_stats.m_meshStatsForLod.clear();
if (m_controller.GetConfiguration().IsAssetSet())
for (auto& lod : m_controller.GetConfiguration().m_modelAsset->GetLodAssets())
{
auto lods = m_controller.GetConfiguration().m_modelAsset->GetLodAssets();
for (auto& lod : lods)
EditorMeshStatsForLod stats;
auto meshes = lod->GetMeshes();
stats.m_meshCount = lod->GetMeshes().size();
for (auto& mesh : meshes)
{
EditorMeshStatsForLod stats;
auto meshes = lod->GetMeshes();
stats.m_meshCount = lod->GetMeshes().size();
for (auto& mesh : meshes)
{
stats.m_vertCount += mesh.GetVertexCount();
stats.m_triCount += mesh.GetIndexCount() / 3;
}
m_stats.m_meshStatsForLod.push_back(stats);
stats.m_vertCount += mesh.GetVertexCount();
stats.m_triCount += mesh.GetIndexCount() / 3;
}
m_stats.m_meshStatsForLod.push_back(stats);
}
m_stats.UpdateStringRepresentation();
@@ -34,7 +34,6 @@ namespace AZ
, private AzToolsFramework::EditorComponentSelectionRequestsBus::Handler
, private AzFramework::EntityDebugDisplayEventBus::Handler
, private MeshComponentNotificationBus::Handler
, private Data::AssetBus::Handler
{
public:
using BaseClass = EditorRenderComponentAdapter<MeshComponentController, MeshComponent, MeshComponentConfig>;
@@ -74,6 +73,7 @@ namespace AZ
// Flag used for button placement
bool m_addMaterialComponentFlag = false;
// Stats for current mesh asset
EditorMeshStats m_stats;
};
} // namespace Render
@@ -26,7 +26,6 @@ namespace AZ
AZ_RTTI(EditorMeshStatsForLod, "{626E3AEB-0F7A-4777-BAF1-2BBA8C1857ED}");
AZ_CLASS_ALLOCATOR(EditorMeshStatsForLod, SystemAllocator, 0);
int m_meshCount = 0;
int m_vertCount = 0;
int m_triCount = 0;
@@ -38,11 +37,9 @@ namespace AZ
AZ_CLASS_ALLOCATOR(EditorMeshStats, SystemAllocator, 0);
static void Reflect(ReflectContext* context);
AZStd::vector<EditorMeshStatsForLod> m_meshStatsForLod;
void UpdateStringRepresentation();
AZStd::vector<EditorMeshStatsForLod> m_meshStatsForLod;
AZStd::string m_stringRepresentation = {};
};
} // namespace Render
@@ -49,7 +49,7 @@ namespace AZ
}
}
bool MeshComponentConfig::IsAssetSet() const
bool MeshComponentConfig::IsAssetSet()
{
return m_modelAsset.GetId().IsValid();
}
@@ -44,7 +44,7 @@ namespace AZ
static void Reflect(AZ::ReflectContext* context);
// Editor helper functions
bool IsAssetSet() const;
bool IsAssetSet();
AZStd::vector<AZStd::pair<RPI::Cullable::LodOverride, AZStd::string>> GetLodOverrideValues();
Data::Asset<RPI::ModelAsset> m_modelAsset = { AZ::Data::AssetLoadBehavior::QueueLoad };