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

gmio_support: OpenCascade support no longer requires C++11

Browse Source
This commit is contained in:
Hugues Delorme 2016-07-26 16:23:03 +02:00
parent 362c789f5b
commit 38ae856f36
4 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/CMakeLists.txt
View File

@ -45,13 +45,6 @@ add_executable(occstl_write_file
occstl_write_file.cpp ${SUPPORT_STL_OCC_FILES}) occstl_write_file.cpp ${SUPPORT_STL_OCC_FILES})
add_executable(occstl_redefine_mesh_creator add_executable(occstl_redefine_mesh_creator
occstl_redefine_mesh_creator.cpp ${SUPPORT_STL_OCC_FILES}) occstl_redefine_mesh_creator.cpp ${SUPPORT_STL_OCC_FILES})
if(CMAKE_COMPILER_IS_GNUCC)
set_target_properties(
occstl_read_file
occstl_write_file
occstl_redefine_mesh_creator
PROPERTIES COMPILE_FLAGS "-std=c++0x")
endif()
# gmio STL # gmio STL
add_executable(stl_get_infos stl_get_infos.c) add_executable(stl_get_infos stl_get_infos.c)

24
src/gmio_support/stl_occ_brep.cpp
View File

@ -61,32 +61,34 @@ gmio_stl_mesh_occshape::gmio_stl_mesh_occshape(const TopoDS_Shape& shape)
} }
// Fill face and triangle datas // Fill face and triangle datas
m_vec_face_data.reserve(face_count); std::size_t vec_face_id = 0;
m_vec_triangle_data.reserve(this->triangle_count); std::size_t vec_tri_id = 0;
m_vec_face_data.resize(face_count);
m_vec_triangle_data.resize(this->triangle_count);
for (TopExp_Explorer expl(shape, TopAbs_FACE); expl.More(); expl.Next()) { for (TopExp_Explorer expl(shape, TopAbs_FACE); expl.More(); expl.Next()) {
const TopoDS_Face& topoface = TopoDS::Face(expl.Current()); const TopoDS_Face& topoface = TopoDS::Face(expl.Current());
TopLoc_Location loc; TopLoc_Location loc;
const Handle_Poly_Triangulation& hnd_face_poly = const Handle_Poly_Triangulation& hnd_face_poly =
BRep_Tool::Triangulation(topoface, loc); BRep_Tool::Triangulation(topoface, loc);
if (!hnd_face_poly.IsNull()) { if (!hnd_face_poly.IsNull()) {
{ // Add next face_data // Copy next face_data
struct face_data facedata; struct face_data& facedata = m_vec_face_data.at(vec_face_id);
facedata.trsf = loc.Transformation(); facedata.trsf = loc.Transformation();
facedata.is_reversed = (topoface.Orientation() == TopAbs_REVERSED); facedata.is_reversed = (topoface.Orientation() == TopAbs_REVERSED);
if (facedata.trsf.IsNegative()) if (facedata.trsf.IsNegative())
facedata.is_reversed = !facedata.is_reversed; facedata.is_reversed = !facedata.is_reversed;
facedata.ptr_nodes = &hnd_face_poly->Nodes(); facedata.ptr_nodes = &hnd_face_poly->Nodes();
m_vec_face_data.push_back(std::move(facedata));
} // Copy triangle_datas
const struct face_data& last_facedata = m_vec_face_data.back();
// Add triangle_datas
const Poly_Array1OfTriangle& vec_face_tri = hnd_face_poly->Triangles(); const Poly_Array1OfTriangle& vec_face_tri = hnd_face_poly->Triangles();
for (int i = vec_face_tri.Lower(); i <= vec_face_tri.Upper(); ++i) { for (int i = vec_face_tri.Lower(); i <= vec_face_tri.Upper(); ++i) {
struct triangle_data tridata; struct triangle_data& tridata = m_vec_triangle_data.at(vec_tri_id);
tridata.ptr_triangle = &vec_face_tri.Value(i); tridata.ptr_triangle = &vec_face_tri.Value(i);
tridata.ptr_face_data = &last_facedata; tridata.ptr_face_data = &facedata;
m_vec_triangle_data.push_back(std::move(tridata)); ++vec_tri_id;
} }
++vec_face_id;
} }
} }
} }

