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

Cloth will override all the vertices of the mesh and do CPU skinning on the non-simulated vertices when the optimization 'remove static particles' is enabled

Browse Source
This commit is contained in:
Aaron Ruiz Mora
2021-04-27 10:00:27 +01:00
committed by GitHub
parent cfc09ccfb7
commit c415fcc0b4
6 changed files with 179 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothComponentMesh.cpp
+23 -26
View File
@@ -166,6 +166,13 @@ namespace NvCloth
// Initialize render data
m_renderDataBufferIndex = 0;
{
auto& renderData = GetRenderData();
renderData.m_particles = m_meshClothInfo.m_particles;
renderData.m_tangents = m_meshClothInfo.m_tangents;
renderData.m_bitangents = m_meshClothInfo.m_bitangents;
renderData.m_normals = m_meshClothInfo.m_normals;
}
UpdateRenderData(m_cloth->GetParticles());
// Copy the first initialized element to the rest of the buffer
for (AZ::u32 i = 1; i < RenderDataBufferSize; ++i)
@@ -177,7 +184,7 @@ namespace NvCloth
m_actorClothColliders = ActorClothColliders::Create(m_entityId);
// It will return a valid instance if it's an actor with skinning data.
m_actorClothSkinning = ActorClothSkinning::Create(m_entityId, m_meshNodeInfo, m_cloth->GetParticles().size(), m_meshRemappedVertices);
m_actorClothSkinning = ActorClothSkinning::Create(m_entityId, m_meshNodeInfo, m_meshClothInfo.m_particles.size());
m_numberOfClothSkinningUpdates = 0;
m_clothConstraints = ClothConstraints::Create(
@@ -356,7 +363,7 @@ namespace NvCloth
{
// Update skinning for all particles and apply it to cloth
AZStd::vector<SimParticleFormat> particles = m_cloth->GetParticles();
m_actorClothSkinning->ApplySkinning(m_cloth->GetInitialParticles(), particles);
m_actorClothSkinning->ApplySkinning(m_cloth->GetInitialParticles(), particles, m_meshRemappedVertices);
m_cloth->SetParticles(AZStd::move(particles));
m_cloth->DiscardParticleDelta();
}
@@ -372,8 +379,8 @@ namespace NvCloth
if (m_actorClothSkinning)
{
m_actorClothSkinning->ApplySkinning(m_clothConstraints->GetMotionConstraints(), m_motionConstraints);
m_actorClothSkinning->ApplySkinning(m_clothConstraints->GetSeparationConstraints(), m_separationConstraints);
m_actorClothSkinning->ApplySkinning(m_clothConstraints->GetMotionConstraints(), m_motionConstraints, m_meshRemappedVertices);
m_actorClothSkinning->ApplySkinning(m_clothConstraints->GetSeparationConstraints(), m_separationConstraints, m_meshRemappedVertices);
}
m_cloth->GetClothConfigurator()->SetMotionConstraints(m_motionConstraints);
@@ -392,6 +399,14 @@ namespace NvCloth
return;
}
auto& renderData = GetRenderData();
if (m_config.m_removeStaticTriangles && m_actorClothSkinning)
{
// Apply skinning to the non-simulated part of the mesh.
m_actorClothSkinning->ApplySkinninOnRemovedVertices(m_meshClothInfo, renderData, m_meshRemappedVertices);
}
// Calculate normals of the cloth particles (simplified mesh).
AZStd::vector<AZ::Vector3> normals;
[[maybe_unused]] bool normalsCalculated =
@@ -401,19 +416,10 @@ namespace NvCloth
// Copy particles and normals to render data.
// Since cloth's vertices were welded together,
// the full mesh will result in smooth normals.
auto& renderData = GetRenderData();
renderData.m_particles.resize_no_construct(m_meshRemappedVertices.size());
renderData.m_normals.resize_no_construct(m_meshRemappedVertices.size());
for (size_t index = 0; index < m_meshRemappedVertices.size(); ++index)
{
const int remappedIndex = m_meshRemappedVertices[index];
if (remappedIndex < 0)
{
// Removed particle. Assign initial values to have something valid during tangents and bitangents calculation.
renderData.m_particles[index] = m_meshClothInfo.m_particles[index];
renderData.m_normals[index] = AZ::Vector3::CreateAxisZ();
}
else
if (remappedIndex >= 0)
{
renderData.m_particles[index] = particles[remappedIndex];
renderData.m_normals[index] = normals[remappedIndex];
@@ -505,8 +511,8 @@ namespace NvCloth
}
const AZ::RPI::ModelLodAsset::Mesh& subMesh = modelLodAsset->GetMeshes()[subMeshInfo.m_primitiveIndex];
int numVertices = subMeshInfo.m_numVertices;
int firstVertex = subMeshInfo.m_verticesFirstIndex;
const int numVertices = subMeshInfo.m_numVertices;
const int firstVertex = subMeshInfo.m_verticesFirstIndex;
if (subMesh.GetVertexCount() != numVertices)
{
AZ_Error("ClothComponentMesh", false,
@@ -540,12 +546,6 @@ namespace NvCloth
{
const int renderVertexIndex = firstVertex + index;
if (m_meshRemappedVertices[renderVertexIndex] < 0)
{
// Removed particle from simulation
continue;
}
const SimParticleFormat& renderParticle = renderParticles[renderVertexIndex];
destVerticesBuffer[index].Set(
renderParticle.GetX(),
@@ -604,10 +604,7 @@ namespace NvCloth
m_meshClothInfo.m_particles, m_meshClothInfo.m_indices,
meshSimplifiedParticles, meshSimplifiedIndices,
m_meshRemappedVertices,
// [TODO LYN-1890]
// Since blend weights cannot be controlled per instance with Atom,
// this additional mesh optimization is not possible at the moment.
false /*m_config.m_removeStaticTriangles*/);
m_config.m_removeStaticTriangles);
if (meshSimplifiedParticles.empty() ||
meshSimplifiedIndices.empty())
{