@itwin/editor-frontend 3.0.0-dev.135 → 3.0.0-dev.140

package/lib/cjs/SolidModelingTools.js

@@ -7,7 +7,7 @@
  * @module Editing
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SpinFacesTool = exports.SweepFacesTool = exports.ChamferEdgesTool = exports.RoundEdgesTool = exports.BlendEdgesTool = exports.ImprintSolidElementsTool = exports.ImprintSolidMethod = exports.DeleteSubEntitiesTool = exports.HollowFacesTool = exports.OffsetFacesTool = exports.FaceLocationData = exports.LoftProfilesTool = exports.SweepAlongPathTool = exports.EmbossSolidElementsTool = exports.CutSolidElementsTool = exports.ThickenSheetElementsTool = exports.SewSheetElementsTool = exports.IntersectSolidElementsTool = exports.SubtractSolidElementsTool = exports.UniteSolidElementsTool = exports.BooleanOperationTool = void 0;
+exports.SpinFacesTool = exports.SweepFacesTool = exports.LocateFaceOrProfileTool = exports.ProfileLocationData = exports.ChamferEdgesTool = exports.RoundEdgesTool = exports.BlendEdgesTool = exports.ImprintSolidElementsTool = exports.ImprintSolidMethod = exports.DeleteSubEntitiesTool = exports.HollowFacesTool = exports.OffsetFacesTool = exports.FaceLocationData = exports.LoftProfilesTool = exports.SweepAlongPathTool = exports.EmbossSolidElementsTool = exports.CutSolidElementsTool = exports.ThickenSheetElementsTool = exports.SewSheetElementsTool = exports.IntersectSolidElementsTool = exports.SubtractSolidElementsTool = exports.UniteSolidElementsTool = exports.BooleanOperationTool = void 0;
 const editor_common_1 = require("@itwin/editor-common");
 const core_common_1 = require("@itwin/core-common");
 const core_geometry_1 = require("@itwin/core-geometry");
@@ -692,6 +692,7 @@ class ImprintSolidElementsTool extends ElementGeometryTool_1.LocateSubEntityTool
                 this.points.push(ev.point.clone());
                 if (!ev.isControlKey)
                     break;
+                this.setupAndPromptForNextAction();
                 return core_frontend_1.EventHandled.No;
             }
             default:
@@ -733,7 +734,7 @@ class ImprintSolidElementsTool extends ElementGeometryTool_1.LocateSubEntityTool
 exports.ImprintSolidElementsTool = ImprintSolidElementsTool;
 ImprintSolidElementsTool.toolId = "ImprintSolids";
 ImprintSolidElementsTool.iconSpec = "icon-move"; // TODO: Need better icon...
