diff --git a/Base/Geometry/Mesh/imstkMesh.h b/Base/Geometry/Mesh/imstkMesh.h index 8d5a0891007a4764b75e94b112917ed2536a5534..e7d4e2fd1cb158631ae8c0be52ce2d428f3d8b3a 100644 --- a/Base/Geometry/Mesh/imstkMesh.h +++ b/Base/Geometry/Mesh/imstkMesh.h @@ -124,12 +124,12 @@ public: const Vec3d& getVertexDisplacement(const size_t& vertNum) const; /// - /// \brief Sets the point data for all arrays at each vertice + /// \brief Sets the point data for all arrays at each vertex /// void setPointDataMap(const std::map<std::string, StdVectorOfVectorf>& pointData); /// - /// \brief Get the map of the point data for all arrays at each vertice + /// \brief Get the map of the point data for all arrays at each vertex /// const std::map<std::string, StdVectorOfVectorf>& getPointDataMap() const; @@ -163,7 +163,7 @@ protected: /// /// \brief Get vertices positions /// - StdVectorOfVec3d& getVerticesPositionsNotConst() + StdVectorOfVec3d& getVertexPositionsNotConst() { return m_vertexPositions; } diff --git a/Base/Geometry/Mesh/imstkSurfaceMesh.cpp b/Base/Geometry/Mesh/imstkSurfaceMesh.cpp index 56b17fd1f15bc75443580f0894d0b646af730c46..e3e7f254f2df7268836601caa3f6d921569e02fe 100644 --- a/Base/Geometry/Mesh/imstkSurfaceMesh.cpp +++ b/Base/Geometry/Mesh/imstkSurfaceMesh.cpp @@ -36,7 +36,7 @@ SurfaceMesh::initialize(const StdVectorOfVec3d& vertices, if (computeDerivedData) { - computeVerticesNormals(); + computeVertexNormals(); } } @@ -133,7 +133,7 @@ SurfaceMesh::computeTrianglesNormals() } void -SurfaceMesh::computeVerticesNormals() +SurfaceMesh::computeVertexNormals() { m_vertexNormals.resize(m_vertexPositions.size()); diff --git a/Base/Geometry/Mesh/imstkSurfaceMesh.h b/Base/Geometry/Mesh/imstkSurfaceMesh.h index aa6a17cef5647bf479d686fa61fefd111c51adc4..f1969201b58a2d8be7973ed1a55d93a5d12370f9 100644 --- a/Base/Geometry/Mesh/imstkSurfaceMesh.h +++ b/Base/Geometry/Mesh/imstkSurfaceMesh.h @@ -96,7 +96,7 @@ public: /// /// \brief Computes the normals of all the vertices /// - void computeVerticesNormals(); + void computeVertexNormals(); /// /// \brief Rewire the node order and triangle connectivity to optimize for memory layout diff --git a/Base/Rendering/RenderDelegate/imstkVTKHexahedralMeshRenderDelegate.cpp b/Base/Rendering/RenderDelegate/imstkVTKHexahedralMeshRenderDelegate.cpp index a50b194be41483f94af3fd7d3dd53abbcf19256c..aabb8aef3b5c285973e78068697f9512c50e76be 100644 --- a/Base/Rendering/RenderDelegate/imstkVTKHexahedralMeshRenderDelegate.cpp +++ b/Base/Rendering/RenderDelegate/imstkVTKHexahedralMeshRenderDelegate.cpp @@ -39,7 +39,7 @@ VTKHexahedralMeshRenderDelegate::VTKHexahedralMeshRenderDelegate(std::shared_ptr m_geometry(hexahedralMesh) { // Map vertices - StdVectorOfVec3d& vertices = m_geometry->getVerticesPositionsNotConst(); + StdVectorOfVec3d& vertices = m_geometry->getVertexPositionsNotConst(); double* vertData = reinterpret_cast<double*>(vertices.data()); m_mappedVertexArray = vtkSmartPointer<vtkDoubleArray>::New(); m_mappedVertexArray->SetNumberOfComponents(3); diff --git a/Base/Rendering/RenderDelegate/imstkVTKLineMeshRenderDelegate.cpp b/Base/Rendering/RenderDelegate/imstkVTKLineMeshRenderDelegate.cpp index 2828291ad26ac8f21e25cf535a124d8a70469c89..f1e1d600840f2854351916c0d063e8474b0b9bbc 100644 --- a/Base/Rendering/RenderDelegate/imstkVTKLineMeshRenderDelegate.cpp +++ b/Base/Rendering/RenderDelegate/imstkVTKLineMeshRenderDelegate.cpp @@ -37,7 +37,7 @@ VTKLineMeshRenderDelegate::VTKLineMeshRenderDelegate(std::shared_ptr<LineMesh> l m_geometry(lineMesh) { // Map vertices - StdVectorOfVec3d& vertices = m_geometry->getVerticesPositionsNotConst(); + StdVectorOfVec3d& vertices = m_geometry->getVertexPositionsNotConst(); double* vertData = reinterpret_cast<double*>(vertices.data()); m_mappedVertexArray = vtkSmartPointer<vtkDoubleArray>::New(); m_mappedVertexArray->SetNumberOfComponents(3); diff --git a/Base/Rendering/RenderDelegate/imstkVTKSurfaceMeshRenderDelegate.cpp b/Base/Rendering/RenderDelegate/imstkVTKSurfaceMeshRenderDelegate.cpp index 6be283723ab01026e02d50df1cd071d8f29654dd..a929b6a6e5195b8f20ba32f05a930ff039e92923 100644 --- a/Base/Rendering/RenderDelegate/imstkVTKSurfaceMeshRenderDelegate.cpp +++ b/Base/Rendering/RenderDelegate/imstkVTKSurfaceMeshRenderDelegate.cpp @@ -47,7 +47,7 @@ VTKSurfaceMeshRenderDelegate::VTKSurfaceMeshRenderDelegate(std::shared_ptr<Surfa m_geometry(surfaceMesh) { // Map vertices - StdVectorOfVec3d& vertices = m_geometry->getVerticesPositionsNotConst(); + StdVectorOfVec3d& vertices = m_geometry->getVertexPositionsNotConst(); double* vertData = reinterpret_cast<double*>(vertices.data()); m_mappedVertexArray = vtkSmartPointer<vtkDoubleArray>::New(); m_mappedVertexArray->SetNumberOfComponents(3); diff --git a/Base/Rendering/RenderDelegate/imstkVTKTetrahedralMeshRenderDelegate.cpp b/Base/Rendering/RenderDelegate/imstkVTKTetrahedralMeshRenderDelegate.cpp index 6179a2c76e4a7d8f6d375088ffc2d21cc082ef57..9ead328b1bd774714e22013421426a572165a284 100644 --- a/Base/Rendering/RenderDelegate/imstkVTKTetrahedralMeshRenderDelegate.cpp +++ b/Base/Rendering/RenderDelegate/imstkVTKTetrahedralMeshRenderDelegate.cpp @@ -38,7 +38,7 @@ VTKTetrahedralMeshRenderDelegate::VTKTetrahedralMeshRenderDelegate(std::shared_p m_geometry(tetrahedralMesh) { // Map vertices - StdVectorOfVec3d& vertices = m_geometry->getVerticesPositionsNotConst(); + StdVectorOfVec3d& vertices = m_geometry->getVertexPositionsNotConst(); double* vertData = reinterpret_cast<double*>(vertices.data()); m_mappedVertexArray = vtkSmartPointer<vtkDoubleArray>::New(); m_mappedVertexArray->SetNumberOfComponents(3);