minsungandClaude Opus 5
eec33820a6
The road-surface drawing (대산당진 2공구_노면) rendered nothing for its
노면/부체도로면 geometry. The cause was not the renderer: the parseResult
contained zero MESH entities.
Two faults, both in the wasm parser, fixed upstream in hmwebviewer 35f5b1c:
1. dwg-wasm never serialized MESH. acadrust reads the entity in full; only the
JSON arm was missing.
2. acadrust's read_mesh clamped its array counts with the blanket 100_000-item
corrupt-data guard. This drawing's road mesh has 105_497 vertices, so the
count was truncated, the remaining vertex bits were never consumed, and the
face/edge/crease lists after them decoded from the wrong bit offset —
producing a plausible-looking vertex count next to a nonsense 14-face list.
Counts are now bounded by the bits actually left in the object stream.
before verts=100000 faces=14 face sizes [64, 0, 64, 23, 0, 0, 0, 15]
after verts=105497 faces=185444 face sizes [3, 3, 3, ...]
This commit carries the vendored side of that work:
- the rebuilt wasm, which now emits MESH as flat arrays (vertices [x,y,z,...],
faceList in DXF group-93 layout, deduplicated edges). The sample drawing goes
from 116 MB to 130 MB of parseResult with parse time unchanged at ~3.2 s.
- a MESH case in the property inspector (vertex/face/edge counts, subdivision
level, bbox and elevation range)
- docs/subdmesh-rendering.md, plus README pointers
- the acadrust licence notice, which can no longer say "consumed unmodified" —
read_mesh now carries a local patch. MPL-2.0 is file-level copyleft, so the
patched file stays under MPL and its source ships in hmwebviewer.
Verified: 9 MESH entities parsed from the drawing; entity histograms over six
other sample drawings are byte-identical to the previous wasm, so nothing else
moved.
Two deliberate omissions, both because a lineweight/fat-line refactor is in
flight in this working tree:
- Viewer2D.js is not included. Its _meshSegs helper and three MESH dispatch
sites share hunks with that refactor and cannot be separated; the same
renderer code is committed upstream in hmwebviewer 35f5b1c and will land here
with the refactor. docs/subdmesh-rendering.md records this.
- dist2/ is not rebuilt here. The current build embeds the half-wired
lineweight button and progress-bar markup; deploy per
docs/deploy-dist2-static-build.md once that work lands.
The wasm binary also carries the new lineweight parser fields (lwdisplay,
celweight, layer and entity lineWeight), since it was built from a tree that
already had them. They are additive JSON keys with no consumer in this commit.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
32 lines
1.2 KiB
TypeScript
32 lines
1.2 KiB
TypeScript
/**
|
|
* DWG parser — rust/dwg-wasm wrapper around the acadrust crate (MPL-2.0,
|
|
* vendored with a local read_mesh patch; see hmwebviewer rust/dwg-wasm). Emits
|
|
* the parseResult shape Viewer2D.load() consumes. Lazy-imported so the wasm is
|
|
* only fetched when a DWG is actually opened.
|
|
*
|
|
* History: until 2026-07-10 this module selected between acadrust and
|
|
* @horu2day/pure-cad-parser (?dwgparser= toggle). The old parser was removed
|
|
* after side-by-side validation (PROGRESS.md Phase 15).
|
|
*
|
|
* Post-process: fixDwgKoreanText repairs CP949→Latin-1 mojibake common in
|
|
* older Korean DWGs (see fixDwgKoreanText.ts). Unicode-correct drawings
|
|
* (e.g. BasicSample) are left unchanged.
|
|
*/
|
|
|
|
import { fixDwgKoreanText } from './fixDwgKoreanText';
|
|
|
|
export type CadParseResult = {
|
|
version?: string;
|
|
vars?: Record<string, unknown>;
|
|
entities?: unknown[];
|
|
tables?: Record<string, unknown>;
|
|
stats?: Record<string, unknown>;
|
|
};
|
|
|
|
/** Parse a DWG buffer. Returns a parseResult for Viewer2D.load(). */
|
|
export async function parseDwgBuffer(bytes: Uint8Array): Promise<CadParseResult> {
|
|
const { initAcadrustParser, parseDwgAcadrust } = await import('./acadrustParser');
|
|
await initAcadrustParser();
|
|
return fixDwgKoreanText(parseDwgAcadrust(bytes));
|
|
}
|