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

Fixing cloth working with Actors by reading directly from ModelAsset instead from EMFX Mesh. (#235)

Browse Source 
- Fixing cloth working with Actors by reading directly from ModelAsset instead from EMFX Mesh.
- Actor caches map from joint indices in skin metadata to skeleton indices so they can be query later.
- Actor cloth skinning reads indices and weights from Model Asset instead from EMFX Mesh.
- Actor cloth skinning with unlimited skinning bones.
- Sort out cloth unit tests by disabling them until there is a way to create an Atom mesh
- Addressing feedback.
This commit is contained in:
Aaron Ruiz Mora
2021-04-23 19:46:57 +01:00
committed by GitHub
parent a4e1abf6df
commit 5fd8c35878
19 changed files with 191 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorAsset.cpp
+14 -33
View File
@@ -253,24 +253,10 @@ namespace AZ
}
}
// If there is cloth data, set all the blend weights to zero to indicate
// the vertices will be updated by cpu.
//
// [TODO ATOM-14478]
// At the moment blend weights is a shared buffer and therefore all
// instances of the actor asset will be affected by it. In the future
// this buffer will be unique per instance and modified by cloth component
// when necessary.
//
// [TODO LYN-1890]
// At the moment, if there is cloth data it is assumed that every vertex in the
// submesh will be simulated by cloth in cpu, so all the weights are set to zero.
// But once the blend weights buffer can be modified per instance, it will be set by
// the cloth component, which decides whether to control the whole submesh or
// to apply an additional simplification pass to remove static triangles from simulation.
// Static triangles are the ones that all its vertices won't move during simulation and
// therefore its weights won't be altered so they are controlled by GPU.
// This additional simplification has been disabled in ClothComponentMesh.cpp for now.
// [TODO ATOM-15288]
// Temporary workaround. If there is cloth data, set all the blend weights to zero to indicate
// the vertices will be updated by cpu. When meshes with cloth data are not dispatched for skinning
// this can be hasClothData can be removed.
// If there is no skinning info, default to 0 weights and display an error
if (hasClothData || !sourceSkinningInfo)
@@ -370,14 +356,6 @@ namespace AZ
AZ_Assert(modelLodAsset->GetMeshes().size() > 0, "ModelLod '%d' for model '%s' has 0 meshes", lodIndex, fullFileName.c_str());
const RPI::ModelLodAsset::Mesh& mesh0 = modelLodAsset->GetMeshes()[0];
// Get the amount of vertices and indices
// Get the meshes to process
bool hasUVs = false;
bool hasUVs2 = false;
bool hasTangents = false;
bool hasBitangents = false;
bool hasClothData = false;
// Do a pass over the lod to find the number of sub-meshes, the offset and size of each sub-mesh, and total number of vertices in the lod.
// These will be combined into one input buffer for the source actor, but these offsets and sizes will be used to create multiple sub-meshes for the target skinned actor
uint32_t lodVertexCount = 0;
@@ -416,18 +394,18 @@ namespace AZ
const AZ::Vector4* sourceTangents = static_cast<const AZ::Vector4*>(mesh->FindOriginalVertexData(EMotionFX::Mesh::ATTRIB_TANGENTS));
const AZ::Vector3* sourceBitangents = static_cast<const AZ::Vector3*>(mesh->FindOriginalVertexData(EMotionFX::Mesh::ATTRIB_BITANGENTS));
const AZ::Vector2* sourceUVs = static_cast<const AZ::Vector2*>(mesh->FindOriginalVertexData(EMotionFX::Mesh::ATTRIB_UVCOORDS, 0));
const AZ::Vector2* sourceUVs2 = static_cast<const AZ::Vector2*>(mesh->FindOriginalVertexData(EMotionFX::Mesh::ATTRIB_UVCOORDS, 1));
const uint32_t* sourceClothData = static_cast<uint32_t*>(mesh->FindOriginalVertexData(EMotionFX::Mesh::ATTRIB_CLOTH_DATA));
hasUVs = (sourceUVs != nullptr);
hasUVs2 = (sourceUVs2 != nullptr);
hasTangents = (sourceTangents != nullptr);
hasBitangents = (sourceBitangents != nullptr);
hasClothData = (sourceClothData != nullptr);
const bool hasUVs = (sourceUVs != nullptr);
const bool hasTangents = (sourceTangents != nullptr);
const bool hasBitangents = (sourceBitangents != nullptr);
// For each sub-mesh within each mesh, we want to create a separate sub-piece.
const size_t numSubMeshes = mesh->GetNumSubMeshes();
AZ_Assert(numSubMeshes == modelLodAsset->GetMeshes().size(),
"Number of submeshes (%d) in EMotionFX mesh (lod %d and joint index %d) doesn't match the number of meshes (%d) in model lod asset",
numSubMeshes, lodIndex, jointIndex, modelLodAsset->GetMeshes().size());
for (size_t subMeshIndex = 0; subMeshIndex < numSubMeshes; ++subMeshIndex)
{
const EMotionFX::SubMesh* subMesh = mesh->GetSubMesh(subMeshIndex);
@@ -466,6 +444,9 @@ namespace AZ
}
}
// Check if the model mesh asset has cloth data. One ModelLodAsset::Mesh corresponds to one EMotionFX::SubMesh.
const bool hasClothData = modelLodAsset->GetMeshes()[subMeshIndex].GetSemanticBufferAssetView(AZ::Name("CLOTH_DATA")) != nullptr;
ProcessSkinInfluences(mesh, subMesh, vertexBufferOffset, blendIndexBufferData, blendWeightBufferData, hasClothData);
// Increment offsets so that the next sub-mesh can start at the right place