sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Utility: Replace Skin* by SkinLinearBlend function

This commit is contained in:
SirLynix 2022-05-10 18:02:19 +02:00 committed by Jérôme Leclercq
parent e5e3026005
commit a7ab2fbaf4
2 changed files with 61 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Utility/Algorithm.hpp
View File

@ -31,10 +31,14 @@ namespace Nz
{ {
const Joint* joints; const Joint* joints;
SparsePtr<const Vector3f> inputPositions; SparsePtr<const Vector3f> inputPositions;
SparsePtr<const Vector3f> inputNormals;
SparsePtr<const Vector3f> inputTangents;
SparsePtr<const Vector4i32> inputJointIndices; SparsePtr<const Vector4i32> inputJointIndices;
SparsePtr<const Vector4f> inputJointWeights; SparsePtr<const Vector4f> inputJointWeights;
SparsePtr<const Vector2f> inputUv; SparsePtr<const Vector2f> inputUv;
SparsePtr<Vector3f> outputNormals;
SparsePtr<Vector3f> outputPositions; SparsePtr<Vector3f> outputPositions;
SparsePtr<Vector3f> outputTangents;
SparsePtr<Vector2f> outputUv; SparsePtr<Vector2f> outputUv;
}; };
@ -64,9 +68,7 @@ namespace Nz
NAZARA_UTILITY_API void OptimizeIndices(IndexIterator indices, UInt64 indexCount); NAZARA_UTILITY_API void OptimizeIndices(IndexIterator indices, UInt64 indexCount);
NAZARA_UTILITY_API void SkinPosition(const SkinningData& data, UInt64 startVertex, UInt64 vertexCount); NAZARA_UTILITY_API void SkinLinearBlend(const SkinningData& data, UInt64 startVertex, UInt64 vertexCount);
NAZARA_UTILITY_API void SkinPositionNormal(const SkinningData& data, UInt64 startVertex, UInt64 vertexCount);
NAZARA_UTILITY_API void SkinPositionNormalTangent(const SkinningData& data, UInt64 startVertex, UInt64 vertexCount);
inline Vector3f TransformPositionTRS(const Vector3f& transformTranslation, const Quaternionf& transformRotation, const Vector3f& transformScale, const Vector3f& position); inline Vector3f TransformPositionTRS(const Vector3f& transformTranslation, const Quaternionf& transformRotation, const Vector3f& transformScale, const Vector3f& position);
inline Vector3f TransformNormalTRS(const Quaternionf& transformRotation, const Vector3f& transformScale, const Vector3f& normal); inline Vector3f TransformNormalTRS(const Quaternionf& transformRotation, const Vector3f& transformScale, const Vector3f& normal);

111
src/Nazara/Utility/AlgorithmUtility.cpp
View File

