feat: harden CAD showcase skill and delivery pipeline
This commit is contained in:
@@ -29,6 +29,8 @@ import gzip
|
||||
import json
|
||||
from pathlib import Path
|
||||
|
||||
import showcase_schema
|
||||
|
||||
SKILL_ROOT = Path(__file__).resolve().parent.parent
|
||||
|
||||
|
||||
@@ -51,7 +53,7 @@ def group_of(key: str) -> str:
|
||||
return "主体"
|
||||
|
||||
|
||||
MAIN_JS = r'''
|
||||
MAIN_JS = r"""
|
||||
(async function(){
|
||||
const $load = document.getElementById('load');
|
||||
const fail = m => { $load.style.display='flex'; $load.innerHTML = '<div style="max-width:520px;text-align:center">加载失败:'+m+'</div>'; };
|
||||
@@ -188,35 +190,45 @@ MAIN_JS = r'''
|
||||
addEventListener('resize', () => { cam.aspect=innerWidth/innerHeight; cam.updateProjectionMatrix(); renderer.setSize(innerWidth,innerHeight); invalidate(); });
|
||||
} catch (err) { fail(err.message || String(err)); }
|
||||
})();
|
||||
'''
|
||||
"""
|
||||
|
||||
CSS = (
|
||||
'body{margin:0;background:#1c1f24;color:#e8e6e0;font:14px/1.5 -apple-system,"PingFang SC",sans-serif;overflow:hidden}'
|
||||
'#panel{position:fixed;top:12px;left:12px;background:rgba(244,241,232,.97);color:#2a2a26;border-radius:12px;padding:12px 14px;width:242px;max-height:92vh;overflow:auto;box-shadow:0 4px 18px rgba(0,0,0,.45);z-index:5}'
|
||||
'#panel h1{font-size:15px;margin:0 0 2px}'
|
||||
'#panel .sub{font-size:12px;color:#777;margin-bottom:6px}'
|
||||
'#panel label{display:flex;gap:6px;align-items:center;font-size:13px;padding:1px 0;cursor:pointer}'
|
||||
'.grp{border-top:1px solid #ddd;margin-top:8px;padding-top:6px;font-weight:600;font-size:12px;color:#555;display:flex;justify-content:space-between;align-items:center}'
|
||||
'.grp button{font-size:11px;border:none;background:#e5e0d2;border-radius:6px;padding:1px 8px;cursor:pointer}'
|
||||
'#info{position:fixed;bottom:14px;left:14px;background:rgba(30,33,38,.92);border:1px solid #3a3f46;color:#e8e6e0;border-radius:10px;padding:8px 12px;font-size:13px;display:none;max-width:340px;z-index:5}'
|
||||
'#hint{position:fixed;bottom:10px;right:14px;font-size:12px;color:#9aa;z-index:5}'
|
||||
'#load{position:fixed;inset:0;display:flex;align-items:center;justify-content:center;color:#cfd3c9;font-size:14px;background:#1c1f24;z-index:9}'
|
||||
'body{margin:0;background:#1c1f24;color:#e8e6e0;font:14px/1.5 -apple-system,"PingFang SC",sans-serif;overflow:hidden}'
|
||||
"#panel{position:fixed;top:12px;left:12px;background:rgba(244,241,232,.97);color:#2a2a26;border-radius:12px;padding:12px 14px;width:242px;max-height:92vh;overflow:auto;box-shadow:0 4px 18px rgba(0,0,0,.45);z-index:5}"
|
||||
"#panel h1{font-size:15px;margin:0 0 2px}"
|
||||
"#panel .sub{font-size:12px;color:#777;margin-bottom:6px}"
|
||||
"#panel label{display:flex;gap:6px;align-items:center;font-size:13px;padding:1px 0;cursor:pointer}"
|
||||
".grp{border-top:1px solid #ddd;margin-top:8px;padding-top:6px;font-weight:600;font-size:12px;color:#555;display:flex;justify-content:space-between;align-items:center}"
|
||||
".grp button{font-size:11px;border:none;background:#e5e0d2;border-radius:6px;padding:1px 8px;cursor:pointer}"
|
||||
"#info{position:fixed;bottom:14px;left:14px;background:rgba(30,33,38,.92);border:1px solid #3a3f46;color:#e8e6e0;border-radius:10px;padding:8px 12px;font-size:13px;display:none;max-width:340px;z-index:5}"
|
||||
"#hint{position:fixed;bottom:10px;right:14px;font-size:12px;color:#9aa;z-index:5}"
|
||||
"#load{position:fixed;inset:0;display:flex;align-items:center;justify-content:center;color:#cfd3c9;font-size:14px;background:#1c1f24;z-index:9}"
|
||||
)
|
||||
|
||||
|
||||
def main() -> int:
|
||||
args = parse_args()
|
||||
spec_path = Path(args.spec)
|
||||
glb_path = Path(args.glb)
|
||||
if not glb_path.exists() or glb_path.stat().st_size == 0:
|
||||
raise SystemExit(f"GLB not found or empty: {glb_path}")
|
||||
spec = showcase_schema.normalize_spec(json.loads(spec_path.read_text(encoding="utf-8")))
|
||||
try:
|
||||
showcase_schema.validate_spec(spec)
|
||||
except showcase_schema.ValidationFailure as exc:
|
||||
raise SystemExit(str(exc)) from exc
|
||||
libs = Path(args.libs_dir)
|
||||
parts = {}
|
||||
for name in ("three.min.js", "OrbitControls.js", "GLTFLoader.js", "RoomEnvironment.js", "pako_inflate.min.js"):
|
||||
path = libs / name
|
||||
if not path.exists():
|
||||
raise SystemExit(f"Missing offline lib {path}. Populate via: npm pack three@0.147.0 pako@2.1.0 and copy files.")
|
||||
raise SystemExit(
|
||||
f"Missing offline lib {path}. Populate via: npm pack three@0.147.0 pako@2.1.0 and copy files."
|
||||
)
|
||||
parts[name] = path.read_text(encoding="utf-8")
|
||||
assert "</scr" + "ipt>" not in parts[name]
|
||||
|
||||
spec = json.loads(Path(args.spec).read_text(encoding="utf-8"))
|
||||
glb = Path(args.glb).read_bytes()
|
||||
glb = glb_path.read_bytes()
|
||||
b64 = base64.b64encode(gzip.compress(glb, 6)).decode()
|
||||
|
||||
order = spec.get("source", {}).get("config", {}).get("floor_order") or list(spec.get("floors", {}))
|
||||
@@ -224,27 +236,32 @@ def main() -> int:
|
||||
for key in order:
|
||||
if key in spec.get("floors", {}):
|
||||
groups.setdefault(group_of(key), []).append([key, spec["floors"][key].get("name", key)])
|
||||
trees = [[round((s["start"][0] + s["end"][0]) / 2, 2), round((s["start"][1] + s["end"][1]) / 2, 2)]
|
||||
for s in spec.get("floors", {}).get("TREES", {}).get("segments", {}).get("trees", [])]
|
||||
trees = [
|
||||
[round((s["start"][0] + s["end"][0]) / 2, 2), round((s["start"][1] + s["end"][1]) / 2, 2)]
|
||||
for s in spec.get("floors", {}).get("TREES", {}).get("segments", {}).get("trees", [])
|
||||
]
|
||||
cats = {k: v.get("label", k) for k, v in spec.get("categories", {}).items()}
|
||||
title = args.title or spec.get("project", {}).get("name", "CAD 建筑模型")
|
||||
|
||||
main_js = (MAIN_JS
|
||||
.replace("__GROUPS__", json.dumps(groups, ensure_ascii=False))
|
||||
.replace("__CATS__", json.dumps(cats, ensure_ascii=False))
|
||||
.replace("__TREES__", json.dumps(trees)))
|
||||
main_js = (
|
||||
MAIN_JS.replace("__GROUPS__", json.dumps(groups, ensure_ascii=False))
|
||||
.replace("__CATS__", json.dumps(cats, ensure_ascii=False))
|
||||
.replace("__TREES__", json.dumps(trees))
|
||||
)
|
||||
sc_close = "</scr" + "ipt>"
|
||||
html = (
|
||||
'<!DOCTYPE html><html lang="zh"><head><meta charset="utf-8">'
|
||||
f'<title>{title} · 3D 查看器(离线版)</title>'
|
||||
f"<title>{title} · 3D 查看器(离线版)</title>"
|
||||
'<meta name="viewport" content="width=device-width, initial-scale=1">'
|
||||
f'<style>{CSS}</style></head><body>'
|
||||
f"<style>{CSS}</style></head><body>"
|
||||
'<div id="load">正在初始化…</div>'
|
||||
f'<div id="panel"><h1>{title}</h1><div class="sub">{args.subtitle}</div><div id="tg"></div></div>'
|
||||
'<div id="info"></div>'
|
||||
'<div id="hint">拖动旋转 · 滚轮缩放 · 右键平移 · 点击构件查属性</div>'
|
||||
+ "".join(f"<script>{parts[n]}{sc_close}" for n in
|
||||
("three.min.js", "OrbitControls.js", "GLTFLoader.js", "RoomEnvironment.js", "pako_inflate.min.js"))
|
||||
+ "".join(
|
||||
f"<script>{parts[n]}{sc_close}"
|
||||
for n in ("three.min.js", "OrbitControls.js", "GLTFLoader.js", "RoomEnvironment.js", "pako_inflate.min.js")
|
||||
)
|
||||
+ f'<script>const GLB_B64="{b64}";{sc_close}'
|
||||
+ f"<script>{main_js}{sc_close}"
|
||||
+ "</body></html>"
|
||||
@@ -252,8 +269,17 @@ def main() -> int:
|
||||
out = Path(args.out)
|
||||
out.parent.mkdir(parents=True, exist_ok=True)
|
||||
out.write_text(html, encoding="utf-8")
|
||||
print(json.dumps({"out": str(out), "kb": len(html) // 1024,
|
||||
"floors": sum(len(v) for v in groups.values()), "trees": len(trees)}, ensure_ascii=False))
|
||||
print(
|
||||
json.dumps(
|
||||
{
|
||||
"out": str(out),
|
||||
"kb": len(html) // 1024,
|
||||
"floors": sum(len(v) for v in groups.values()),
|
||||
"trees": len(trees),
|
||||
},
|
||||
ensure_ascii=False,
|
||||
)
|
||||
)
|
||||
return 0
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user