14
src/gmio_support/stl_occ_mesh.cpp
View File

@ -95,13 +95,14 @@ void gmio_stl_mesh_occmesh::init_cache()
this->triangle_count += m_mesh->NbTriangles(dom_id); this->triangle_count += m_mesh->NbTriangles(dom_id);
// Fill vector of triangle data // Fill vector of triangle data
m_vec_domain_data.reserve(domain_count); m_vec_domain_data.resize(domain_count);
m_vec_triangle_data.reserve(this->triangle_count); m_vec_triangle_data.resize(this->triangle_count);
std::size_t vec_tri_id = 0;
for (int dom_id = 1; dom_id <= domain_count; ++dom_id) { for (int dom_id = 1; dom_id <= domain_count; ++dom_id) {
// Cache vertex indexes // Cache vertex indexes
// TColgp_SequenceOfXYZ::Value(int) is slow(linear search) // TColgp_SequenceOfXYZ::Value(int) is slow(linear search)
const TColgp_SequenceOfXYZ& seq_vertices = m_mesh->Vertices(dom_id); const TColgp_SequenceOfXYZ& seq_vertices = m_mesh->Vertices(dom_id);
struct domain_data domdata; struct domain_data& domdata = m_vec_domain_data.at(dom_id - 1);
domdata.vec_coords.reserve(seq_vertices.Length()); domdata.vec_coords.reserve(seq_vertices.Length());
#if OCC_VERSION_HEX >= 0x070000 #if OCC_VERSION_HEX >= 0x070000
typedef TColgp_SequenceOfXYZ::const_iterator ConstIterSeqXYZ; typedef TColgp_SequenceOfXYZ::const_iterator ConstIterSeqXYZ;
@ -112,7 +113,6 @@ void gmio_stl_mesh_occmesh::init_cache()
for (int i = 1; i <= seq_vertices.Length(); ++i) for (int i = 1; i <= seq_vertices.Length(); ++i)
domdata.vec_coords.push_back(&seq_vertices.Value(i)); domdata.vec_coords.push_back(&seq_vertices.Value(i));
#endif #endif
m_vec_domain_data.push_back(std::move(domdata));
// Cache triangles // Cache triangles
const StlMesh_SequenceOfMeshTriangle& seq_triangles = const StlMesh_SequenceOfMeshTriangle& seq_triangles =
@ -120,10 +120,10 @@ void gmio_stl_mesh_occmesh::init_cache()
for (int tri_id = 1; tri_id <= seq_triangles.Length(); ++tri_id) { for (int tri_id = 1; tri_id <= seq_triangles.Length(); ++tri_id) {
const Handle_StlMesh_MeshTriangle& hnd_occtri = const Handle_StlMesh_MeshTriangle& hnd_occtri =
seq_triangles.Value(tri_id); seq_triangles.Value(tri_id);
struct triangle_data tridata; struct triangle_data& tridata = m_vec_triangle_data.at(vec_tri_id);
tridata.ptr_triangle = hnd_occtri.operator->(); tridata.ptr_triangle = hnd_occtri.operator->();
tridata.ptr_domain = &m_vec_domain_data.back(); tridata.ptr_domain = &domdata;
m_vec_triangle_data.push_back(std::move(tridata)); ++vec_tri_id;
} }
} }
} }

6
tests/fake_support/CMakeLists.txt
View File

@ -48,9 +48,3 @@ include_directories(
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_SOURCE_DIR}/opencascade ${CMAKE_CURRENT_SOURCE_DIR}/opencascade
${CMAKE_CURRENT_SOURCE_DIR}/qt) ${CMAKE_CURRENT_SOURCE_DIR}/qt)
if(CMAKE_COMPILER_IS_GNUCC)
set_target_properties(
fake_support
PROPERTIES COMPILE_FLAGS "-std=c++0x")
endif()