From 0d4179b29736e92edb5ef26bd35143b8ec52b3e3 Mon Sep 17 00:00:00 2001 From: gered Date: Mon, 10 Dec 2012 19:50:38 -0500 Subject: [PATCH] made Ms3d getters const, and made Ms3d::FindIndexOfJoint a public method --- src/ms3d/ms3d.cpp | 2 +- src/ms3d/ms3d.h | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/ms3d/ms3d.cpp b/src/ms3d/ms3d.cpp index e9bceae..d58736c 100644 --- a/src/ms3d/ms3d.cpp +++ b/src/ms3d/ms3d.cpp @@ -427,7 +427,7 @@ bool Ms3d::ConvertToMesh(const std::string &file, float scaleFactor) return true; } -int Ms3d::FindIndexOfJoint(const std::string &jointName) +int Ms3d::FindIndexOfJoint(const std::string &jointName) const { if (jointName.length() == 0) return -1; diff --git a/src/ms3d/ms3d.h b/src/ms3d/ms3d.h index 05cc540..e054bff 100644 --- a/src/ms3d/ms3d.h +++ b/src/ms3d/ms3d.h @@ -111,21 +111,22 @@ public: bool Load(const std::string &file); bool ConvertToMesh(const std::string &file, float scaleFactor); - unsigned short GetNumVertices() { return m_numVertices; } - unsigned short GetNumTriangles() { return m_numTriangles; } - unsigned short GetNumMeshes() { return m_numMeshes; } - unsigned short GetNumMaterials() { return m_numMaterials; } - unsigned short GetNumJoints() { return m_numJoints; } - float GetAnimationFps() { return m_animationFps; } - int GetNumFrames() { return m_numFrames; } - Ms3dVertex* GetVertices() { return m_vertices; } - Ms3dTriangle* GetTriangles() { return m_triangles; } - Ms3dMesh* GetMeshes() { return m_meshes; } - Ms3dMaterial* GetMaterials() { return m_materials; } - Ms3dJoint* GetJoints() { return m_joints; } + unsigned short GetNumVertices() const { return m_numVertices; } + unsigned short GetNumTriangles() const { return m_numTriangles; } + unsigned short GetNumMeshes() const { return m_numMeshes; } + unsigned short GetNumMaterials() const { return m_numMaterials; } + unsigned short GetNumJoints() const { return m_numJoints; } + float GetAnimationFps() const { return m_animationFps; } + int GetNumFrames() const { return m_numFrames; } + Ms3dVertex* GetVertices() const { return m_vertices; } + Ms3dTriangle* GetTriangles() const { return m_triangles; } + Ms3dMesh* GetMeshes() const { return m_meshes; } + Ms3dMaterial* GetMaterials() const { return m_materials; } + Ms3dJoint* GetJoints() const { return m_joints; } + + int FindIndexOfJoint(const std::string &jointName) const; private: - int FindIndexOfJoint(const std::string &jointName); unsigned short m_numVertices; unsigned short m_numTriangles;