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,69 +15,72 @@
#include <Nazara/Utility/Mesh.hpp>
#include <vector>
class NAZARA_UTILITY_API NzMD5MeshParser
namespace Nz
{
public:
struct Joint
{
NzQuaternionf bindOrient;
NzString name;
NzVector3f bindPos;
int parent;
};
class NAZARA_UTILITY_API MD5MeshParser
{
public:
struct Joint
{
Quaternionf bindOrient;
String name;
Vector3f bindPos;
int parent;
};
typedef NzVector3ui Triangle;
typedef Vector3ui Triangle;
struct Vertex
{
NzVector2f uv;
unsigned int startWeight;
unsigned int weightCount;
};
struct Vertex
{
Vector2f uv;
unsigned int startWeight;
unsigned int weightCount;
};
struct Weight
{
NzVector3f pos;
float bias;
unsigned int joint;
};
struct Weight
{
Vector3f pos;
float bias;
unsigned int joint;
};
struct Mesh
{
std::vector<Triangle> triangles;
std::vector<Vertex> vertices;
std::vector<Weight> weights;
NzString shader;
};
struct Mesh
{
std::vector<Triangle> triangles;
std::vector<Vertex> vertices;
std::vector<Weight> weights;
String shader;
};
NzMD5MeshParser(NzInputStream& stream);
~NzMD5MeshParser();
MD5MeshParser(InputStream& stream);
~MD5MeshParser();
nzTernary Check();
Ternary Check();
const Joint* GetJoints() const;
unsigned int GetJointCount() const;
const Mesh* GetMeshes() const;
unsigned int GetMeshCount() const;
const Joint* GetJoints() const;
unsigned int GetJointCount() const;
const Mesh* GetMeshes() const;
unsigned int GetMeshCount() const;
bool Parse();
bool Parse();
private:
bool Advance(bool required = true);
void Error(const NzString& message);
bool ParseJoints();
bool ParseMesh();
void Warning(const NzString& message);
void UnrecognizedLine(bool error = false);
private:
bool Advance(bool required = true);
void Error(const String& message);
bool ParseJoints();
bool ParseMesh();
void Warning(const String& message);
void UnrecognizedLine(bool error = false);
std::vector<Joint> m_joints;
std::vector<Mesh> m_meshes;
NzInputStream& m_stream;
NzString m_currentLine;
bool m_keepLastLine;
unsigned int m_lineCount;
unsigned int m_meshIndex;
unsigned int m_streamFlags;
};
std::vector<Joint> m_joints;
std::vector<Mesh> m_meshes;
InputStream& m_stream;
String m_currentLine;
bool m_keepLastLine;
unsigned int m_lineCount;
unsigned int m_meshIndex;
unsigned int m_streamFlags;
};
}
#endif // NAZARA_FORMATS_MD5MESHPARSER_HPP