Backup_Repos/jsketcher
1
0
Fork 0
mirror of https://github.com/xibyte/jsketcher synced 2025-12-24 01:15:25 +01:00
Code Issues Projects Releases Wiki Activity

fix merging overlapping faces

Browse source
This commit is contained in:
Val Erastov 2017-02-14 20:05:27 -08:00
parent a6ad3b5f60
commit 766b37ed44
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
web/app/brep/operations/boolean.js
View file

@ -390,10 +390,7 @@ function doMergeOverlappingFaces(face1, face2, keepNew) {
for (let e of face2.edges) {
const coi = findCoincidentEdge(e, allEdges);
if (coi == null) {
if (EdgeSolveData.get(e).newEdgeFlag === true) {
delete EdgeSolveData.get(e).newEdgeFlag;
EdgeSolveData.createIfEmpty(e).transferedSurface = face2.surface;
}
EdgeSolveData.createIfEmpty(e).transferedSurface = face2.surface;
allEdges.push(e);
} else {
if (EdgeSolveData.get(coi).newEdgeFlag === true) {
@ -407,11 +404,11 @@ function doMergeOverlappingFaces(face1, face2, keepNew) {
}
function sort(edges) {
function edgeOrder(e) {
if (EdgeSolveData.get(e).newEdgeFlag === true) {
return 2
} else if (EdgeSolveData.get(e).transferedSurface !== undefined) {
return 1;
}
if (EdgeSolveData.get(e).transferedSurface !== undefined) {
return EdgeSolveData.get(e).newEdgeFlag === true ? 2 : 1;
} else if (EdgeSolveData.get(e).newEdgeFlag === true) {
return 3;
} else
return 0;
}
edges.sort((e1, e2) => edgeOrder(e1) - edgeOrder(e2));