Switch from Nz prefix to namespace Nz

What a huge commit


Former-commit-id: 38ac5eebf70adc1180f571f6006192d28fb99897
This commit is contained in:
Lynix
2015-09-25 19:20:05 +02:00
parent c214251ecf
commit df8da275c4
609 changed files with 68265 additions and 66534 deletions

View File

@@ -15,65 +15,68 @@
#include <Nazara/Utility/Animation.hpp>
#include <vector>
class NAZARA_UTILITY_API NzMD5AnimParser
namespace Nz
{
public:
struct FrameJoint
{
NzQuaternionf orient;
NzVector3f pos;
};
class NAZARA_UTILITY_API MD5AnimParser
{
public:
struct FrameJoint
{
Quaternionf orient;
Vector3f pos;
};
struct Frame
{
std::vector<FrameJoint> joints;
NzBoxf bounds;
};
struct Frame
{
std::vector<FrameJoint> joints;
Boxf bounds;
};
struct Joint
{
NzQuaternionf bindOrient;
NzString name;
NzVector3f bindPos;
int parent;
unsigned int flags;
unsigned int index;
};
struct Joint
{
Quaternionf bindOrient;
String name;
Vector3f bindPos;
int parent;
unsigned int flags;
unsigned int index;
};
NzMD5AnimParser(NzInputStream& stream);
~NzMD5AnimParser();
MD5AnimParser(InputStream& stream);
~MD5AnimParser();
nzTernary Check();
Ternary Check();
unsigned int GetAnimatedComponentCount() const;
const Frame* GetFrames() const;
unsigned int GetFrameCount() const;
unsigned int GetFrameRate() const;
const Joint* GetJoints() const;
unsigned int GetJointCount() const;
unsigned int GetAnimatedComponentCount() const;
const Frame* GetFrames() const;
unsigned int GetFrameCount() const;
unsigned int GetFrameRate() const;
const Joint* GetJoints() const;
unsigned int GetJointCount() const;
bool Parse();
bool Parse();
private:
bool Advance(bool required = true);
void Error(const NzString& message);
bool ParseBaseframe();
bool ParseBounds();
bool ParseFrame();
bool ParseHierarchy();
void Warning(const NzString& message);
void UnrecognizedLine(bool error = false);
private:
bool Advance(bool required = true);
void Error(const String& message);
bool ParseBaseframe();
bool ParseBounds();
bool ParseFrame();
bool ParseHierarchy();
void Warning(const String& message);
void UnrecognizedLine(bool error = false);
std::vector<float> m_animatedComponents;
std::vector<Frame> m_frames;
std::vector<Joint> m_joints;
NzInputStream& m_stream;
NzString m_currentLine;
bool m_keepLastLine;
unsigned int m_frameIndex;
unsigned int m_frameRate;
unsigned int m_lineCount;
unsigned int m_streamFlags;
};
std::vector<float> m_animatedComponents;
std::vector<Frame> m_frames;
std::vector<Joint> m_joints;
InputStream& m_stream;
String m_currentLine;
bool m_keepLastLine;
unsigned int m_frameIndex;
unsigned int m_frameRate;
unsigned int m_lineCount;
unsigned int m_streamFlags;
};
}
#endif // NAZARA_FORMATS_MD5ANIMPARSER_HPP