diff --git a/src/gmio_support/stl_occ.cpp b/src/gmio_support/stl_occ.cpp index 8945a1b..d717fc8 100644 --- a/src/gmio_support/stl_occ.cpp +++ b/src/gmio_support/stl_occ.cpp @@ -83,35 +83,21 @@ static void occmesh_get_triangle( } // namespace internal -void gmio_stl_set_occmesh( - gmio_stl_mesh_t *mesh, const gmio_OccStlMeshDomain &meshCookie) -{ - std::memset(mesh, 0, sizeof(gmio_stl_mesh_t)); - mesh->cookie = &meshCookie; - mesh->triangle_count = meshCookie.mesh()->NbTriangles(meshCookie.domainId()); - mesh->func_get_triangle = internal::occmesh_get_triangle; -} - gmio_stl_mesh gmio_stl_occmesh(const gmio_OccStlMeshDomain &meshCookie) { - gmio_stl_mesh occmesh = { 0 }; - gmio_stl_set_occmesh(&occmesh, meshCookie); - return occmesh; -} - -void gmio_stl_set_occmesh_creator( - gmio_stl_mesh_creator_t *creator, const Handle_StlMesh_Mesh &mesh) -{ - std::memset(creator, 0, sizeof(gmio_stl_mesh_creator_t)); - creator->cookie = internal::occMeshPtr(mesh); - creator->func_add_triangle = internal::occmesh_add_triangle; + gmio_stl_mesh mesh = { 0 }; + mesh.cookie = &meshCookie; + mesh.triangle_count = meshCookie.mesh()->NbTriangles(meshCookie.domainId()); + mesh.func_get_triangle = internal::occmesh_get_triangle; + return mesh; } gmio_stl_mesh_creator gmio_stl_occmesh_creator(const Handle_StlMesh_Mesh &mesh) { - gmio_stl_mesh_creator occ_creator = { 0 }; - gmio_stl_set_occmesh_creator(&occ_creator, mesh); - return occ_creator; + gmio_stl_mesh_creator creator = { 0 }; + creator.cookie = internal::occMeshPtr(mesh); + creator.func_add_triangle = internal::occmesh_add_triangle; + return creator; } gmio_OccStlMeshDomain::gmio_OccStlMeshDomain( diff --git a/src/gmio_support/stl_occ.h b/src/gmio_support/stl_occ.h index c982cde..c6c9369 100644 --- a/src/gmio_support/stl_occ.h +++ b/src/gmio_support/stl_occ.h @@ -48,14 +48,6 @@ private: int m_domainId; }; -/*! Initializes \p mesh so it maps to a domain in StlMesh_Mesh - * - * \c mesh->cookie will point to \p meshCookie - */ -GMIO_LIBSUPPORT_EXPORT -void gmio_stl_set_occmesh( - gmio_stl_mesh* mesh, const gmio_OccStlMeshDomain& meshCookie); - /*! Returns a gmio_stl_mesh mapped to domain in StlMesh_Mesh * * The mesh's cookie will point to \p meshCookie @@ -63,15 +55,6 @@ void gmio_stl_set_occmesh( GMIO_LIBSUPPORT_EXPORT gmio_stl_mesh gmio_stl_occmesh(const gmio_OccStlMeshDomain& meshCookie); -/*! Initializes \p creator to build a new domain in a StlMesh_Mesh object - * - * \c creator->cookie will point to the internal data(ie StlMesh_Mesh*) of - * handle \p mesh - */ -GMIO_LIBSUPPORT_EXPORT -void gmio_stl_set_occmesh_creator( - gmio_stl_mesh_creator* creator, const Handle_StlMesh_Mesh& mesh); - /*! Returns a gmio_stl_mesh_creator that will build a new domain in a * StlMesh_Mesh object *