Merge pull request #342 from pariterre/fixMeshPath

Added path for all STL files

Author: pariterre

include/RigidBody/Mesh.h

@@ -71,6 +71,11 @@ class BIORBD_API Mesh
     ///
     utils::Vector3d& color() const;
 
+    ///
+    /// \brief Return if there is a mesh
+    /// \return If there is a mesh
+    bool hasMesh() const;
+
     ///
     /// \brief Add a point to the mesh
     /// \param node The point to add

src/ModelReader.cpp

@@ -2275,6 +2275,7 @@ rigidbody::Mesh Reader::readMeshFileStl(
     }
 
     rigidbody::Mesh mesh;
+    mesh.setPath(path);
     if (isBinary){
         // Know the number of points
         char headerChar[80] = "";
@@ -2284,7 +2285,6 @@ rigidbody::Mesh Reader::readMeshFileStl(
         file.readFromBinary(nbTrianglesChar, 4);
         size_t nbTriangles = static_cast<size_t>(*((unsigned int*) nbTrianglesChar));
 
-        mesh.setPath(path);
         utils::Vector3d normal;
         utils::Vector3d vertex;
         for (int i = 0; i<nbTriangles; ++i){

src/RigidBody/Mesh.cpp

@@ -78,6 +78,9 @@ utils::Vector3d &rigidbody::Mesh::color() const
     return *m_patchColor;
 }
 
+bool rigidbody::Mesh::hasMesh() const {
+    return m_vertex->size() > 0;
+}
 void rigidbody::Mesh::addPoint(const utils::Vector3d &node)
 {
     m_vertex->push_back(node);