Backup_Repos/jsketcher
1
0
Fork 0
mirror of https://github.com/xibyte/jsketcher synced 2025-12-09 18:02:50 +01:00
Code Issues Projects Releases Wiki Activity

fix edge priorities

Browse source
This commit is contained in:
Val Erastov 2017-12-26 23:08:38 -07:00
parent c2cae6b40f
commit fdfa0519df
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -410,7 +410,7 @@ function mergeFaces(facesA, facesB, opType) {
let detectedLoops = detectLoops(originFace.surface, graph);
for (let loop of detectedLoops) {
for (let edge of loop.halfEdges) {
EdgeSolveData.setPriority(edge, 1);
// EdgeSolveData.setPriority(edge, 1);
discardedEdges.delete(edge);
allPoints.push(edge.vertexA.point);
}
@ -810,10 +810,11 @@ export function chooseValidEdge(edge, face, operationType) {
function transferEdges(faceSource, faceDest, operationType) {
for (let loop of faceSource.loops) {
for (let edge of loop.halfEdges) {
if (isEdgeTransferred(edge.edge)) {
continue;
}
if (edgeCollinearToFace(edge, faceDest)) {
if (isEdgeTransferred(edge.edge)) {
EdgeSolveData.addPriority(edge.twin(), 1);
continue;
}
let validEdge = chooseValidEdge(edge, faceDest, operationType);
BREP_DEBUG.transferEdge(edge, faceDest, validEdge);
let twin = validEdge.twin();
@ -1060,6 +1061,7 @@ export function isCurveEntersEdgeAtPoint(curve, edge, point) {
//TODO: rename to HalfEdgeSolveData
function EdgeSolveData() {
this.priority = 0;
}
EdgeSolveData.EMPTY = new EdgeSolveData();
@ -1086,8 +1088,12 @@ EdgeSolveData.transfer = function(from, to) {
to.data[MY] = from.data[MY];
};
EdgeSolveData.setPriority = function(halfEdge) {
EdgeSolveData.createIfEmpty(halfEdge).priority = true;
EdgeSolveData.setPriority = function(halfEdge, value) {
EdgeSolveData.createIfEmpty(halfEdge).priority = value;
};
EdgeSolveData.addPriority = function(halfEdge, value) {
EdgeSolveData.createIfEmpty(halfEdge).priority += value;
};
function getPriority(edge) {