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

Integrating github/staging through commit b0dd7ed

Browse Source
This commit is contained in:
alexpete
2021-04-09 12:03:26 -07:00
parent 1044dc3da1
commit c5b955d281
180 changed files with 6416 additions and 1850 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/NvCloth/Code/Source/Components/ClothComponent.cpp
+1 -4
View File
@@ -70,9 +70,6 @@ namespace NvCloth
const AZ::Data::Asset<AZ::RPI::ModelAsset>& asset,
[[maybe_unused]] const AZ::Data::Instance<AZ::RPI::Model>& model)
{
// [TODO LYN-1886] Remove this call once OnModelDestroyed is part of MeshComponentNotificationBus
OnModelDestroyed();
if (!asset.IsReady())
{
return;
@@ -81,7 +78,7 @@ namespace NvCloth
m_clothComponentMesh = AZStd::make_unique<ClothComponentMesh>(GetEntityId(), m_config);
}
void ClothComponent::OnModelDestroyed()
void ClothComponent::OnModelPreDestroy()
{
m_clothComponentMesh.reset();
}
Gems/NvCloth/Code/Source/Components/ClothComponent.h
+1 -1
View File
@@ -48,7 +48,7 @@ namespace NvCloth
// AZ::Render::MeshComponentNotificationBus::Handler overrides ...
void OnModelReady(const AZ::Data::Asset<AZ::RPI::ModelAsset>& modelAsset, const AZ::Data::Instance<AZ::RPI::Model>& model) override;
void OnModelDestroyed(); // [TODO LYN-1886] Add override once it's part of MeshComponentNotificationBus
void OnModelPreDestroy() override;
private:
ClothConfiguration m_config;
Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp
+2 -5
View File
@@ -443,16 +443,13 @@ namespace NvCloth
AzToolsFramework::Components::EditorComponentBase::Deactivate();
m_clothComponentMesh.reset();
OnModelPreDestroy();
}
void EditorClothComponent::OnModelReady(
const AZ::Data::Asset<AZ::RPI::ModelAsset>& asset,
[[maybe_unused]] const AZ::Data::Instance<AZ::RPI::Model>& model)
{
// [TODO LYN-1886] Remove this call once OnModelDestroyed is part of MeshComponentNotificationBus
OnModelDestroyed();
if (!asset.IsReady())
{
return;
@@ -518,7 +515,7 @@ namespace NvCloth
AzToolsFramework::Refresh_EntireTree);
}
void EditorClothComponent::OnModelDestroyed()
void EditorClothComponent::OnModelPreDestroy()
{
m_previousMeshNode = m_config.m_meshNode;
Gems/NvCloth/Code/Source/Components/EditorClothComponent.h
+1 -1
View File
@@ -52,7 +52,7 @@ namespace NvCloth
// AZ::Render::MeshComponentNotificationBus::Handler overrides ...
void OnModelReady(const AZ::Data::Asset<AZ::RPI::ModelAsset>& modelAsset, const AZ::Data::Instance<AZ::RPI::Model>& model) override;
void OnModelDestroyed(); // [TODO LYN-1886] Add override once it's part of MeshComponentNotificationBus
void OnModelPreDestroy() override;
private:
bool IsSimulatedInEditor() const;