@ -1065,30 +1065,61 @@ namespace Nz
/************************************Skin***********************************/ /************************************Skin***********************************/
void SkinPosition(const SkinningData& skinningInfos, UInt64 startVertex, UInt64 vertexCount) void SkinLinearBlend(const SkinningData& skinningInfos, UInt64 startVertex, UInt64 vertexCount)
{ {
NazaraAssert(skinningInfos.inputJointIndices, "missing input joint indices"); NazaraAssert(skinningInfos.inputJointIndices, "missing input joint indices");
NazaraAssert(skinningInfos.inputJointWeights, "missing input joint weights"); NazaraAssert(skinningInfos.inputJointWeights, "missing input joint weights");
UInt64 endVertex = startVertex + vertexCount - 1; UInt64 endVertex = startVertex + vertexCount - 1;
if (skinningInfos.outputPositions) if (skinningInfos.outputPositions || skinningInfos.outputNormals || skinningInfos.outputTangents)
{ {
NazaraAssert(skinningInfos.inputPositions, "missing input positions");
NazaraAssert(skinningInfos.joints, "missing skeleton joints"); NazaraAssert(skinningInfos.joints, "missing skeleton joints");
if (skinningInfos.outputPositions)
NazaraAssert(skinningInfos.inputPositions, "missing input positions");
if (skinningInfos.outputNormals)
NazaraAssert(skinningInfos.inputNormals, "missing input positions");
if (skinningInfos.outputTangents)
NazaraAssert(skinningInfos.inputTangents, "missing input positions");
bool hasPositions = skinningInfos.inputPositions && skinningInfos.outputPositions;
bool hasNormals = skinningInfos.inputNormals && skinningInfos.outputNormals;
bool hasTangents = skinningInfos.inputTangents && skinningInfos.outputTangents;
for (UInt64 i = startVertex; i <= endVertex; ++i) for (UInt64 i = startVertex; i <= endVertex; ++i)
{ {
Vector3f finalPosition(Vector3f::Zero()); Vector3f finalPosition = Vector3f::Zero();
Vector3f finalNormal = Vector3f::Zero();
Vector3f finalTangent = Vector3f::Zero();
for (Int32 j = 0; j < 4; ++j) for (Int32 j = 0; j < 4; ++j)
{ {
Matrix4f mat(skinningInfos.joints[skinningInfos.inputJointIndices[i][j]].GetSkinningMatrix()); Int32 jointIndex = skinningInfos.inputJointIndices[i][j];
Matrix4f mat = skinningInfos.joints[jointIndex].GetSkinningMatrix();
mat *= skinningInfos.inputJointWeights[i][j]; mat *= skinningInfos.inputJointWeights[i][j];
// Hopefully the branch predictor will help here
if (hasPositions)
finalPosition += mat.Transform(skinningInfos.inputPositions[i]); finalPosition += mat.Transform(skinningInfos.inputPositions[i]);
if (hasNormals)
finalNormal += mat.Transform(skinningInfos.inputNormals[i], 0.f);
if (hasTangents)
finalTangent += mat.Transform(skinningInfos.inputTangents[i], 0.f);
} }
if (hasPositions)
skinningInfos.outputPositions[i] = finalPosition; skinningInfos.outputPositions[i] = finalPosition;
if (hasNormals)
skinningInfos.outputNormals[i] = finalNormal.GetNormal();
if (hasTangents)
skinningInfos.outputTangents[i] = finalTangent.GetNormal();
} }
} }
@ -1101,69 +1132,31 @@ namespace Nz
} }
} }
void SkinPositionNormal(const SkinningData& skinningInfos, UInt64 startVertex, UInt64 vertexCount) /*********************************Transform*********************************/
{
/*const SkeletalMeshVertex* inputVertex = &skinningInfos.inputVertex[startVertex];
MeshVertex* outputVertex = &skinningInfos.outputVertex[startVertex];
UInt64 endVertex = startVertex + vertexCount - 1; void TransformVertices(VertexPointers vertexPointers, UInt64 vertexCount, const Matrix4f& matrix)
for (UInt64 i = startVertex; i <= endVertex; ++i)
{ {
Vector3f finalPosition(Vector3f::Zero()); if (vertexPointers.positionPtr)
Vector3f finalNormal(Vector3f::Zero());
for (Int32 j = 0; j < 4; ++j)
{ {
Matrix4f mat(skinningInfos.joints[inputVertex->jointIndexes[j]].GetSkinningMatrix()); for (UInt64 i = 0; i < vertexCount; ++i)
mat *= inputVertex->weights[j]; *vertexPointers.positionPtr++ = matrix.Transform(*vertexPointers.positionPtr);
finalPosition += mat.Transform(inputVertex->position);
finalNormal += mat.Transform(inputVertex->normal, 0.f);
} }
finalNormal.Normalize(); if (vertexPointers.normalPtr || vertexPointers.tangentPtr)
outputVertex->normal = finalNormal;
outputVertex->position = finalPosition;
outputVertex->uv = inputVertex->uv;
inputVertex++;
outputVertex++;
}*/
}
void SkinPositionNormalTangent(const SkinningData& skinningInfos, UInt64 startVertex, UInt64 vertexCount)
{ {
/*const SkeletalMeshVertex* inputVertex = &skinningInfos.inputVertex[startVertex]; Vector3f scale = matrix.GetScale();
MeshVertex* outputVertex = &skinningInfos.outputVertex[startVertex];
UInt64 endVertex = startVertex + vertexCount - 1; if (vertexPointers.normalPtr)
for (UInt64 i = startVertex; i <= endVertex; ++i)
{ {
Vector3f finalPosition(Vector3f::Zero()); for (UInt64 i = 0; i < vertexCount; ++i)
Vector3f finalNormal(Vector3f::Zero()); *vertexPointers.normalPtr++ = matrix.Transform(*vertexPointers.normalPtr, 0.f) / scale;
Vector3f finalTangent(Vector3f::Zero()); }
for (int j = 0; j < 4; ++j) if (vertexPointers.tangentPtr)
{ {
Matrix4f mat(skinningInfos.joints[inputVertex->jointIndexes[j]].GetSkinningMatrix()); for (UInt64 i = 0; i < vertexCount; ++i)
mat *= inputVertex->weights[j]; *vertexPointers.tangentPtr++ = matrix.Transform(*vertexPointers.tangentPtr, 0.f) / scale;
}
finalPosition += mat.Transform(inputVertex->position); }
finalNormal += mat.Transform(inputVertex->normal, 0.f);
finalTangent += mat.Transform(inputVertex->tangent, 0.f);
}
finalNormal.Normalize();
finalTangent.Normalize();
outputVertex->normal = finalNormal;
outputVertex->position = finalPosition;
outputVertex->tangent = finalTangent;
outputVertex->uv = inputVertex->uv;
inputVertex++;
outputVertex++;
}*/
} }
} }