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

SkeletalMesh::Skin now use threads 

Former-commit-id: 4b26b3e1950548887f0a7d246864a968688ca0b4
This commit is contained in:
Lynix 2013-01-29 02:01:28 +01:00
parent 56e66673d9
commit 3409461c39
3 changed files with 132 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/Nazara/Utility/Config.hpp
View File

@ -35,6 +35,9 @@
// Utilise un tracker pour repérer les éventuels leaks (Ralentit l'exécution) // Utilise un tracker pour repérer les éventuels leaks (Ralentit l'exécution)
#define NAZARA_UTILITY_MEMORYLEAKTRACKER 0 #define NAZARA_UTILITY_MEMORYLEAKTRACKER 0
// Le skinning doit-il prendre avantage du multi-threading ? (Boost de performances sur les processeurs multi-coeurs)
#define NAZARA_UTILITY_MULTITHREADED_SKINNING 1
// Active les tests de sécurité basés sur le code (Conseillé pour le développement) // Active les tests de sécurité basés sur le code (Conseillé pour le développement)
#define NAZARA_UTILITY_SAFE 1 #define NAZARA_UTILITY_SAFE 1

153
src/Nazara/Utility/SkeletalMesh.cpp
View File

@ -3,13 +3,116 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Utility/SkeletalMesh.hpp> #include <Nazara/Utility/SkeletalMesh.hpp>
#include <Nazara/Core/TaskScheduler.hpp>
#include <Nazara/Utility/BufferMapper.hpp> #include <Nazara/Utility/BufferMapper.hpp>
#include <Nazara/Utility/Config.hpp>
#include <Nazara/Utility/Mesh.hpp> #include <Nazara/Utility/Mesh.hpp>
#include <Nazara/Utility/Skeleton.hpp> #include <Nazara/Utility/Skeleton.hpp>
#include <Nazara/Utility/VertexStruct.hpp> #include <Nazara/Utility/VertexStruct.hpp>
#include <vector> #include <vector>
#include <Nazara/Utility/Debug.hpp> #include <Nazara/Utility/Debug.hpp>
namespace
{
struct SkinningInfos
{
const NzJoint* joints;
const NzWeight* weights;
};
void Skin_Position(const SkinningInfos& skinningInfos, NzMeshVertex* inputVertex, NzMeshVertex* outputVertex, const NzVertexWeight* vertexWeights, unsigned int vertexCount)
{
for (unsigned int i = 0; i < vertexCount; ++i)
{
NzVector3f finalPosition(NzVector3f::Zero());
unsigned int weightCount = vertexWeights[i].weights.size();
for (unsigned int j = 0; j < weightCount; ++j)
{
const NzWeight& weight = skinningInfos.weights[vertexWeights[i].weights[j]];
NzMatrix4f mat(skinningInfos.joints[weight.jointIndex].GetInverseBindMatrix());
mat.ConcatenateAffine(skinningInfos.joints[weight.jointIndex].GetTransformMatrix());
mat *= weight.weight;
finalPosition += mat.Transform(inputVertex->position);
}
outputVertex->position = finalPosition;
outputVertex->uv = inputVertex->uv;
inputVertex++;
outputVertex++;
}
}
void Skin_PositionNormal(const SkinningInfos& skinningInfos, NzMeshVertex* inputVertex, NzMeshVertex* outputVertex, const NzVertexWeight* vertexWeights, unsigned int vertexCount)
{
for (unsigned int i = 0; i < vertexCount; ++i)
{
NzVector3f finalPosition(NzVector3f::Zero());
NzVector3f finalNormal(NzVector3f::Zero());
unsigned int weightCount = vertexWeights[i].weights.size();
for (unsigned int j = 0; j < weightCount; ++j)
{
const NzWeight& weight = skinningInfos.weights[vertexWeights[i].weights[j]];
NzMatrix4f mat(skinningInfos.joints[weight.jointIndex].GetInverseBindMatrix());
mat.ConcatenateAffine(skinningInfos.joints[weight.jointIndex].GetTransformMatrix());
mat *= weight.weight;
finalPosition += mat.Transform(inputVertex->position);
finalNormal += mat.Transform(inputVertex->normal, 0.f);
}
finalNormal.Normalize();
outputVertex->normal = finalNormal;
outputVertex->position = finalPosition;
outputVertex->uv = inputVertex->uv;
inputVertex++;
outputVertex++;
}
}
void Skin_PositionNormalTangent(const SkinningInfos& skinningInfos, NzMeshVertex* inputVertex, NzMeshVertex* outputVertex, const NzVertexWeight* vertexWeights, unsigned int vertexCount)
{
for (unsigned int i = 0; i < vertexCount; ++i)
{
NzVector3f finalPosition(NzVector3f::Zero());
NzVector3f finalNormal(NzVector3f::Zero());
NzVector3f finalTangent(NzVector3f::Zero());
unsigned int weightCount = vertexWeights[i].weights.size();
for (unsigned int j = 0; j < weightCount; ++j)
{
const NzWeight& weight = skinningInfos.weights[vertexWeights[i].weights[j]];
NzMatrix4f mat(skinningInfos.joints[weight.jointIndex].GetInverseBindMatrix());
mat.ConcatenateAffine(skinningInfos.joints[weight.jointIndex].GetTransformMatrix());
mat *= weight.weight;
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++;
}
}
}
struct NzSkeletalMeshImpl struct NzSkeletalMeshImpl
{ {
std::vector<NzVertexWeight> vertexWeights; std::vector<NzVertexWeight> vertexWeights;
@ -276,39 +379,31 @@ void NzSkeletalMesh::Skin(const NzSkeleton* skeleton) const
NzMeshVertex* inputVertex = reinterpret_cast<NzMeshVertex*>(m_impl->bindPoseBuffer); NzMeshVertex* inputVertex = reinterpret_cast<NzMeshVertex*>(m_impl->bindPoseBuffer);
NzMeshVertex* outputVertex = reinterpret_cast<NzMeshVertex*>(mapper.GetPointer()); NzMeshVertex* outputVertex = reinterpret_cast<NzMeshVertex*>(mapper.GetPointer());
const NzJoint* joints = skeleton->GetJoints();
unsigned int vertexCount = m_impl->vertexBuffer->GetVertexCount(); unsigned int vertexCount = m_impl->vertexBuffer->GetVertexCount();
for (unsigned int i = 0; i < vertexCount; ++i)
SkinningInfos skinningInfos;
skinningInfos.joints = skeleton->GetJoints();
skinningInfos.weights = &m_impl->weights[0];
#if NAZARA_UTILITY_MULTITHREADED_SKINNING
unsigned int workerCount = NzTaskScheduler::GetWorkerCount();
unsigned int vertexPerWorker = vertexCount / workerCount;
unsigned int extraVertex = vertexCount % workerCount; // Il est très probable que la division ne soit pas parfaite
for (unsigned int i = 0; i < workerCount; ++i)
{ {
NzVector3f finalPosition(NzVector3f::Zero()); NzTaskScheduler::AddTask(Skin_PositionNormalTangent,
NzVector3f finalNormal(NzVector3f::Zero()); skinningInfos,
NzVector3f finalTangent(NzVector3f::Zero()); &inputVertex[i*vertexPerWorker],
&outputVertex[i*vertexPerWorker],
unsigned int weightCount = m_impl->vertexWeights[i].weights.size(); &m_impl->vertexWeights[i*vertexPerWorker],
for (unsigned int j = 0; j < weightCount; ++j) (i == workerCount-1) ? vertexPerWorker + extraVertex : vertexPerWorker);
{
const NzWeight& weight = m_impl->weights[m_impl->vertexWeights[i].weights[j]];
NzMatrix4f mat(joints[weight.jointIndex].GetInverseBindMatrix());
mat.ConcatenateAffine(joints[weight.jointIndex].GetTransformMatrix());
mat *= weight.weight;
finalPosition += mat.Transform(inputVertex->position);
finalNormal += mat.Transform(inputVertex->normal, 0.f);
finalTangent += mat.Transform(inputVertex->tangent, 0.f);
} }
finalNormal.Normalize(); NzTaskScheduler::WaitForTasks();
finalTangent.Normalize(); #else
Skin_PositionNormalTangent(skinningInfos, inputVertex, outputVertex, &m_impl->vertexWeights[0], vertexCount);
outputVertex->normal = finalNormal; #endif
outputVertex->position = finalPosition;
outputVertex->tangent = finalTangent;
outputVertex->uv = inputVertex->uv;
inputVertex++;
outputVertex++;
}
m_impl->aabb = skeleton->GetAABB(); m_impl->aabb = skeleton->GetAABB();
} }

4
src/Nazara/Utility/Utility.cpp
View File

@ -23,7 +23,11 @@ bool NzUtility::Initialize()
return true; // Déjà initialisé return true; // Déjà initialisé
// Initialisation des dépendances // Initialisation des dépendances
#if NAZARA_UTILITY_MULTITHREADED_SKINNING
if (!NzCore::Initialize(false, true))
#else
if (!NzCore::Initialize()) if (!NzCore::Initialize())
#endif
{ {
NazaraError("Failed to initialize core module"); NazaraError("Failed to initialize core module");
Uninitialize(); Uninitialize();