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

Utility: First code cleaning pass

Browse Source 
Former-commit-id: a73d38ce2db2e780ad5b02cdae1c590606081650 [formerly 3d21c0fa44481bf91418a15012fa187a210fc9ad] [formerly b80263df8e91b85f3fd091724c54dec7f05bc535 [formerly 7dcaabaabf74fbdf840289bfc435fdd8e88969d7]]
Former-commit-id: a669a933edd2364d9ee487c7d1bb38e28ad87a2d [formerly b8c5c09df10ce2f831635f460393216799d44056]
Former-commit-id: 6bbd5af22e30cc7fd4b4478162ae89e69b3d274e
This commit is contained in:
Lynix
2016-09-04 20:39:34 +02:00
parent 560825fa8e
commit 68d67cc9da
22 changed files with 276 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
include/Nazara/Utility/Animation.hpp
View File

@@ -20,16 +20,15 @@
#include <Nazara/Utility/Config.hpp>
#include <Nazara/Utility/Enums.hpp>
#include <Nazara/Utility/Sequence.hpp>
#include <limits>
namespace Nz
{
struct NAZARA_UTILITY_API AnimationParams : ResourceParameters
{
// La frame de fin à charger
unsigned int endFrame = std::numeric_limits<unsigned int>::max();
UInt32 endFrame = 0xFFFFFFFF;
// La frame de début à charger
unsigned int startFrame = 0;
UInt32 startFrame = 0;
bool IsValid() const;
};
@@ -57,27 +56,27 @@ namespace Nz
~Animation();
bool AddSequence(const Sequence& sequence);
void AnimateSkeleton(Skeleton* targetSkeleton, unsigned int frameA, unsigned int frameB, float interpolation) const;
void AnimateSkeleton(Skeleton* targetSkeleton, UInt32 frameA, UInt32 frameB, float interpolation) const;
bool CreateSkeletal(unsigned int frameCount, unsigned int jointCount);
bool CreateSkeletal(UInt32 frameCount, UInt32 jointCount);
void Destroy();
void EnableLoopPointInterpolation(bool loopPointInterpolation);
unsigned int GetFrameCount() const;
unsigned int GetJointCount() const;
UInt32 GetFrameCount() const;
UInt32 GetJointCount() const;
Sequence* GetSequence(const String& sequenceName);
Sequence* GetSequence(unsigned int index);
Sequence* GetSequence(UInt32 index);
const Sequence* GetSequence(const String& sequenceName) const;
const Sequence* GetSequence(unsigned int index) const;
unsigned int GetSequenceCount() const;
int GetSequenceIndex(const String& sequenceName) const;
SequenceJoint* GetSequenceJoints(unsigned int frameIndex = 0);
const SequenceJoint* GetSequenceJoints(unsigned int frameIndex = 0) const;
const Sequence* GetSequence(UInt32 index) const;
UInt32 GetSequenceCount() const;
UInt32 GetSequenceIndex(const String& sequenceName) const;
SequenceJoint* GetSequenceJoints(UInt32 frameIndex = 0);
const SequenceJoint* GetSequenceJoints(UInt32 frameIndex = 0) const;
AnimationType GetType() const;
bool HasSequence(const String& sequenceName) const;
bool HasSequence(unsigned int index = 0) const;
bool HasSequence(UInt32 index = 0) const;
bool IsLoopPointInterpolationEnabled() const;
bool IsValid() const;
@@ -87,7 +86,7 @@ namespace Nz
bool LoadFromStream(Stream& stream, const AnimationParams& params = AnimationParams());
void RemoveSequence(const String& sequenceName);
void RemoveSequence(unsigned int index);
void RemoveSequence(UInt32 index);
template<typename... Args> static AnimationRef New(Args&&... args);