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

merge from development

Browse Source 
Signed-off-by: greerdv <greerdv@amazon.com>
This commit is contained in:
greerdv
2021-08-06 11:06:32 +01:00
parent 0f58d7394e 9612fe3def
commit 7ec3283a3e
301 changed files with 987 additions and 1055 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothColliders.cpp
+4 -4
View File
@@ -112,7 +112,7 @@ namespace NvCloth
colliderConfig.get(),
static_cast<const Physics::SphereShapeConfiguration*>(shapeConfigPair.second.get()),
static_cast<int>(jointIndex),
sphereCount);
static_cast<int>(sphereCount));
sphereColliders.push_back(sphereCollider);
++sphereCount;
@@ -144,9 +144,9 @@ namespace NvCloth
colliderConfig.get(),
static_cast<const Physics::CapsuleShapeConfiguration*>(shapeConfigPair.second.get()),
static_cast<int>(jointIndex),
capsuleCount * 2, // Each capsule holds 2 sphere indices
sphereCount + 0, // First sphere index
sphereCount + 1); // Second sphere index
static_cast<int>(capsuleCount * 2), // Each capsule holds 2 sphere indices
static_cast<int>(sphereCount + 0), // First sphere index
static_cast<int>(sphereCount + 1)); // Second sphere index
capsuleColliders.push_back(capsuleCollider);
++capsuleCount;
Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothSkinning.cpp
+2 -2
View File
@@ -481,13 +481,13 @@ namespace NvCloth
if (remappedIndex >= 0)
{
actorClothSkinning->m_simulatedVertices[remappedIndex] = vertexIndex;
actorClothSkinning->m_simulatedVertices[remappedIndex] = static_cast<AZ::u32>(vertexIndex);
}
if (remappedIndex < 0 ||
originalMeshParticles[vertexIndex].GetW() == 0.0f)
{
actorClothSkinning->m_nonSimulatedVertices.emplace_back(vertexIndex);
actorClothSkinning->m_nonSimulatedVertices.emplace_back(static_cast<AZ::u32>(vertexIndex));
}
}
actorClothSkinning->m_nonSimulatedVertices.shrink_to_fit();
Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ClothComponentMesh.cpp
+1 -1
View File
@@ -556,7 +556,7 @@ namespace NvCloth
for (size_t index = 0; index < numVertices; ++index)
{
const int renderVertexIndex = firstVertex + index;
const int renderVertexIndex = static_cast<int>(firstVertex + index);
const SimParticleFormat& renderParticle = renderParticles[renderVertexIndex];
destVerticesBuffer[index].Set(