janwas
c0ed950657
this snowballed into a massive search+destroy of the hodgepodge of mostly equivalent types we had in use (int, uint, unsigned, unsigned int, i32, u32, ulong, uintN). it is more efficient to use 64-bit types in 64-bit mode, so the preferred default is size_t (for anything remotely resembling a size or index). tile coordinates are ssize_t to allow more efficient conversion to/from floating point. flags are int because we almost never need more than 15 distinct bits, bit test/set is not slower and int is fastest to type. finally, some data that is pretty much directly passed to OpenGL is now typed accordingly. after several hours, the code now requires fewer casts and less guesswork. other changes: - unit and player IDs now have an "invalid id" constant in the respective class to avoid casting and -1 - fix some endian/64-bit bugs in the map (un)packing. added a convenience function to write/read a size_t. - ia32: change CPUID interface to allow passing in ecx (required for cache topology detection, which I need at work). remove some unneeded functions from asm, replace with intrinsics where possible. This was SVN commit r5942.
83 lines
2.6 KiB
C++
83 lines
2.6 KiB
C++
/**
|
|
* =========================================================================
|
|
* File : SkeletonAnim.h
|
|
* Project : 0 A.D.
|
|
* Description : Raw description of a skeleton animation
|
|
* =========================================================================
|
|
*/
|
|
|
|
#ifndef INCLUDED_SKELETONANIMDEF
|
|
#define INCLUDED_SKELETONANIMDEF
|
|
|
|
#include "maths/Vector3D.h"
|
|
#include "maths/Quaternion.h"
|
|
#include "lib/file/vfs/vfs_path.h"
|
|
|
|
////////////////////////////////////////////////////////////////////////////////////////
|
|
// CBoneState: structure describing state of a bone at some point
|
|
class CBoneState
|
|
{
|
|
public:
|
|
// translation of bone relative to root
|
|
CVector3D m_Translation;
|
|
// rotation of bone relative to root
|
|
CQuaternion m_Rotation;
|
|
};
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////////////
|
|
// CSkeletonAnimDef: raw description - eg bonestates - of an animation that plays upon
|
|
// a skeleton
|
|
class CSkeletonAnimDef
|
|
{
|
|
public:
|
|
// current file version given to saved animations
|
|
enum { FILE_VERSION = 1 };
|
|
// supported file read version - files with a version less than this will be rejected
|
|
enum { FILE_READ_VERSION = 1 };
|
|
|
|
|
|
public:
|
|
// Key: description of a single key in a skeleton animation
|
|
typedef CBoneState Key;
|
|
|
|
public:
|
|
// CSkeletonAnimDef constructor + destructor
|
|
CSkeletonAnimDef();
|
|
~CSkeletonAnimDef();
|
|
|
|
// return the number of keys in this animation
|
|
size_t GetNumKeys() const { return (size_t)m_NumKeys; }
|
|
|
|
// accessors: get a key for given bone at given time
|
|
Key& GetKey(size_t frame, size_t bone) { return m_Keys[frame*m_NumKeys+bone]; }
|
|
const Key& GetKey(size_t frame, size_t bone) const { return m_Keys[frame*m_NumKeys+bone]; }
|
|
|
|
// get duration of this anim, in ms
|
|
float GetDuration() const { return m_NumFrames*m_FrameTime; }
|
|
|
|
// return length of each frame, in ms
|
|
float GetFrameTime() const { return m_FrameTime; }
|
|
// return number of frames in animation
|
|
size_t GetNumFrames() const { return (size_t)m_NumFrames; }
|
|
|
|
// build matrices for all bones at the given time (in MS) in this animation
|
|
void BuildBoneMatrices(float time, CMatrix3D* matrices, bool loop) const;
|
|
|
|
// anim I/O functions
|
|
static CSkeletonAnimDef* Load(const VfsPath& filename);
|
|
static void Save(const char* filename, const CSkeletonAnimDef* anim);
|
|
|
|
public:
|
|
// frame time - time between successive frames, in ms
|
|
float m_FrameTime;
|
|
// number of keys in each frame - should match number of bones in the skeleton
|
|
size_t m_NumKeys;
|
|
// number of frames in the animation
|
|
size_t m_NumFrames;
|
|
// animation data - m_NumKeys*m_NumFrames total keys
|
|
Key* m_Keys;
|
|
};
|
|
|
|
#endif
|