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 nested faces bug

Browse source
This commit is contained in:
Val Erastov 2017-04-10 00:47:53 -07:00
parent 954d616703
commit 7afd2a8be6
2 changed files with 51 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -616,31 +616,50 @@ function traverseFaces(face, validFaces, callback) {
}
export function loopsToFaces(originFace, loops, out) {
function createFaces(nestedLoop, surface) {
const originSurface = originFace.surface;
let invertedSurface = null;
function invertSurface(surface) {
if (surface == originSurface) {
if (invertedSurface == null) {
invertedSurface = originSurface.invert();
}
return invertedSurface;
} else {
return originSurface;
}
}
function createFaces(nestedLoop, surface, level) {
if (!nestedLoop.loop.isCCW(surface)) {
surface = invertSurface(surface);
}
const loop = nestedLoop.loop;
const newFace = new Face(surface);
Object.assign(newFace.data, originFace.data);
newFace.outerLoop = loop;
loop.face = newFace;
out.push(newFace);
for (let child of nestedLoop.nesting) {
if (child.loop.isCCW(surface)) {
createFaces(child, surface);
} else {
child.loop.face = newFace;
newFace.innerLoops.push(child.loop);
if (child.level == level + 2) {
createFaces(child, surface, level + 2);
} else if (child.level == level + 1) {
if (!child.loop.isCCW(surface)) {
child.loop.face = newFace;
newFace.innerLoops.push(child.loop);
} else {
createFaces(child, surface, level + 1);
}
}
}
}
const beforeLength = out.length;
const nestedLoops = getNestedLoops(originFace, loops);
//loops.forEach(l => l.halfEdges.forEach(h => __DEBUG__.AddHalfEdge(h)))
for (let nestedLoop of nestedLoops) {
let surface = originFace.surface;
if (!nestedLoop.loop.isCCW(surface)) {
surface = surface.invert();
if (nestedLoop.level == 0) {
createFaces(nestedLoop, originSurface, 0);
}
createFaces(nestedLoop, surface);
}
if (out.length > beforeLength) {
out[beforeLength].id = originFace.id;

23
web/test/cases/brep-bool-wizard-based.js
View file

@ -115,12 +115,31 @@ export default {
}));
},
test_NESTED_FACES: function(env) {
test.emptyModeller(env.test((win, app) => {
app.actionManager.actions['BOX'].invoke(app);
app.ui.registeredWizard.okClick();
setSketch(win, app, '0:2', {"layers":[{"name":"sketch","data":[{"id":34,"_class":"TCAD.TWO.Segment","points":[[28,[29,-150],[30,150]],[31,[32,150],[33,150]]],"children":[34]},{"id":41,"_class":"TCAD.TWO.Segment","points":[[35,[36,150],[37,150]],[38,[39,150],[40,-150]]],"children":[41]},{"id":48,"_class":"TCAD.TWO.Segment","points":[[42,[43,150],[44,-150]],[45,[46,-150],[47,-150]]],"children":[48]},{"id":55,"_class":"TCAD.TWO.Segment","points":[[49,[50,-150],[51,-150]],[52,[53,-150],[54,150]]],"children":[55]}]}]} );
setSketch(win, app, '0:0', {"layers":[{"name":"sketch","data":[{"id":34,"_class":"TCAD.TWO.Segment","points":[[28,[29,-220],[30,220]],[31,[32,8.881784197001252e-15],[33,220]]],"children":[34]},{"id":41,"_class":"TCAD.TWO.Segment","points":[[35,[36,8.881784197001252e-15],[37,220]],[38,[39,8.881784197001252e-15],[40,-1.4210854715202004e-14]]],"children":[41]},{"id":48,"_class":"TCAD.TWO.Segment","points":[[42,[43,8.881784197001252e-15],[44,-1.4210854715202004e-14]],[45,[46,-220],[47,-1.4210854715202004e-14]]],"children":[48]},{"id":55,"_class":"TCAD.TWO.Segment","points":[[49,[50,-220],[51,-1.4210854715202004e-14]],[52,[53,-220],[54,220]]],"children":[55]}]}]} );
extrude(app, '0:2', 50);
cut(app, '0:0', 500);
assertScene(app, env, {"format":"LOOPS","vertices":[[-250,-250,-250],[-250,-250,250],[-250,24.438723388262304,-169.15430109914888],[-250,170.1126824084925,-44.56473088447832],[-250,250,-250],[-250,250,250],[-200,24.438723388262304,-169.15430109914888],[-200,170.1126824084925,-44.56473088447832],[-200,250,-250],[250,-250,-250],[250,-250,250],[250,250,-250],[250,250,250]],"faces":[[[9,10,1,0]],[[11,12,10,9]],[[4,5,12,11,8]],[[4,3,2,4,0,1,5]],[[5,1,10,12]],[[0,4,8,11,9]],[[4,2,6,8]],[[2,3,7,6]],[[3,4,8,7]],[[6,7,8]]]});
env.done();
}));
},
};
function cut(app, faceId, depth, prism) {
cutExtrude(app, faceId, depth, prism, true);
}
function extrude(app, faceId, depth, prism) {
cutExtrude(app, faceId, depth, prism, false);
}
function cutExtrude(app, faceId, depth, prism, cut) {
selectFace(app, faceId);
app.actionManager.actions['CUT'].invoke(app);
app.actionManager.actions[cut ? 'CUT' : 'EXTRUDE'].invoke(app);
app.ui.registeredWizard.setFormField('value', depth);
if (prism !== undefined) {
app.ui.registeredWizard.setFormField('prism', prism);