zcy
/
dust3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CGAL crash [skip ci]

master
Jeremy Hu 2020-04-10 23:13:56 +09:30
parent 11ed5aed7b
commit c26a65c565
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/meshcombiner.cpp
View File

@ -73,9 +73,18 @@ bool MeshCombiner::Mesh::isSelfIntersected() const
return m_isSelfIntersected; return m_isSelfIntersected;
} }
void MeshCombiner::Mesh::markAsSelfIntersected()
{
m_isSelfIntersected = true;
}
MeshCombiner::Mesh *MeshCombiner::combine(const Mesh &firstMesh, const Mesh &secondMesh, Method method, MeshCombiner::Mesh *MeshCombiner::combine(const Mesh &firstMesh, const Mesh &secondMesh, Method method,
std::vector<std::pair<Source, size_t>> *combinedVerticesComeFrom) std::vector<std::pair<Source, size_t>> *combinedVerticesComeFrom)
{ {
if (firstMesh.isNull() || firstMesh.isSelfIntersected() ||
secondMesh.isNull() || secondMesh.isSelfIntersected())
return nullptr;
CgalMesh *resultCgalMesh = nullptr; CgalMesh *resultCgalMesh = nullptr;
CgalMesh *firstCgalMesh = (CgalMesh *)firstMesh.m_privateData; CgalMesh *firstCgalMesh = (CgalMesh *)firstMesh.m_privateData;
CgalMesh *secondCgalMesh = (CgalMesh *)secondMesh.m_privateData; CgalMesh *secondCgalMesh = (CgalMesh *)secondMesh.m_privateData;
@ -147,6 +156,9 @@ MeshCombiner::Mesh *MeshCombiner::combine(const Mesh &firstMesh, const Mesh &sec
Mesh *mesh = new Mesh; Mesh *mesh = new Mesh;
mesh->m_privateData = resultCgalMesh; mesh->m_privateData = resultCgalMesh;
if (CGAL::Polygon_mesh_processing::does_self_intersect(*resultCgalMesh)) {
mesh->markAsSelfIntersected();
}
return mesh; return mesh;
} }

1
src/meshcombiner.h
View File

@ -29,6 +29,7 @@ public:
void fetch(std::vector<QVector3D> &vertices, std::vector<std::vector<size_t>> &faces) const; void fetch(std::vector<QVector3D> &vertices, std::vector<std::vector<size_t>> &faces) const;
bool isNull() const; bool isNull() const;
bool isSelfIntersected() const; bool isSelfIntersected() const;
void markAsSelfIntersected();
friend MeshCombiner; friend MeshCombiner;