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

Updated revolve to use new face/edge production analyzer

Browse source
This commit is contained in:
Mike Molinari 2022-06-05 23:23:46 +00:00 committed by Val Erastov
parent 8b6ebe21ec
commit 0f0862f8ee
1 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
modules/workbenches/modeler/features/revolve/revolve.operation.ts
View file

@ -5,6 +5,14 @@ import {EntityKind} from "cad/model/entities";
import {BooleanDefinition} from "cad/craft/schema/common/BooleanDefinition";
import Axis from "math/axis";
import {OperationDescriptor} from "cad/craft/operationPlugin";
import { Edge } from "brep/topo/edge";
import { FaceRef } from "cad/craft/e0/OCCUtils";
import { GetRef } from "cad/craft/e0/interact";
import {
FromMObjectProductionAnalyzer,
FromSketchProductionAnalyzer,
ProductionAnalyzer
} from "cad/craft/production/productionAnalyzer";
interface RevolveParams {
angle: number;
@ -26,18 +34,38 @@ export const RevolveOperation: OperationDescriptor<RevolveParams> = {
const face = params.face;
let occFaces = [];
let sketchId = face.id;
let sketch = ctx.sketchStorageService.readSketch(sketchId);
let sweepSources: FaceRef[];
let sketch = ctx.sketchStorageService.readSketch(face.id);
if (!sketch) {
occFaces.push(params.face);
}else{
occFaces = occ.utils.sketchToFaces(sketch, face.csys).map(ref => ref.face);
if (face instanceof MBrepFace) {
occ.io.pushModel(face, face.id)
const edges = face.edges;
edges.forEach(e => occ.io.pushModel(e, e.id));
sweepSources = [{
face: face.id,
edges: edges.map(e => e.id)
}];
} else {
throw "can't extrude an empty surface";
}
} else {
let csys = face.csys;
if (params.doubleSided) {
csys = csys.clone();
csys.origin._minus(extrusionVector);
extrusionVector._scale(2);
}
sweepSources = occ.utils.sketchToFaces(sketch, csys)
}
const productionAnalyzer = new FromSketchProductionAnalyzer(sweepSources);
const tools = occFaces.map((faceName, i) => {
const tools = sweepSources.map((faceRef, i) => {
const faceName = faceRef.face;
const shapeName = "Tool/" + i;
var args = [shapeName, faceName, ...params.axis.origin.data(), ...params.axis.direction.data(), params.angle];
oci.revol(...args);
@ -45,8 +73,7 @@ export const RevolveOperation: OperationDescriptor<RevolveParams> = {
return shapeName;
});
return occ.utils.applyBooleanModifier(tools, params.boolean);
return occ.utils.applyBooleanModifier(tools, params.boolean, productionAnalyzer, [face]);
},
form: [