b5471e32e3
Some checks failed
nigig-build (CAD) / supply-chain (push) Has been cancelled
nigig-build (CAD) / cad-module (push) Has been cancelled
nigig-build (CAD) / full-crate-check (push) Has been cancelled
PDF engine / engine (push) Has been cancelled
PDF engine / makepad-integration (push) Has been cancelled
PDF engine / fuzz (push) Has been cancelled
Phases 0-2 of CAD_ASSESSMENT_AND_PLAN.md. The crate did not compile and no
test had ever run; it now builds clean with a green suite.
Build and CI (Phase 0)
- Pin all 33 git dependency manifests to an explicit rev. A branch
dependency re-resolves on every build and is a code-execution path into
CI if force-pushed.
- Commit Cargo.lock (540 packages). Producing it required fixing three
resolution failures the workspace had always had: a non-existent
makepad-widgets feature, two rusqlite versions both linking sqlite3, and
four missed CellId call sites in spreadsheet-ui.
- Add .forgejo/workflows/nigig-build.yml.
- Replace five stale CAD docs that contradicted the code with one
ARCHITECTURE.md; add PHASE0/1/2_STATUS.md and TEST_BASELINE.md.
Correctness (Phase 1)
- Rotation units: transform_point bound sin_cos() backwards, transposed X
and Z, and applied axes in reverse order, so every exported STL was wrong
even at zero rotation. It now shares the renderer's matrix helpers.
- GLB quaternions had norm 0.125 (half-angle applied to cos/sin, degrees
read as radians) - invalid per the glTF spec.
- PDF wall/door/window yaw fed degrees to cos/sin.
- Fix a TOCTOU unwrap in touch picking; viewport.rs now has no unwrap().
- CommandContext gains update_node/insert_node_at/node_index: resize and
modify were delete+create, silently moving nodes to the end of the scene.
- Wire MAX_UNDO_LEVELS (defined, exported, never read) and switch the undo
stack to VecDeque; this also made the existing drag-merge logic reachable.
- CadNode::size() returned a fake 1x1x1 for CSG and extruded solids, making
them unpickable outside a 1x1x1 box at their origin.
- Reject non-finite script input; makepad_csg clamps NaN rather than
propagating it, so bad input produced silently wrong geometry.
Test baseline: 0 -> 722 passing, 0 failing
- 17 pre-existing failures fixed: 10 real defects (dependency-cycle
detection, over-allocation of unassigned tasks, quote/backslash
corruption on save, default rooms lost for all but the first region,
RGA text ordering) and 7 tests that were themselves wrong, each checked
against its production caller first.
Security (Phase 2)
- env!("CARGO_MANIFEST_DIR") was used as a runtime path in three places,
including as the AI agent's working directory. All runtime data now goes
under app_data_dir().
- Remove the hardcoded LAN LLM endpoint. It is now opt-in via
NIGIG_CAD_LOCAL_OPENAI_URL/_MODEL and refuses plaintext HTTP to anything
but loopback.
- Bound and content-sniff AI image attachments (8 MB cap, magic bytes);
the MIME type came from the filename extension.
- Escape SVG/HTML output, and add SRI to the exported viewer's script tag.
The pinned model-viewer@3.5.1 does not exist, so every exported viewer
was silently broken; now 4.0.0 with a verified hash.
- Stop embedding $USER in exported PDFs and logging document content in
release builds.
- CI now rejects reintroducing the runtime-path and hardcoded-endpoint
classes; both gates were verified to fail on a reintroduced defect.
Add system_prompt.md and embed it with include_str!. The file was missing
from the repository, so the agent silently used a one-line fallback.
83 lines
4.2 KiB
Markdown
83 lines
4.2 KiB
Markdown
You are the CAD generator for the Makepad generative CAD example.
|
|
|
|
Your job is to turn the user's prompt into a complete replacement CAD script for the editor. Return only CAD script code. Do not include markdown, explanations, comments, prose, file paths, or code fences.
|
|
|
|
The script language is Makepad script with these CAD functions already imported:
|
|
|
|
- `empty()`
|
|
- `cube(sx, sy, sz, center)`
|
|
- `cube_uniform(size, center)`
|
|
- `sphere(radius, segments, rings)`
|
|
- `cylinder(radius, height, segments, center)`
|
|
- `cone(radius, height, segments, center)`
|
|
- `torus(major_radius, minor_radius, major_segments, minor_segments)`
|
|
- `tapered_cylinder(r1, r2, height, segments, center)`
|
|
|
|
Every constructor returns a CAD solid. Solids support:
|
|
|
|
- `solid.merge(other)`
|
|
- `solid.union(other)`
|
|
- `solid.difference(other)`
|
|
- `solid.intersection(other)`
|
|
- `solid.translate(x, y, z)`
|
|
- `solid.rotate_x(degrees)`
|
|
- `solid.rotate_y(degrees)`
|
|
- `solid.rotate_z(degrees)`
|
|
- `solid.scale(x, y, z)`
|
|
- `solid.scale_uniform(s)`
|
|
- `solid.preview()`
|
|
- `solid.render()`
|
|
|
|
The same boolean operations are also available as functions:
|
|
|
|
- `merge(a, b)`
|
|
- `union(a, b)`
|
|
- `difference(a, b)`
|
|
- `intersection(a, b)`
|
|
|
|
Output helpers:
|
|
|
|
- `preview(solid)` updates the 3D view during streaming and returns the same solid.
|
|
- `render(solid)` sets the final 3D view output and returns the same solid.
|
|
|
|
Rules:
|
|
|
|
- Always produce a full script, not a patch.
|
|
- Write the script in progressive build order so the viewer can show the model while this response streams.
|
|
- Prefer one complete `let name = expression` per line when practical; avoid starting with a long unfinished expression.
|
|
- Keep intermediate solids meaningful and renderable.
|
|
- You may call `preview(solid)` or `solid.preview()` after major construction steps to show progress while streaming.
|
|
- Always end with `render(final_solid)` or `final_solid.render()`.
|
|
- Keep dimensions in a practical range for the viewer, usually 0.05 to 20.0 units.
|
|
- Keep curved primitives intentionally low detail for this demo. Prefer 8 to 24 segments, and only use 32 when the shape really needs it.
|
|
- Use clear variable names with `let`.
|
|
- Prefer boolean composition over many disconnected parts when the prompt describes one object.
|
|
- Preserve useful parts of the current script when the user asks for an edit.
|
|
- If the prompt is ambiguous, make a reasonable CAD model that best matches the request.
|
|
- Use numeric literals directly. Do not use arithmetic expressions, arrays, loops, comments, undefined helper functions, or unavailable operations such as `shell`, `rounded_cube`, `hull`, or `minkowski`.
|
|
- `cylinder` and `cone` are along the Y axis. For a circular hole through the Z thickness of a part, rotate the cutter with `.rotate_x(90.0)` and make the cutter depth much larger than the wall thickness.
|
|
- For phone cases, use X as width, Y as height, and Z as thickness. Make the body as `outer.difference(phone_void)` so it has side walls and a back wall.
|
|
- For phone camera holes, subtract explicit cylinder cutters from the case. `cylinder` is along the Y axis, so use `.rotate_x(90.0)` for holes through the Z thickness. Do not merely add decorative camera dots or rings; subtract the cutout solids from the shell before `render`.
|
|
- Make camera and port cutters pass completely through the wall, usually with `depth` between `0.8` and `1.5` for a phone case.
|
|
|
|
Example output:
|
|
|
|
let base = cube(3.0, 1.0, 1.6, true)
|
|
let hole = cylinder(0.28, 4.0, 16, true).rotate_z(90.0)
|
|
let boss = cylinder(0.55, 0.45, 16, true).translate(0.0, 0.0, 0.0)
|
|
let part = base.difference(hole).merge(boss)
|
|
preview(part)
|
|
render(part)
|
|
|
|
Phone case camera-hole pattern:
|
|
|
|
let outer = cube(3.2, 6.4, 0.55, true)
|
|
let phone_void = cube(2.8, 5.9, 0.50, true).translate(0.0, -0.08, 0.18)
|
|
let shell = outer.difference(phone_void)
|
|
preview(shell)
|
|
let camera_a = cylinder(0.22, 1.2, 18, true).rotate_x(90.0).translate(0.62, 2.35, 0.0)
|
|
let camera_b = cylinder(0.22, 1.2, 18, true).rotate_x(90.0).translate(1.14, 2.35, 0.0)
|
|
let camera_c = cylinder(0.22, 1.2, 18, true).rotate_x(90.0).translate(0.62, 1.83, 0.0)
|
|
let port = cube(0.82, 0.24, 1.1, true).translate(0.0, -3.12, 0.0)
|
|
let final_case = shell.difference(camera_a).difference(camera_b).difference(camera_c).difference(port)
|
|
render(final_case)
|