caiyu/gmio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gmio_support: fix missing code adaptations

Browse Source
This commit is contained in:
Hugues Delorme 2014-04-04 16:00:43 +02:00
parent 33ed203983
commit 675e95583a
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gmio_support/occ_libstl.cpp
View File

@ -1,7 +1,7 @@
#include <gmio_support/occ_libstl.h> #include <gmio_support/occ_libstl.h>
#include <gmio_stl/stl_geom.h> #include <gmio_stl/stl_mesh.h>
#include <gmio_stl/stl_geom_creator.h> #include <gmio_stl/stl_mesh_creator.h>
#include <cstring> #include <cstring>
#include <StlMesh_Mesh.hxx> #include <StlMesh_Mesh.hxx>
@ -68,19 +68,17 @@ static void occmesh_get_triangle(const void* cookie,
} // namespace internal } // namespace internal
void gmio_stl_occmesh_geom(gmio_stl_geom_t *geom, void gmio_stl_occmesh(gmio_stl_mesh_t *mesh, const gmio_OccStlMeshDomain &meshCookie)
const gmio_OccStlMeshDomain &meshCookie)
{ {
std::memset(geom, 0, sizeof(gmio_stl_geom_t)); std::memset(mesh, 0, sizeof(gmio_stl_mesh_t));
geom->cookie = &meshCookie; mesh->cookie = &meshCookie;
geom->triangle_count = meshCookie.mesh()->NbTriangles(meshCookie.domainId()); mesh->triangle_count = meshCookie.mesh()->NbTriangles(meshCookie.domainId());
geom->get_triangle_func = internal::occmesh_get_triangle; mesh->get_triangle_func = internal::occmesh_get_triangle;
} }
void gmio_stl_occmesh_geom_creator(gmio_stl_geom_creator_t *creator, void gmio_stl_occmesh_creator(gmio_stl_mesh_creator_t *creator, const Handle_StlMesh_Mesh &mesh)
const Handle_StlMesh_Mesh &mesh)
{ {
std::memset(creator, 0, sizeof(gmio_stl_geom_creator_t)); std::memset(creator, 0, sizeof(gmio_stl_mesh_creator_t));
creator->cookie = internal::occMeshPtr(mesh); creator->cookie = internal::occMeshPtr(mesh);
creator->add_triangle_func = internal::occmesh_add_triangle; creator->add_triangle_func = internal::occmesh_add_triangle;
} }

6
src/gmio_support/occ_libstl.h
View File

@ -23,11 +23,9 @@ private:
}; };
GMIO_LIBSUPPORT_EXPORT GMIO_LIBSUPPORT_EXPORT
void gmio_stl_occmesh_geom(gmio_stl_geom* geom, void gmio_stl_occmesh(gmio_stl_geom* geom, const gmio_OccStlMeshDomain& meshCookie);
const gmio_OccStlMeshDomain& meshCookie);
GMIO_LIBSUPPORT_EXPORT GMIO_LIBSUPPORT_EXPORT
void gmio_stl_occmesh_geom_creator(gmio_stl_geom_creator* creator, void gmio_stl_occmesh_creator(gmio_stl_geom_creator* creator, const Handle_StlMesh_Mesh& mesh);
const Handle_StlMesh_Mesh& mesh);
#endif /* GMIO_SUPPORT_OCC_LIBSTL_H */ #endif /* GMIO_SUPPORT_OCC_LIBSTL_H */

2
src/gmio_support/support_global.h
View File

@ -1,7 +1,7 @@
#ifndef GMIO_C_SUPPORT_GLOBAL_H #ifndef GMIO_C_SUPPORT_GLOBAL_H
#define GMIO_C_SUPPORT_GLOBAL_H #define GMIO_C_SUPPORT_GLOBAL_H
#include "../datax_core/global.h" #include "../gmio_core/global.h"
#ifdef GMIO_LIBSUPPORT_DLL #ifdef GMIO_LIBSUPPORT_DLL
# ifdef GMIO_LIBSUPPORT_MAKE_DLL # ifdef GMIO_LIBSUPPORT_MAKE_DLL