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

Fix cloth editor component logic to keep the last known mesh node and restore it later.

Browse Source 
- Fix cloth editor component logic to keep the last known mesh node and restore it later.
- Fix cloth assets slices, materials were missing.
This commit is contained in:
Aaron Ruiz Mora
2021-04-26 15:49:44 +01:00
committed by GitHub
parent 3f32cc929c
commit fbfc2e4968
8 changed files with 53 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/NvCloth/Code/Source/Components/EditorClothComponent.cpp
+10 -5
View File
@@ -482,14 +482,14 @@ namespace NvCloth
{
bool foundNode = AZStd::find(m_meshNodeList.cbegin(), m_meshNodeList.cend(), m_config.m_meshNode) != m_meshNodeList.cend();
if (!foundNode && !m_previousMeshNode.empty())
if (!foundNode && !m_lastKnownMeshNode.empty())
{
// Check the if the mesh node previously selected is still part of the mesh list
// to keep using it and avoid the user to select it again in the combo box.
foundNode = AZStd::find(m_meshNodeList.cbegin(), m_meshNodeList.cend(), m_previousMeshNode) != m_meshNodeList.cend();
foundNode = AZStd::find(m_meshNodeList.cbegin(), m_meshNodeList.cend(), m_lastKnownMeshNode) != m_meshNodeList.cend();
if (foundNode)
{
m_config.m_meshNode = m_previousMeshNode;
m_config.m_meshNode = m_lastKnownMeshNode;
}
}
@@ -502,7 +502,7 @@ namespace NvCloth
}
}
m_previousMeshNode = "";
m_lastKnownMeshNode = "";
if (m_simulateInEditor)
{
@@ -517,7 +517,12 @@ namespace NvCloth
void EditorClothComponent::OnModelPreDestroy()
{
m_previousMeshNode = m_config.m_meshNode;
if (m_config.m_meshNode != Internal::StatusMessageSelectNode &&
m_config.m_meshNode != Internal::StatusMessageNoAsset &&
m_config.m_meshNode != Internal::StatusMessageNoClothNodes)
{
m_lastKnownMeshNode = m_config.m_meshNode;
}
m_meshNodeList = { {Internal::StatusMessageNoAsset} };
m_config.m_meshNode = Internal::StatusMessageNoAsset;