|
@@ -883,7 +883,7 @@ namespace AZ
|
|
processedMorphTargets = true;
|
|
processedMorphTargets = true;
|
|
}
|
|
}
|
|
|
|
|
|
- totalVertexCount += vertexCount;
|
|
|
|
|
|
+ totalVertexCount += static_cast<uint32_t>(vertexCount);
|
|
productMeshList.emplace_back(productMesh);
|
|
productMeshList.emplace_back(productMesh);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -961,7 +961,7 @@ namespace AZ
|
|
for (const auto& skinData : sourceMesh.m_skinData)
|
|
for (const auto& skinData : sourceMesh.m_skinData)
|
|
{
|
|
{
|
|
const size_t numJoints = skinData->GetBoneCount();
|
|
const size_t numJoints = skinData->GetBoneCount();
|
|
- const AZ::u32 controlPointIndex = sourceMeshData->GetControlPointIndex(vertexIndex);
|
|
|
|
|
|
+ const AZ::u32 controlPointIndex = sourceMeshData->GetControlPointIndex(static_cast<int>(vertexIndex));
|
|
const size_t numSkinInfluences = skinData->GetLinkCount(controlPointIndex);
|
|
const size_t numSkinInfluences = skinData->GetLinkCount(controlPointIndex);
|
|
|
|
|
|
size_t numInfluencesExcess = 0;
|
|
size_t numInfluencesExcess = 0;
|
|
@@ -1196,15 +1196,15 @@ namespace AZ
|
|
mesh.m_skinWeights.size(), m_numSkinJointInfluencesPerVertex, m_numSkinJointInfluencesPerVertex);
|
|
mesh.m_skinWeights.size(), m_numSkinJointInfluencesPerVertex, m_numSkinJointInfluencesPerVertex);
|
|
const size_t numSkinInfluences = mesh.m_skinWeights.size();
|
|
const size_t numSkinInfluences = mesh.m_skinWeights.size();
|
|
|
|
|
|
- uint32_t jointIndicesSizeInBytes = numSkinInfluences * sizeof(uint16_t);
|
|
|
|
|
|
+ uint32_t jointIndicesSizeInBytes = static_cast<uint32_t>(numSkinInfluences * sizeof(uint16_t));
|
|
meshView.m_skinJointIndicesView = RHI::BufferViewDescriptor::CreateRaw(0, jointIndicesSizeInBytes);
|
|
meshView.m_skinJointIndicesView = RHI::BufferViewDescriptor::CreateRaw(0, jointIndicesSizeInBytes);
|
|
- meshView.m_skinWeightsView = RHI::BufferViewDescriptor::CreateTyped(0, numSkinInfluences, SkinWeightFormat);
|
|
|
|
|
|
+ meshView.m_skinWeightsView = RHI::BufferViewDescriptor::CreateTyped(0, static_cast<uint32_t>(numSkinInfluences), SkinWeightFormat);
|
|
}
|
|
}
|
|
|
|
|
|
if (!mesh.m_morphTargetVertexData.empty())
|
|
if (!mesh.m_morphTargetVertexData.empty())
|
|
{
|
|
{
|
|
const size_t numTotalVertices = mesh.m_morphTargetVertexData.size();
|
|
const size_t numTotalVertices = mesh.m_morphTargetVertexData.size();
|
|
- meshView.m_morphTargetVertexDataView = RHI::BufferViewDescriptor::CreateStructured(0, numTotalVertices, sizeof(PackedCompressedMorphTargetDelta));
|
|
|
|
|
|
+ meshView.m_morphTargetVertexDataView = RHI::BufferViewDescriptor::CreateStructured(0, static_cast<uint32_t>(numTotalVertices), sizeof(PackedCompressedMorphTargetDelta));
|
|
}
|
|
}
|
|
|
|
|
|
if (!mesh.m_clothData.empty())
|
|
if (!mesh.m_clothData.empty())
|
|
@@ -1359,8 +1359,8 @@ namespace AZ
|
|
const size_t numPrevSkinInfluences = lodBufferInfo.m_skinInfluencesCount;
|
|
const size_t numPrevSkinInfluences = lodBufferInfo.m_skinInfluencesCount;
|
|
const size_t numNewSkinInfluences = mesh.m_skinWeights.size();
|
|
const size_t numNewSkinInfluences = mesh.m_skinWeights.size();
|
|
|
|
|
|
- meshView.m_skinJointIndicesView = RHI::BufferViewDescriptor::CreateRaw(/*byteOffset=*/numPrevSkinInfluences * sizeof(uint16_t), numNewSkinInfluences * sizeof(uint16_t));
|
|
|
|
- meshView.m_skinWeightsView = RHI::BufferViewDescriptor::CreateTyped(/*elementOffset=*/numPrevSkinInfluences, numNewSkinInfluences, SkinWeightFormat);
|
|
|
|
|
|
+ meshView.m_skinJointIndicesView = RHI::BufferViewDescriptor::CreateRaw(/*byteOffset=*/ static_cast<uint32_t>(numPrevSkinInfluences * sizeof(uint16_t)), static_cast<uint32_t>(numNewSkinInfluences * sizeof(uint16_t)));
|
|
|
|
+ meshView.m_skinWeightsView = RHI::BufferViewDescriptor::CreateTyped(/*elementOffset=*/ static_cast<uint32_t>(numPrevSkinInfluences), static_cast<uint32_t>(numNewSkinInfluences), SkinWeightFormat);
|
|
|
|
|
|
lodBufferInfo.m_skinInfluencesCount += numNewSkinInfluences;
|
|
lodBufferInfo.m_skinInfluencesCount += numNewSkinInfluences;
|
|
}
|
|
}
|
|
@@ -1370,7 +1370,7 @@ namespace AZ
|
|
const size_t numPrevVertexDeltas = lodBufferInfo.m_morphTargetVertexDeltaCount;
|
|
const size_t numPrevVertexDeltas = lodBufferInfo.m_morphTargetVertexDeltaCount;
|
|
const size_t numNewVertexDeltas = mesh.m_morphTargetVertexData.size();
|
|
const size_t numNewVertexDeltas = mesh.m_morphTargetVertexData.size();
|
|
|
|
|
|
- meshView.m_morphTargetVertexDataView = RHI::BufferViewDescriptor::CreateStructured(/*elementOffset=*/numPrevVertexDeltas, numNewVertexDeltas, sizeof(PackedCompressedMorphTargetDelta));
|
|
|
|
|
|
+ meshView.m_morphTargetVertexDataView = RHI::BufferViewDescriptor::CreateStructured(/*elementOffset=*/ static_cast<uint32_t>(numPrevVertexDeltas), static_cast<uint32_t>(numNewVertexDeltas), sizeof(PackedCompressedMorphTargetDelta));
|
|
|
|
|
|
lodBufferInfo.m_morphTargetVertexDeltaCount += numNewVertexDeltas;
|
|
lodBufferInfo.m_morphTargetVertexDeltaCount += numNewVertexDeltas;
|
|
}
|
|
}
|