Fold luascad subcrate into src/luascad.rs

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = [".", "luascad", "kiss3ddeps"]
+members = [".", "kiss3ddeps"]
 
 [package]
 name = "truescad"
@@ -12,13 +12,14 @@ dirs = "6.0"
 sourceview4 = "0.5"
 gdk = "0.18"
 cairo-rs = "0.18"
+implicit3d = "0.16"
 nalgebra = "0.34"
+piccolo = "0.3"
 rayon = "1.11"
 serde = { version = "1.0", features = ["derive"] }
 toml = "0.8"
 num-traits = "0.2"
 tessellation = "0.9"
-truescad_luascad = { path = "luascad" }
 kiss3ddeps = { path = "kiss3ddeps" }
 stl_io = "0.11"
 kiss3d = "0.37"

PLAN.md

@@ -32,7 +32,7 @@ The GTK desktop app is being abandoned in favor of a web-first approach.
 | `src/main.rs` | Replace with `wasm-bindgen` entry point |
 | Root `Cargo.toml` | Remove gtk/sourceview4/gdk/glib/cairo-rs/kiss3d/rayon/dirs/pollster; add `wasm-bindgen`, `web-sys` |
 | `kiss3ddeps/` | Delete (only existed for kiss3d) |
-| `luascad/` | Keep as-is (piccolo — WASM-ready) |
+| `luascad/` | Deleted — folded into `src/luascad.rs` |
 
 ## Frontend layout
 
@@ -56,6 +56,7 @@ node_modules/    ← CM6 (dev only, bundled by esbuild)
 ## Status
 
 - [x] piccolo migration complete (`luascad` uses piccolo 0.3, no native C deps)
+- [x] `luascad` subcrate folded into `src/luascad.rs` (workspace simplified)
 - [ ] Phase 1: Strip root crate
 - [ ] Phase 2: wasm-bindgen API
 - [ ] Phase 3: Verify WASM builds

src/editor.rs

@@ -9,8 +9,7 @@ use std::fs::File;
 use std::io::prelude::*;
 use std::io::{BufReader, BufWriter};
 use tessellation::{ImplicitFunction, ManifoldDualContouring, Mesh};
-use truescad_luascad;
-use truescad_luascad::implicit3d;
+use implicit3d;
 
 #[derive(Clone)]
 pub struct Editor {
@@ -104,7 +103,7 @@ impl Editor {
                 true,
             )
             .unwrap();
-        match truescad_luascad::eval(&code_text) {
+        match crate::eval(&code_text) {
             Ok((print_result, maybe_object)) => {
                 writeln!(msg, "{}", print_result).unwrap();
                 match maybe_object {

src/lib.rs

@@ -1,9 +1,13 @@
 pub mod editor;
+pub mod luascad;
 pub mod menu;
 pub mod mesh_view;
 pub mod object_widget;
 pub mod render;
 pub mod settings;
 pub mod window;
 
+pub use luascad::eval;
+
 type Float = f64;
+const EPSILON: f64 = std::f64::EPSILON;

src/render.rs

@@ -2,7 +2,7 @@ use super::Float;
 use nalgebra as na;
 use rayon::prelude::*;
 use std::cmp;
-use truescad_luascad::implicit3d::Object;
+use implicit3d::Object;
 
 const EPSILON: Float = 0.003;
 const APPROX_SLACK: Float = 0.1;

luascad/tests/eval.rs → tests/eval.rs

@@ -1,6 +1,6 @@
+use implicit3d::Object;
 use nalgebra as na;
-use truescad_luascad::eval;
-use truescad_luascad::implicit3d::Object;
+use truescad::eval;
 
 // ── helpers ──────────────────────────────────────────────────────────────────