feat(cadfs): 补齐核心建模能力并建立代表性回归

- 新增 loft、双向切除、through-all/up-to-next 等 CADFS lowering 与 engine 支持 - 支持多种 reference plane、B-spline profile 和 circular pattern replay - 保留 transform 历史，并烘焙安全的单源平移/旋转变换 - 改进 selector 绑定、拓扑快照和 pattern 变换处理 - 建立 17 个代表样本的转换、重建与比较回归工具链 - 补充 schema、author guidance、运行时和几何回归测试
2026-09-07 18:21:07 +08:00
parent 4ad890b7b4
commit 038d38ed98
31 changed files with 2498 additions and 85 deletions
@@ -20,8 +20,8 @@ from .sketch_solver import CORE_SHAPE_GENERATORS, resolve_required_sketches


 ALL_ATOMIC_IDS = frozenset({
-    "extrude_add_blind", "extrude_add_two_sided", "extrude_cut_blind",
-    "extrude_cut_through",
+    "extrude_add_blind", "extrude_add_two_sided", "extrude_cut_blind", "extrude_cut_two_sided",
+    "extrude_cut_through", "loft_add",
    "revolve_add", "revolve_cut", "hole_blind", "hole_countersink",
    "hole_counterbore", "sphere_add", "box_add", "cylinder_add",
    "reference_plane", "reference_axis",
@@ -82,6 +82,7 @@ class GeometryAdapter(Protocol):
    def body_solids(self, body: Any) -> list[Any]: ...
    def body_geometry(self, body: Any) -> dict[str, Any]: ...
    def faces_for_sketch(self, sketch: dict[str, Any]) -> list[Any]: ...
+    def loft(self, sketches: list[dict[str, Any]]) -> Any: ...
    def extrude(self, face: Any, direction: Vector3) -> Any: ...
    def extrude_trimmed(self, face: Any, target: Any, direction: Vector3) -> Any: ...
    def revolve(self, face: Any, angle_deg: float, axis: AxisSpec) -> Any: ...
@@ -236,7 +237,7 @@ def _targeted_extent_vector(
        except ValueError as error:
            message = str(error)
            code = "non_uniform_extent_target" if "non-uniform" in message else "extent_target_not_reached"
-            if condition == "up_to_surface":
+            if condition in {"up_to_surface", "through_next"}:
                # #5 高级终止条件：profile 与目标面非均匀相交（部分采样点未
                # 命中目标 → 悬空；或各点命中距离不一 → 斜目标面）时不再整体
                # 拒绝，而是"裁剪"——只保留从 profile 到目标面之间的材料。
@@ -244,6 +245,7 @@ def _targeted_extent_vector(
                # 目标的部分被切掉（CAD "拉伸到面"标准语义）。若全部采样点都
                # 未命中（profile 与目标面无交叠），extrude_trimmed 内部仍抛
                # "not reached"，保持显式拒绝。
+                # through_next 从当前主体中选取实际命中的下一张面；
                # up_to_vertex/up_to_body/offset_from_surface 无 face 可构造
                # 裁剪体层，仍保持显式拒绝。
                return ExtentVector(vector_scale(direction, 1.0), trim_to=target)
@@ -271,7 +273,7 @@ def _side_extent_vectors(
 ) -> list[ExtentVector]:
    """Resolve one directional extent without borrowing the opposite side.

-    ``extrude_add_two_sided`` calls this once for each independently captured
+    ``extrude_add_two_sided`` and ``extrude_cut_two_sided`` call this once for each independently captured
    termination.  The regular one-sided executor also uses it for all simple
    termination modes, keeping the geometry adapter interface uniform.
    """
@@ -319,7 +321,7 @@ def _extent_vectors(
    end_condition = params.get("end_condition") or {"type": "blind"}
    condition = end_condition.get("type", "blind")
    distance = abs(float(params.get("distance_mm") or 0.0))
-    if node.atomic_id == "extrude_add_two_sided":
+    if node.atomic_id in {"extrude_add_two_sided", "extrude_cut_two_sided"}:
        reverse_condition = params.get("reverse_end_condition") or {"type": "blind"}
        reverse_distance = abs(float(params.get("reverse_distance_mm") or 0.0))
        if reverse_distance <= 0:
@@ -457,6 +459,21 @@ def _shape_from_primary(node: FeaturePlanNode, session: ExecutionSession, *, ske
    return session.result(node)


+def _execute_loft_add(node: FeaturePlanNode, session: ExecutionSession) -> FeatureResult:
+    # 放样截面不占用 feature.sketch_id；按有序 profile_sketch_ids 取已解析
+    # 草图，并由 adapter 统一校验单闭环、无内环等内核输入约束。
+    profile_ids = node.params.get("profile_sketch_ids") or []
+    profiles: list[dict[str, Any]] = []
+    for sketch_id in profile_ids:
+        sketch = session.sketches.get(str(sketch_id))
+        if sketch is None:
+            raise ValueError(f"loft profile sketch {sketch_id!r} is not resolved")
+        profiles.append(sketch)
+    solid = session.adapter.loft(profiles)
+    session.register_body(node.feature_id, session.adapter.fuse(session.body, solid), replay_node=node)
+    return session.result(node)
+
+
 def _execute_reference_plane(node: FeaturePlanNode, session: ExecutionSession) -> FeatureResult:
    # 基准面特征（reference_plane）执行入口：从参数解析平面并登记为拓扑上下文。
    
@@ -763,6 +780,11 @@ def _translated_sketch(sketch: dict[str, Any], offset: Vector3) -> dict[str, Any
                for point_key in ("start_mm", "end_mm", "center_mm"):
                    if point_key in value:
                        value[point_key] = [float(value[point_key][index]) + components[index] for index in range(3)]
+                if "points_mm" in value:
+                    value["points_mm"] = [
+                        [float(point[index]) + components[index] for index in range(3)]
+                        for point in value["points_mm"]
+                    ]
                for child in value.values():
                    translate(child)
            elif isinstance(value, list):
@@ -772,6 +794,30 @@ def _translated_sketch(sketch: dict[str, Any], offset: Vector3) -> dict[str, Any
    return output


+def _transformed_loft_profiles(
+    node: FeaturePlanNode,
+    params: dict[str, Any],
+    instance_id: str,
+    session: ExecutionSession,
+    transform: Callable[[dict[str, Any]], dict[str, Any]],
+) -> None:
+    """为 pattern replay 创建放样截面的变换副本。"""
+    if node.atomic_id != "loft_add":
+        return
+    profile_ids = params.get("profile_sketch_ids") or []
+    transformed_ids: list[str] = []
+    for index, sketch_id in enumerate(profile_ids):
+        source = session.sketches.get(str(sketch_id))
+        if source is None:
+            raise ValueError(f"loft profile sketch {sketch_id!r} has no replay definition")
+        transformed_id = f"{instance_id}.profile.{index}"
+        # 不复用原 profile：pattern 中的每个截面都必须与 source feature
+        # 使用相同的平移、镜像或旋转，才能保持放样的真实空间位置。
+        session.sketches[transformed_id] = transform(source)
+        transformed_ids.append(transformed_id)
+    params["profile_sketch_ids"] = transformed_ids
+
+
 def _owner_plane_frame(session: ExecutionSession, selector: dict[str, Any]) -> dict[str, Any] | None:
    """解析 selector 的 owner 特征（reference_plane）注册的显式平面 frame。

@@ -812,6 +858,10 @@ def _translated_node(node: FeaturePlanNode, instance_id: str, offset: Vector3, s
        # box_add/sphere_add 以世界坐标几何中心定位；平移重放必须随实例移动该中心，
        # 否则阵列副本会静默重合在原位置。
        params["center_mm"] = [float(center[index]) + components[index] for index in range(3)]
+    _transformed_loft_profiles(
+        node, params, instance_id, session,
+        lambda sketch: _translated_sketch(sketch, offset),
+    )
    mirror_plane = params.get("mirror_plane")
    if isinstance(mirror_plane, dict) and node.atomic_id == "pattern_mirror":
        # #6 pattern 引用重解析：镜像面是 reference_plane 引用，随实例平移
@@ -919,6 +969,12 @@ def _mirrored_sketch(sketch: dict[str, Any], plane: PlaneSpec) -> dict[str, Any]
                point = value.get(point_key)
                if isinstance(point, list) and len(point) == 2:
                    value[point_key] = [float(point[0]), -float(point[1])]
+            if isinstance(value.get("points"), list):
+                value["points"] = [
+                    [float(point[0]), -float(point[1])]
+                    for point in value["points"]
+                    if isinstance(point, list) and len(point) == 2
+                ]
            for child in value.values():
                mirror_local_coordinates(child)
        elif isinstance(value, list):
@@ -935,6 +991,8 @@ def _mirrored_sketch(sketch: dict[str, Any], plane: PlaneSpec) -> dict[str, Any]
            for point_key in ("start_mm", "end_mm", "center_mm"):
                if point_key in value:
                    value[point_key] = _reflect_point(value[point_key], plane)
+            if "points_mm" in value:
+                value["points_mm"] = [_reflect_point(point, plane) for point in value["points_mm"]]
            if value.get("normal"):
                value["normal"] = _reflect_point(value["normal"], plane, vector=True)
            for child in value.values():
@@ -994,6 +1052,10 @@ def _mirrored_node(node: FeaturePlanNode, instance_id: str, plane: PlaneSpec, se
        # 世界轴对齐，跨坐标平面镜像后仍保持朝向（斜镜像面在 _execute_mirror_pattern
        # 中已被显式拒绝）。
        params["center_mm"] = _reflect_point(center, plane)
+    _transformed_loft_profiles(
+        node, params, instance_id, session,
+        lambda sketch: _mirrored_sketch(sketch, plane),
+    )
    mirror_plane = params.get("mirror_plane")
    if isinstance(mirror_plane, dict) and node.atomic_id == "pattern_mirror":
        # #6 pattern 引用重解析：镜像重放 mirror source 时，其镜像面引用
@@ -1102,7 +1164,7 @@ def _rotated_sketch(sketch: dict[str, Any], axis: AxisSpec, angle_rad: float) ->
    # 环形阵列实例的草图：工作平面 frame（原点为点、x/y/normal 为向量）绕轴旋转；
    # 2D 局部实体坐标不动（frame 旋转后由草图求解器映射到新世界位置）。与
    # _translated_sketch 对"世界坐标轮廓点"的处理对称，这里把 start/end/center
-    # 世界坐标点绕轴旋转。
+    # 世界坐标点和圆弧法向绕轴旋转。
    output = deepcopy(sketch)
    workplane = output.get("workplane") or {}
    if workplane.get("origin_mm"):
@@ -1117,6 +1179,10 @@ def _rotated_sketch(sketch: dict[str, Any], axis: AxisSpec, angle_rad: float) ->
            for point_key in ("start_mm", "end_mm", "center_mm"):
                if point_key in value:
                    value[point_key] = _rotated_point(value[point_key], axis, angle_rad)
+            if "points_mm" in value:
+                value["points_mm"] = [_rotated_point(point, axis, angle_rad) for point in value["points_mm"]]
+            if "normal" in value:
+                value["normal"] = list(_rotated_vector(tuple(float(v) for v in value["normal"]), axis, angle_rad))
            for child in value.values():
                rotate(child)
        elif isinstance(value, list):
@@ -1168,6 +1234,10 @@ def _rotated_node(node: FeaturePlanNode, instance_id: str, axis: AxisSpec, angle
    center = params.get("center_mm")
    if isinstance(center, list) and len(center) == 3:
        params["center_mm"] = _rotated_point(center, axis, angle_rad)
+    _transformed_loft_profiles(
+        node, params, instance_id, session,
+        lambda sketch: _rotated_sketch(sketch, axis, angle_rad),
+    )
    if node.atomic_id in {"pattern_mirror", "pattern_circular"}:
        # pattern 引用旋转重解析：镜像面 / 内层源随本实例一起旋转，否则嵌套
        # pattern 作为 circular source 时重放会退化成错误几何（见 _translated_node）。
@@ -1281,6 +1351,11 @@ def _primary_executor(node: FeaturePlanNode, session: ExecutionSession, sketch:
    return _shape_from_primary(node, session, sketch=sketch)


+def _loft_executor(node: FeaturePlanNode, session: ExecutionSession, sketch: dict[str, Any] | None) -> FeatureResult:
+    del sketch
+    return _execute_loft_add(node, session)
+
+
 def _reference_plane_executor(node: FeaturePlanNode, session: ExecutionSession, sketch: dict[str, Any] | None) -> FeatureResult:
    del sketch
    return _execute_reference_plane(node, session)
@@ -1347,7 +1422,9 @@ EXECUTORS: dict[str, ExecutorFunction] = {
    "extrude_add_blind": _primary_executor,
    "extrude_add_two_sided": _primary_executor,
    "extrude_cut_blind": _primary_executor,
+    "extrude_cut_two_sided": _primary_executor,
    "extrude_cut_through": _primary_executor,
+    "loft_add": _loft_executor,
    "revolve_add": _primary_executor,
    "revolve_cut": _primary_executor,
    "hole_blind": _hole_executor,