Backup_Repos/jsketcher
1
0
Fork 0
mirror of https://github.com/xibyte/jsketcher synced 2025-12-16 05:23:19 +01:00
Code Issues Projects Releases Wiki Activity

edge transferring

Browse source
This commit is contained in:
Val Erastov 2017-12-22 01:30:54 -08:00
parent e85fa9ec03
commit 2a358a057d
3 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
web/app/3d/debug.js
View file

@ -161,8 +161,8 @@ function addGlobalDebugActions(app) {
app.findAllSolidsOnScene().forEach(s => s.cadGroup.traverse(o => o.visible = false));
app.viewer.render();
},
ShowSolids: () => {
app.findAllSolidsOnScene().forEach(s => s.cadGroup.traverse(o => o.visible = true));
Solids: () => {
app.findAllSolidsOnScene().forEach(s => s.cadGroup.traverse(o => o.visible = false));
app.viewer.render();
},
Clear: () => {

7
web/app/brep/debug/brep-debug.js
View file

@ -3,7 +3,6 @@ class BRepDebug {
constructor() {
this.booleanSessions = [];
this.booleanDetectedLoopEdges = new Set();
}
startBooleanSession(a, b, type) {
@ -40,7 +39,6 @@ class BRepDebug {
booleanLoopDetectionSuccess(loop) {
let ld = last(this.currentBooleanSession.loopDetection);
loop.halfEdges.forEach(e => this.booleanDetectedLoopEdges.add(e));
ld.detectedLoops.push(loop);
ld.steps.push({type: 'LOOP_FOUND'});
}
@ -48,6 +46,10 @@ class BRepDebug {
booleanLoopDetectionNextStep(candidates, winner) {
last(this.currentBooleanSession.loopDetection).steps.push({type: 'NEXT_STEP_ANALYSIS', candidates, winner});
}
transferEdge(edge, face, chosenEdge) {
this.currentBooleanSession.transferedEdges.push({edge, face, chosenEdge});
}
}
class BooleanSession {
@ -58,6 +60,7 @@ class BooleanSession {
this.inputOperandA = a;
this.inputOperandB = b;
this.loopDetection = [];
this.transferedEdges = [];
this.mergeFacesLoopDetection = [];
this.currentLoopDetection = null;
}

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

@ -810,7 +810,7 @@ function intersectFaces(shellA, shellB, operationType) {
}
}
function chooseValidEdge(edge, face, operationType) {
export function chooseValidEdge(edge, face, operationType) {
let pt = edge.edge.curve.middlePoint();
let edgeTangent = edge.tangent(pt);
let edgeFaceNormal = edge.loop.face.surface.normal(pt);
@ -826,15 +826,20 @@ function transferEdges(faceSource, faceDest, operationType) {
continue;
}
for (let edge of loop.halfEdges) {
if (isEdgeTransfered(edge.edge)) {
if (isEdgeTransferred(edge.edge)) {
continue;
}
if (edgeCollinearToFace(edge, faceDest)) {
//not coincide with an edge
if (!faceDest.rayCast(edge.edge.curve.middlePoint()).strictInside) {
continue;
}
let validEdge = chooseValidEdge(edge, faceDest, operationType);
BREP_DEBUG.transferEdge(edge, faceDest, validEdge);
let twin = validEdge.twin();
twin.loop.face.data[MY].markTransferedFrom(twin);
markEdgeTransfered(twin.edge)
addNewEdge(face, twin);
twin.loop.face.data[MY].markTransferredFrom(twin);
markEdgeTransferred(twin.edge);
addNewEdge(faceDest, twin);
}
}
}
@ -1103,7 +1108,7 @@ function isNewNM(edge) {
return isNew(edge);
}
function markEdgeTransfered(edge) {
function markEdgeTransferred(edge) {
let data = edge.data[MY];
if (!data) {
data = {};
@ -1112,7 +1117,7 @@ function markEdgeTransfered(edge) {
data.transfered = true;
}
function isEdgeTransfered(edge) {
function isEdgeTransferred(edge) {
let data = edge.data[MY];
return data && data.transfered;
}
@ -1189,11 +1194,12 @@ class FaceSolveData extends EdgeGraph {
super();
this.face = face;
this.loopOfNew = new Loop(face);
this.loopOfNew.face = face;
face.innerLoops.push(this.loopOfNew);
this.errors = [];
}
markTransferedFrom(edge) {
markTransferredFrom(edge) {
if (!this.transferedFrom) {
this.transferedFrom = new Set();
}
@ -1317,12 +1323,13 @@ function edgeCollinearToFace(edge, face) {
let tess = edge.tessellate();
for (let i = 0; i < tess.length; ++i) {
let pt1 = tess[i];
let pt2 = face.surface.point(face.surface.param(pt1));
let [u, v] = face.surface.param(pt1);
let pt2 = face.surface.point(u, v);
if (!veq(pt1, pt2)) {
return false;
}
if (!face.rayCast(pt2)) {
if (!face.rayCast(pt2).inside) {
return false;
}
}