Campus pipeline hardening: backend parity, wall union, mullion grids, Draco tooling
Sandbox round (Linux): - detect_sheet_frames.py: multi-frame sheet splitter (column AND row layouts), grid-vote per-floor offsets, section-elevation harvesting for storey heights - dwg_dump_json.mjs + dwgjson_to_dxf.py: WASM libredwg DWG->DXF fallback (blocks/INSERT preserved, ATTRIB->TEXT so axis labels survive) - assemble_campus.py: manifest-driven campus assembly with mandatory neighbour-gap gate (overlap = exit 3, 0.1-0.3m flagged as expansion joints) - site_context_from_dump.py: site-context floors (ground/roads/parking/ fence/trees/context massings) from site-plan dumps - write_offline_viewer.py + assets/offline-viewer-libs/: fully-offline single-file viewer (vendored three r147 + pako, gzip-embedded GLB) - audit: clip-scoped coverage figures; report: multi_frame_sheet warning; audit gate floors_aligned catches the diagonal-staircase failure mode Mac round: - build_blender_showcase.py now honors slab_bounds_fallback and prefers footprint polygons for generated roofs (bounds rects made roof plates jut past the facade and buried campuses under full-extent slabs); contract now matches spec_to_glb.py exactly - merge_wall_solids (default off) in BOTH backends: shapely union in spec_to_glb.py, native delaunay_2d_cdt union in Blender; endpoint-shared wall ends pre-extended w/2 so L-corners close seamlessly (flat caps leave a notch a union alone cannot fill) while openings stay flat - glazing_mullions (default off): curtain-wall panel grid (verticals every glazing_panel_w + floor-line transoms) as pseudo wall segments in the <floor>__walls node; glass pane kept - build_showcase_variants.py keeps source_file=="site" floors intact in all variants (roads/trees live on filtered categories) - web template: instanced low-poly trees from metadata site_trees, grade-level shadow catcher (was at basement depth), data-URI favicon - tools/compress.mjs deps pinned (package.json); 15MB campus GLB -> 0.57MB - tests: 24 -> 52 checks (wall union, mullions, byte-identical defaults) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -162,12 +162,47 @@ def xref_definitions(doc) -> list[dict]:
|
||||
return xrefs
|
||||
|
||||
|
||||
import re as _re
|
||||
|
||||
PLAN_TITLE_RE = _re.compile(r"平面图$")
|
||||
PLAN_TITLE_EXCLUDE_RE = _re.compile(r"(示意|疏散|分区|索引|定位|总平面|放大|详图|布置|大样)")
|
||||
|
||||
|
||||
def count_plan_titles(entities) -> int:
|
||||
"""Distinct plan-frame titles in modelspace (multi-frame sheet detector)."""
|
||||
seen = set()
|
||||
for entity in entities:
|
||||
kind = entity.dxftype()
|
||||
if kind not in {"TEXT", "MTEXT"}:
|
||||
continue
|
||||
try:
|
||||
text = str(entity.dxf.text if kind == "TEXT" else entity.plain_text() or "").strip()
|
||||
except Exception:
|
||||
continue
|
||||
if not text or len(text) > 40:
|
||||
continue
|
||||
if PLAN_TITLE_RE.search(text) and not PLAN_TITLE_EXCLUDE_RE.search(text):
|
||||
try:
|
||||
pos = entity.dxf.insert
|
||||
seen.add((text, round(float(pos.x) / 5000), round(float(pos.y) / 5000)))
|
||||
except Exception:
|
||||
seen.add((text, 0, 0))
|
||||
return len(seen)
|
||||
|
||||
|
||||
def file_warnings(item: dict) -> list[str]:
|
||||
warnings = []
|
||||
entities = item.get("modelspace_entities")
|
||||
xrefs = item.get("xref_definitions", [])
|
||||
if entities is None:
|
||||
return warnings
|
||||
plan_titles = item.get("plan_title_count", 0)
|
||||
if plan_titles >= 2:
|
||||
warnings.append(
|
||||
f"multi_frame_sheet: {plan_titles} plan-frame titles (XX平面图) found in ONE modelspace. "
|
||||
"This file holds a whole sheet set — never model it as a single floor and never stack frames "
|
||||
"without per-floor offsets. Run scripts/detect_sheet_frames.py to generate clip/offset config."
|
||||
)
|
||||
if xrefs and entities < NEAR_EMPTY_ENTITY_THRESHOLD:
|
||||
names = ", ".join(x["name"] for x in xrefs[:4])
|
||||
warnings.append(
|
||||
@@ -231,6 +266,7 @@ def inspect_file(path: Path, ezdxf, bbox, recover) -> dict:
|
||||
"measurement": int(header.get("$MEASUREMENT", 0) or 0),
|
||||
"unit_guess": guess_unit_scale(geometry_bbox, insunits),
|
||||
"modelspace_entities": len(entities),
|
||||
"plan_title_count": count_plan_titles(entities),
|
||||
"entity_types": dict(type_counts.most_common()),
|
||||
"top_layers": [
|
||||
{"name": name, "entity_count": count}
|
||||
@@ -327,7 +363,8 @@ def main() -> int:
|
||||
if conversion["status"] == "ok":
|
||||
raw_dxfs.append(dest)
|
||||
else:
|
||||
shutil.copy2(source, dest)
|
||||
if source.resolve() != dest.resolve():
|
||||
shutil.copy2(source, dest)
|
||||
raw_dxfs.append(dest)
|
||||
|
||||
sanitized: list[Path] = []
|
||||
|
||||
Reference in New Issue
Block a user