likang/cdsl-cad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(engine): 支持 up_to_surface 非均匀 profile 裁剪拉伸

Browse Source 
为 up_to_surface 终止条件新增裁剪语义，通过穿透拉伸与目标面布尔求交保留可达材料，修复非均匀相交时错误拒绝特征的问题。
This commit is contained in:
ganjihong
2026-08-27 15:40:58 +08:00
parent c84fc3ade4
commit 625b296e06
3 changed files with 310 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/engine/cdsl_engine/runtime.py
+61 -17
View File
@@ -44,6 +44,21 @@ class FeatureExecutionError(RuntimeError):
self.detail = detail
@dataclass(frozen=True)
class ExtentVector:
"""Single-directional extrusion displacement for one profile face.
``trim_to`` stays ``None`` for an exact vector extrusion. When set, the
extent means "extrude until the target face, trimming any profile region
that does not reach it" (up_to_surface trim semantics, issue #5). The
piercing distance is computed inside the adapter, so ``vector`` only
supplies the direction.
"""
vector: Vector3
trim_to: Any | None = None
class AtomicExecutor(Protocol):
atomic_id: str
@@ -62,6 +77,7 @@ class GeometryAdapter(Protocol):
def body_geometry(self, body: Any) -> dict[str, Any]: ...
def faces_for_sketch(self, sketch: dict[str, Any]) -> list[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: ...
def fuse(self, body: Any | None, solid: Any) -> Any: ...
def cut(self, body: Any, tool: Any) -> Any: ...
@@ -163,7 +179,7 @@ def _targeted_extent_vector(
*,
end_condition: dict[str, Any] | None = None,
offset_mm: float | None = None,
) -> Vector3:
) -> ExtentVector:
if session.body is None:
raise FeatureExecutionError("missing_extent_body", "Selector-dependent extent requires an existing body", extent=condition)
if condition == "through_next":
@@ -197,8 +213,20 @@ def _targeted_extent_vector(
try:
distance = session.adapter.uniform_intersection_distance(target, faces, direction)
except ValueError as error:
code = "non_uniform_extent_target" if "non-uniform" in str(error) else "extent_target_not_reached"
raise FeatureExecutionError(code, str(error), extent=condition) from error
message = str(error)
code = "non_uniform_extent_target" if "non-uniform" in message else "extent_target_not_reached"
if condition == "up_to_surface":
# #5 高级终止条件：profile 与目标面非均匀相交（部分采样点未
# 命中目标 → 悬空；或各点命中距离不一 → 斜目标面）时不再整体
# 拒绝，而是"裁剪"——只保留从 profile 到目标面之间的材料。
# extrude_trimmed 内部做穿透拉伸 + 与目标面体层布尔求交，未达
# 目标的部分被切掉（CAD "拉伸到面"标准语义）。若全部采样点都
# 未命中（profile 与目标面无交叠），extrude_trimmed 内部仍抛
# "not reached"，保持显式拒绝。
# up_to_vertex/up_to_body/offset_from_surface 无 face 可构造
# 裁剪体层，仍保持显式拒绝。
return ExtentVector(vector_scale(direction, 1.0), trim_to=target)
raise FeatureExecutionError(code, message, extent=condition) from error
if condition == "offset_from_surface":
offset = abs(float(offset_mm if offset_mm is not None else node.params.get("distance_mm") or 0.0))
distance -= offset
@@ -208,7 +236,7 @@ def _targeted_extent_vector(
"Offset distance reaches or passes the target surface",
extent=condition, offset_mm=offset,
)
return vector_scale(direction, distance)
return ExtentVector(vector_scale(direction, distance))
def _side_extent_vectors(
@@ -219,7 +247,7 @@ def _side_extent_vectors(
*,
end_condition: dict[str, Any],
distance_mm: float,
) -> list[Vector3]:
) -> list[ExtentVector]:
"""Resolve one directional extent without borrowing the opposite side.
``extrude_add_two_sided`` calls this once for each independently captured
@@ -231,17 +259,22 @@ def _side_extent_vectors(
if condition == "blind":
if distance <= 0:
raise ValueError("blind extent requires distance_mm > 0")
return [vector_scale(direction, distance)]
return [ExtentVector(vector_scale(direction, distance))]
if condition == "mid_plane":
if distance <= 0:
raise ValueError("mid_plane extent requires distance_mm > 0")
return [vector_scale(direction, distance / 2), vector_scale(direction, -distance / 2)]
return [
ExtentVector(vector_scale(direction, distance / 2)),
ExtentVector(vector_scale(direction, -distance / 2)),
]
if condition == "through_all":
if session.body is None:
if distance <= 0:
raise ValueError("through_all on an initial feature has no body and no fallback distance")
return [direction * distance]
return [vector_scale(direction, max(session.adapter.body_span(session.body, direction), 1.0) + 2.0)]
# 注意：Vector3 是 tuple，不能直接做 direction * distance（那是元组
# 重复），这里必须用 vector_scale 做数乘（顺带修复的隐藏 bug）。
return [ExtentVector(vector_scale(direction, distance))]
return [ExtentVector(vector_scale(direction, max(session.adapter.body_span(session.body, direction), 1.0) + 2.0))]
if condition in {"up_to_surface", "up_to_vertex", "offset_from_surface", "through_next", "up_to_body"}:
return [
_targeted_extent_vector(
@@ -257,7 +290,7 @@ def _extent_vectors(
faces: list[Any],
sketch: dict[str, Any],
session: ExecutionSession,
) -> list[Vector3]:
) -> list[ExtentVector]:
params = node.params
normal = vector_unit(_normal_from_sketch(sketch), field_name="sketch normal")
if bool(params.get("reverse")):
@@ -285,16 +318,19 @@ def _extent_vectors(
# against. The source must provide a usable blind component.
if distance <= 0:
raise ValueError("through_all on an initial feature has no body and no fallback distance")
return [vector_scale(normal, distance)]
return [ExtentVector(vector_scale(normal, distance))]
span = max(session.adapter.body_span(session.body, normal), 1.0) + 2.0
if condition == "through_all":
return [vector_scale(normal, span)]
return [ExtentVector(vector_scale(normal, span))]
if condition == "through_all_both":
return [vector_scale(normal, span), vector_scale(normal, -span)]
return [ExtentVector(vector_scale(normal, span)), ExtentVector(vector_scale(normal, -span))]
# Through-all-and-blind is represented by a through direction plus
# its captured opposite blind direction when available.
reverse_distance = abs(float(params.get("reverse_distance_mm") or 0.0))
return [vector_scale(normal, span), vector_scale(normal, -(reverse_distance or span))]
return [
ExtentVector(vector_scale(normal, span)),
ExtentVector(vector_scale(normal, -(reverse_distance or span))),
]
return _side_extent_vectors(
node, faces, normal, session, end_condition=end_condition, distance_mm=distance,
)
@@ -337,9 +373,17 @@ def _shape_from_primary(node: FeaturePlanNode, session: ExecutionSession, *, ske
# 3. 按特征类型生成子实体：
if node.atomic_id.startswith("extrude_"):
# 拉伸：先按终止条件（盲孔/贯穿/至面/双侧等）求出位移向量，
# 再对每个面沿每个向量做拉伸，得到实体列表。
vectors = _extent_vectors(node, faces, selected_sketch, session)
solids = [session.adapter.extrude(face, vector) for face in faces for vector in vectors]
# 再对每个面沿每个向量做拉伸，得到实体列表。up_to_surface 在
# profile 与目标面非均匀相交时（extent.trim_to 非空）改用裁剪
# 拉伸：穿透后与目标面求交，只保留可达部分（issue #5）。
extents = _extent_vectors(node, faces, selected_sketch, session)
solids: list[Any] = []
for face in faces:
for extent in extents:
if extent.trim_to is None:
solids.append(session.adapter.extrude(face, extent.vector))
else:
solids.append(session.adapter.extrude_trimmed(face, extent.trim_to, extent.vector))
else:
# 旋转：解析旋转轴并校验旋转角，然后绕轴旋转每个面得到实体列表。
axis = _revolve_axis(node, session)