-/** @alpha Identify edges of solids and surfaces to apply blend to. */
+/** @alpha Base class for tools to identify edges of solids and surfaces and apply blends. */
 class BlendEdgesTool extends ElementGeometryTool_1.LocateSubEntityTool {
     constructor() {
         super(...arguments);
@@ -883,39 +884,83 @@ class ChamferEdgesTool extends BlendEdgesTool {
 exports.ChamferEdgesTool = ChamferEdgesTool;
 ChamferEdgesTool.toolId = "ChamferEdges";
 ChamferEdgesTool.iconSpec = "icon-move"; // TODO: Need better icon...
-/** @alpha Identify faces of solids and surfaces to translate. */
-class SweepFacesTool extends ElementGeometryTool_1.LocateSubEntityTool {
-    constructor() {
-        super(...arguments);
-        // TODO: Tool settings for sweep distance...
-        this.useDistance = false;
-        this.distance = 0.1;
-        this.addSmoothFaces = false;
+/** @alpha */
+class ProfileLocationData {
+    constructor(point, orientation) {
+        this.point = point;
+        this.orientation = orientation;
+    }
+}
+exports.ProfileLocationData = ProfileLocationData;
+/** @alpha Base class for picking profiles (open paths and regions) or faces of solids. */
+class LocateFaceOrProfileTool extends ElementGeometryTool_1.LocateSubEntityTool {
+    get wantGeometrySummary() { return true; }
+    wantSubEntityType(type) {
+        switch (type) {
+            case editor_common_1.SubEntityType.Face:
+            case editor_common_1.SubEntityType.Edge:
+                // Choose all faces or all edges...
+                return (0 === this._acceptedSubEntities.length || this._acceptedSubEntities[0].props.type === type);
+            default:
+                return false;
+        }
     }
-    get wantDynamics() { return true; }
-    get wantAccuSnap() { return this.isDynamicsStarted; }
-    // TODO: Sweep open path to surface, sweep surface to solid...
     get geometryCacheFilter() {
-        return { parts: true, curves: false, surfaces: true, solids: true, other: false };
+        return { parts: true, curves: true, surfaces: true, solids: true, other: false };
+    }
+    async doPickSubEntities(id, ev) {
+        const hits = await super.doPickSubEntities(id, ev);
+        if (undefined === hits)
+            return hits;
+        // Only want edges from wire bodies...
+        const accept = (editor_common_1.BRepEntityType.Wire === this.getBRepEntityTypeForSubEntity(id, hits[0].subEntity) ? editor_common_1.SubEntityType.Edge : editor_common_1.SubEntityType.Face);
+        return hits.filter((hit) => { return accept === hit.subEntity.type; });
     }
     async createSubEntityData(id, hit) {
         const data = await super.createSubEntityData(id, hit);
-        if (undefined !== hit.point && undefined !== hit.normal)
-            data.toolData = FaceLocationData.create(hit.point, hit.normal);
+        // Prefer orientation from snap to take entire path curve as well as placement z into account...
+        const snap = core_frontend_1.TentativeOrAccuSnap.getCurrentSnap(false);
+        const point = (id === (snap === null || snap === void 0 ? void 0 : snap.sourceId) && snap.isHot ? snap.snapPoint : core_geometry_1.Point3d.fromJSON(hit.point));
+        const matrix = (id === (snap === null || snap === void 0 ? void 0 : snap.sourceId) ? core_frontend_1.AccuDraw.getSnapRotation(snap, undefined) : undefined);
+        const invMatrix = matrix === null || matrix === void 0 ? void 0 : matrix.inverse(); // getSnapRotation returns row matrix...
+        if (undefined !== invMatrix)
+            data.toolData = new ProfileLocationData(point, invMatrix);
+        else
+            data.toolData = new ProfileLocationData(point, undefined !== hit.normal ? core_geometry_1.Vector3d.fromJSON(hit.normal) : core_geometry_1.Vector3d.unitZ());
         return data;
     }
+    drawSubEntity(context, subEntity, accepted) {
+        const id = this.getCurrentElement();
+        if (undefined !== id && editor_common_1.BRepEntityType.Solid !== this.getBRepEntityTypeForSubEntity(id, subEntity.props))
+            return; // Operation will be applied to wire or sheet body, don't display sub-entity...
+        super.drawSubEntity(context, subEntity, accepted);
+    }
     drawAcceptedSubEntities(context) {
         var _a;
         super.drawAcceptedSubEntities(context);
-        // Show pick point on last identified face, offset direction/distance will be computed from this location...
-        const faceData = (_a = this.getAcceptedSubEntityData()) === null || _a === void 0 ? void 0 : _a.toolData;
-        if (undefined === faceData)
+        // Show pick point on last identified face...
+        const profileData = (_a = this.getAcceptedSubEntityData()) === null || _a === void 0 ? void 0 : _a.toolData;
+        if (undefined === profileData)
             return;
         const builder = context.createGraphic({ type: core_frontend_1.GraphicType.WorldOverlay });
         builder.setSymbology(context.viewport.getContrastToBackgroundColor(), core_common_1.ColorDef.black, 10);
-        builder.addPointString([faceData.point]);
+        builder.addPointString([profileData.point]);
         context.addDecorationFromBuilder(builder);
     }
+}
+exports.LocateFaceOrProfileTool = LocateFaceOrProfileTool;
+/** @alpha Identify faces of solids and surfaces to translate. */
+class SweepFacesTool extends LocateFaceOrProfileTool {
+    constructor() {
+        super(...arguments);
+        // TODO: Tool settings for sweep distance...
+        this.useDistance = false;
+        this.distance = 0.1;
+        this.addSmoothFaces = false;
+    }
+    get wantDynamics() { return true; }
+    get wantAccuSnap() { return true; }
+    get wantSubEntitySnap() { return true; }
     async getSmoothFaces(id, face) {
         try {
             // NOTE: For sweep/translation, it makes sense to limit smooth to immediately adjacent...
@@ -929,10 +974,10 @@ class SweepFacesTool extends ElementGeometryTool_1.LocateSubEntityTool {
         var _a;
         if (undefined === ev.viewport || this.agenda.isEmpty || !this.haveAcceptedSubEntities)
             return undefined;
-        const faceData = (_a = this.getAcceptedSubEntityData()) === null || _a === void 0 ? void 0 : _a.toolData;
-        if (undefined === faceData)
+        const profileData = (_a = this.getAcceptedSubEntityData()) === null || _a === void 0 ? void 0 : _a.toolData;
+        if (undefined === profileData)
             return undefined;
-        const path = core_geometry_1.Vector3d.createStartEnd(faceData.point, ev.point);
+        const path = core_geometry_1.Vector3d.createStartEnd(profileData.point, ev.point);
         if (this.useDistance && undefined === path.scaleToLength(this.distance, path))
             return undefined;
         if (path.magnitude() < core_geometry_1.Geometry.smallMetricDistance)
@@ -946,20 +991,24 @@ class SweepFacesTool extends ElementGeometryTool_1.LocateSubEntityTool {
                 requestId: `${this.toolId}:${id}`,
                 writeChanges: isAccept ? true : undefined,
             };
-            const faces = this.getAcceptedSubEntities();
+            const subEntities = this.getAcceptedSubEntities();
+            const params = { path };
+            if (editor_common_1.SubEntityType.Edge === subEntities[0].type || editor_common_1.BRepEntityType.Solid !== this.getBRepEntityTypeForSubEntity(id, subEntities[0])) {
+                return await ElementGeometryTool_1.ElementGeometryCacheTool.callCommand("sweepFaces", id, params, opts);
+            }
             if (this.addSmoothFaces) {
                 const allSmoothFaces = [];
-                for (const face of faces) {
+                for (const face of subEntities) {
                     const smoothFaces = await this.getSmoothFaces(id, face);
                     if (undefined !== smoothFaces)
                         allSmoothFaces.push(...smoothFaces);
                 }
                 for (const smooth of allSmoothFaces) {
-                    if (undefined === faces.find((selected) => (0, ElementGeometryTool_1.isSameSubEntity)(selected, smooth)))
-                        faces.unshift(smooth); // Preserve last selected entry as reference face...
+                    if (undefined === subEntities.find((selected) => (0, ElementGeometryTool_1.isSameSubEntity)(selected, smooth)))
+                        subEntities.unshift(smooth); // Preserve last selected entry as reference face...
                 }
             }
-            const params = { faces, path };
+            params.faces = subEntities;
             return await ElementGeometryTool_1.ElementGeometryCacheTool.callCommand("sweepFaces", id, params, opts);
         }
         catch (err) {
@@ -970,16 +1019,16 @@ class SweepFacesTool extends ElementGeometryTool_1.LocateSubEntityTool {
         var _a;
         if (!this.haveAcceptedSubEntities)
             return;
-        const faceData = (_a = this.getAcceptedSubEntityData()) === null || _a === void 0 ? void 0 : _a.toolData;
-        if (undefined === faceData)
+        const profileData = (_a = this.getAcceptedSubEntityData()) === null || _a === void 0 ? void 0 : _a.toolData;
+        if (undefined === profileData)
             return;
         const hints = new core_frontend_1.AccuDrawHintBuilder();
         hints.setOriginFixed = true;
         hints.setLockY = true;
         hints.setLockZ = true;
         hints.setModeRectangular();
-        hints.setOrigin(faceData.point);
-        hints.setXAxis2(faceData.normal);
+        hints.setOrigin(profileData.point);
+        hints.setXAxis2(profileData.orientation instanceof core_geometry_1.Matrix3d ? profileData.orientation.getColumn(2) : profileData.orientation);
         hints.sendHints(false);
     }
     async onRestartTool() {
@@ -992,28 +1041,16 @@ exports.SweepFacesTool = SweepFacesTool;
 SweepFacesTool.toolId = "SweepFaces";
 SweepFacesTool.iconSpec = "icon-move"; // TODO: Need better icon...
 /** @alpha Identify faces of solids and surfaces to revolve. */
-class SpinFacesTool extends ElementGeometryTool_1.LocateSubEntityTool {
+class SpinFacesTool extends LocateFaceOrProfileTool {
     constructor() {
         super(...arguments);
-        this.points = [];
         // TODO: Tool settings for sweep angle...
         this.sweep = core_geometry_1.Angle.piOver2Radians;
+        this.points = [];
     }
     get wantDynamics() { return true; }
-    get wantAccuSnap() { return this.isDynamicsStarted || (this.haveAcceptedSubEntities && !this.isControlDown); }
-    // TODO: Spin open path to surface, spin surface to solid...
-    get geometryCacheFilter() {
-        return { parts: true, curves: false, surfaces: true, solids: true, other: false };
-    }
-    getSubEntityFilter() {
-        return { nonPlanarFaces: true };
-    }
-    async createSubEntityData(id, hit) {
-        const data = await super.createSubEntityData(id, hit);
-        if (undefined !== hit.point && undefined !== hit.normal)
-            data.toolData = FaceLocationData.create(hit.point, hit.normal);
-        return data;
-    }
+    get wantAccuSnap() { return true; }
+    get wantSubEntitySnap() { return true; }
     async applyAgendaOperation(ev, isAccept) {
         if (undefined === ev.viewport || this.agenda.isEmpty || !this.haveAcceptedSubEntities || this.points.length < (isAccept ? 2 : 1))
             return undefined;
@@ -1031,8 +1068,12 @@ class SpinFacesTool extends ElementGeometryTool_1.LocateSubEntityTool {
                 requestId: `${this.toolId}:${id}`,
                 writeChanges: isAccept ? true : undefined,
             };
-            const faces = this.getAcceptedSubEntities();
-            const params = { faces, origin, direction, angle };
+            const subEntities = this.getAcceptedSubEntities();
+            const params = { origin, direction, angle };
+            if (editor_common_1.SubEntityType.Edge === subEntities[0].type || editor_common_1.BRepEntityType.Solid !== this.getBRepEntityTypeForSubEntity(id, subEntities[0])) {
+                return await ElementGeometryTool_1.ElementGeometryCacheTool.callCommand("spinFaces", id, params, opts);
+            }
+            params.faces = subEntities;
             let result = await ElementGeometryTool_1.ElementGeometryCacheTool.callCommand("spinFaces", id, params, opts);
             // Spun face can be used to create a pocket...retry with negative sweep...
             if (undefined === result) {
@@ -1057,7 +1098,7 @@ class SpinFacesTool extends ElementGeometryTool_1.LocateSubEntityTool {
         super.onDynamicFrame(ev, context);
     }
     async gatherInput(ev) {
-        if (this.haveAcceptedSubEntities)
+        if (!this.wantAdditionalSubEntities)
             this.points.push(ev.point.clone());
         return super.gatherInput(ev);
     }
@@ -1068,13 +1109,16 @@ class SpinFacesTool extends ElementGeometryTool_1.LocateSubEntityTool {
         var _a;
         if (!this.haveAcceptedSubEntities || 0 !== this.points.length)
             return;
-        const faceData = (_a = this.getAcceptedSubEntityData()) === null || _a === void 0 ? void 0 : _a.toolData;
-        if (undefined === faceData)
+        const profileData = (_a = this.getAcceptedSubEntityData()) === null || _a === void 0 ? void 0 : _a.toolData;
+        if (undefined === profileData)
             return;
         const hints = new core_frontend_1.AccuDrawHintBuilder();
         hints.setModeRectangular();
-        hints.setOrigin(faceData.point);
-        hints.setNormal(faceData.normal);
+        hints.setOrigin(profileData.point);
+        if (profileData.orientation instanceof core_geometry_1.Matrix3d)
+            hints.setMatrix(profileData.orientation);
+        else
+            hints.setNormal(profileData.orientation);
         hints.sendHints(false);
     }
     async onRestartTool() {