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

Core/Animation: Move Sequence and SequenceJoint to Animation

Browse Source
This commit is contained in:
SirLynix
2024-02-19 22:45:55 +01:00
parent 4d77a25a04
commit f121f32873
6 changed files with 34 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Nazara/Core/Animation.cpp
View File

@@ -7,7 +7,6 @@
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/Export.hpp>
#include <Nazara/Core/Joint.hpp>
#include <Nazara/Core/Sequence.hpp>
#include <Nazara/Core/Skeleton.hpp>
#include <unordered_map>
#include <vector>
@@ -17,11 +16,11 @@ namespace Nz
struct AnimationImpl
{
std::unordered_map<std::string, std::size_t, StringHash<>, std::equal_to<>> sequenceMap;
std::vector<Sequence> sequences;
std::vector<SequenceJoint> sequenceJoints; // Uniquement pour les animations squelettiques
AnimationType type;
std::vector<Animation::Sequence> sequences;
std::vector<Animation::SequenceJoint> sequenceJoints; // Uniquement pour les animations squelettiques
std::size_t frameCount;
std::size_t jointCount; // Uniquement pour les animations squelettiques
AnimationType type;
};
bool AnimationParams::IsValid() const
@@ -130,7 +129,7 @@ namespace Nz
return m_impl->jointCount;
}
Sequence* Animation::GetSequence(std::string_view sequenceName)
auto Animation::GetSequence(std::string_view sequenceName) -> Sequence*
{
NazaraAssert(m_impl, "Animation not created");
@@ -144,7 +143,7 @@ namespace Nz
return &m_impl->sequences[it->second];
}
Sequence* Animation::GetSequence(std::size_t index)
auto Animation::GetSequence(std::size_t index) -> Sequence*
{
NazaraAssert(m_impl, "Animation not created");
NazaraAssert(index < m_impl->sequences.size(), "Sequence index out of range");
@@ -152,7 +151,7 @@ namespace Nz
return &m_impl->sequences[index];
}
const Sequence* Animation::GetSequence(std::string_view sequenceName) const
auto Animation::GetSequence(std::string_view sequenceName) const -> const Sequence*
{
NazaraAssert(m_impl, "Animation not created");
@@ -166,7 +165,7 @@ namespace Nz
return &m_impl->sequences[it->second];
}
const Sequence* Animation::GetSequence(std::size_t index) const
auto Animation::GetSequence(std::size_t index) const -> const Sequence*
{
NazaraAssert(m_impl, "Animation not created");
NazaraAssert(index < m_impl->sequences.size(), "Sequence index out of range");
@@ -195,20 +194,20 @@ namespace Nz
return it->second;
}
SequenceJoint* Animation::GetSequenceJoints(std::size_t frameIndex)
auto Animation::GetSequenceJoints(std::size_t frameIndex) -> SequenceJoint*
{
NazaraAssert(m_impl, "Animation not created");
NazaraAssert(m_impl->type == AnimationType::Skeletal, "Animation is not skeletal");
return &m_impl->sequenceJoints[frameIndex*m_impl->jointCount];
return &m_impl->sequenceJoints[frameIndex * m_impl->jointCount];
}
const SequenceJoint* Animation::GetSequenceJoints(std::size_t frameIndex) const
auto Animation::GetSequenceJoints(std::size_t frameIndex) const -> const SequenceJoint*
{
NazaraAssert(m_impl, "Animation not created");
NazaraAssert(m_impl->type == AnimationType::Skeletal, "Animation is not skeletal");
return &m_impl->sequenceJoints[frameIndex*m_impl->jointCount];
return &m_impl->sequenceJoints[frameIndex * m_impl->jointCount];
}
AnimationType Animation::GetType() const

7
src/Nazara/Core/Formats/MD5AnimLoader.cpp
View File

@@ -4,7 +4,6 @@
#include <Nazara/Core/Formats/MD5AnimLoader.hpp>
#include <Nazara/Core/Animation.hpp>
#include <Nazara/Core/Sequence.hpp>
#include <Nazara/Core/Formats/MD5AnimParser.hpp>
namespace Nz
@@ -45,7 +44,7 @@ namespace Nz
std::shared_ptr<Animation> animation = std::make_shared<Animation>();
animation->CreateSkeletal(frameCount, jointCount);
Sequence sequence;
Animation::Sequence sequence;
sequence.firstFrame = 0;
sequence.frameCount = frameCount;
sequence.frameRate = frameRate;
@@ -53,7 +52,7 @@ namespace Nz
animation->AddSequence(sequence);
SequenceJoint* sequenceJoints = animation->GetSequenceJoints();
Animation::SequenceJoint* sequenceJoints = animation->GetSequenceJoints();
// Pour que le squelette soit correctement aligné, il faut appliquer un quaternion "de correction" aux joints à la base du squelette
Quaternionf rotationQuat = Quaternionf::RotationBetween(Vector3f::UnitX(), Vector3f::Forward()) *
@@ -68,7 +67,7 @@ namespace Nz
{
for (UInt32 jointIndex = 0; jointIndex < jointCount; ++jointIndex)
{
SequenceJoint& sequenceJoint = sequenceJoints[frameIndex * jointCount + jointIndex];
Animation::SequenceJoint& sequenceJoint = sequenceJoints[frameIndex * jointCount + jointIndex];
Int32 parentId = joints[jointIndex].parent;
if (parentId >= 0)