openscad-cpp-evaluator 1.33.0__tar.gz → 1.34.0__tar.gz

{openscad_cpp_evaluator-1.33.0 → openscad_cpp_evaluator-1.34.0}/CLAUDE.md

@@ -1185,10 +1185,21 @@ grep for `ponytail:`.
 - `include/openscad_cpp_evaluator/mesh_import.hpp`, `src/import/mesh_import.cpp` — STL (ASCII +
   binary, exact-match vertex welding)/OBJ/OFF/3MF mesh loaders, returning plain `(verts, tris)` —
   no `Evaluator`/`Value` dependency, so these are reusable from both `import()` contexts below.
+- `src/import/scene_import.cpp` — AMF, X3D and VRML97 import, the three multi-object formats export
+  writes that nothing could read back (current upstream OpenSCAD removed its AMF importer, so all
+  three go beyond it). Geometry only, like the loaders above, but each format's scene structure is
+  honoured: X3D/VRML `Transform`s nest and apply in full (`T·C·R·SR·S·SR⁻¹·C⁻¹`), `DEF`/`USE`
+  resolves, `ccw FALSE` flips winding, `IndexedFaceSet` polygons fan-triangulate (a last polygon
+  without `-1` counts), and X3D's `IndexedTriangleSet`/`TriangleSet` are read. X3D goes through a
+  small real XML parser (comments, CDATA, DOCTYPE, entities); VRML through a tokenizer + generic
+  node parser that steps over `PROTO`/`EXTERNPROTO`/`ROUTE` (VRML 1.0 is refused by name). AMF's
+  `unit` scales to mm, and a zipped AMF (`PK` header) is read through `readStoredZipEntryBySuffix`.
+  What is not a mesh — primitives (Box, Sphere, ...), `Inline`, AMF constellations — lands in
+  `LoadedMesh::warnings`, which both `import()` faces emit as `import: '<file>': ...`.
 - `include/openscad_cpp_evaluator/import_builtin.hpp`, `include/openscad_cpp_evaluator/
   zip_stored.hpp` (+ `src/zip_stored.cpp`), `src/builtins/import.cpp` — `import()`'s two faces:
   `resolveImport`/`generateImport` (registered in `registry.cpp` like any other builtin *module* —
-  a geometry statement, STL/OBJ/OFF/3MF/DXF/SVG) and `importAsValue` (called directly from
+  a geometry statement, STL/OBJ/OFF/3MF/AMF/X3D/VRML/DXF/SVG) and `importAsValue` (called directly from
   `user_calls.cpp`'s `evalFunctionCall`, special-cased *before* the `isBuiltinFunctionName` gate
   since `import` isn't in that table — returns a VNF `[[verts],[faces]]` for a mesh file, a Region
   `[[[x,y],...],...]` for DXF/SVG, or the JSON file's content as native values).

{openscad_cpp_evaluator-1.33.0 → openscad_cpp_evaluator-1.34.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openscad_cpp_evaluator
-Version: 1.33.0
+Version: 1.34.0
 Summary: C++ OpenSCAD evaluator with Python bindings
 Author: NeuSCAD Contributors
 License-Expression: MIT

{openscad_cpp_evaluator-1.33.0 → openscad_cpp_evaluator-1.34.0}/include/openscad_cpp_evaluator/mesh_import.hpp

@@ -13,6 +13,9 @@ namespace oscadeval {
 struct LoadedMesh {
     std::vector<std::array<double, 3>> verts;
     std::vector<std::array<int, 3>> tris;
+    // What the loader read but could not turn into mesh (X3D/VRML primitives,
+    // Inline, AMF constellations), for import() to warn about.
+    std::vector<std::string> warnings;
 };
 
 // Each throws std::runtime_error with a message suitable for wrapping into
@@ -23,5 +26,11 @@ LoadedMesh loadStl(const std::string& path);
 LoadedMesh loadObj(const std::string& path);
 LoadedMesh loadOff(const std::string& path);
 LoadedMesh loadThreeMf(const std::string& path);
+// scene_import.cpp: the three multi-object formats export writes. AMF (plain
+// or zipped, `unit` scaled to mm), X3D and VRML97 (Transforms applied,
+// DEF/USE resolved, polygons fan-triangulated). Geometry only, like the rest.
+LoadedMesh loadAmf(const std::string& path);
+LoadedMesh loadX3d(const std::string& path);
+LoadedMesh loadVrml(const std::string& path);
 
 } // namespace oscadeval

{openscad_cpp_evaluator-1.33.0 → openscad_cpp_evaluator-1.34.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "openscad_cpp_evaluator"
-version = "1.33.0"
+version = "1.34.0"
 description = "C++ OpenSCAD evaluator with Python bindings"
 readme = "README.md"
 requires-python = ">=3.12"

{openscad_cpp_evaluator-1.33.0 → openscad_cpp_evaluator-1.34.0}/src/CMakeLists.txt

@@ -23,6 +23,7 @@ add_library(openscad_cpp_evaluator STATIC
   mesh_check.cpp
   zip_stored.cpp
   import/mesh_import.cpp
+  import/scene_import.cpp
   import/surface_load.cpp
   import/dxf_import.cpp
   import/svg_import.cpp

{openscad_cpp_evaluator-1.33.0 → openscad_cpp_evaluator-1.34.0}/src/builtins/import.cpp

@@ -46,10 +46,16 @@ LoadedMesh loadMeshByExt(const std::string& path, const std::string& ext) {
     if (ext == ".stl") return loadStl(path);
     if (ext == ".obj") return loadObj(path);
     if (ext == ".off") return loadOff(path);
+    if (ext == ".amf") return loadAmf(path);
+    if (ext == ".x3d") return loadX3d(path);
+    if (ext == ".wrl") return loadVrml(path);
     return loadThreeMf(path);
 }
 
-bool isMeshExt(const std::string& ext) { return ext == ".stl" || ext == ".obj" || ext == ".off" || ext == ".3mf"; }
+bool isMeshExt(const std::string& ext) {
+    return ext == ".stl" || ext == ".obj" || ext == ".off" || ext == ".3mf" || ext == ".amf" || ext == ".x3d" ||
+           ext == ".wrl";
+}
 
 
 Value jsonToValue(const nlohmann::ordered_json& j) {
@@ -208,7 +214,10 @@ CSGParams resolveImport(Evaluator& ev, const oscad::ModularCall& node, EvalConte
         params["dxf"] = Value{ext == ".dxf"};
         return params;
     }
-    if (ext == ".dxf" || ext == ".svg" || ext == ".pdf") {
+    // .pdf is not here: it used to be, handed to the SVG parser, which hung on
+    // a PDF's bytes. Nothing reads PDF (OpenSCAD does not either), so it takes
+    // the ordinary "unsupported file type" error below.
+    if (ext == ".dxf" || ext == ".svg") {
         std::vector<Contour2d> contours;
         bool filteredMiss = false;
         try {
@@ -257,6 +266,7 @@ CSGParams resolveImport(Evaluator& ev, const oscad::ModularCall& node, EvalConte
         } catch (const std::exception& e) {
             ev.error(std::string("import: ") + e.what(), node);
         }
+        for (const std::string& w : mesh.warnings) ev.warn("import: '" + path + "': " + w, &node.position());
         std::vector<Value> vertsFlat;
         vertsFlat.reserve(mesh.verts.size() * 3);
         for (const auto& v : mesh.verts) {
@@ -428,8 +438,12 @@ Value importAsValue(Evaluator& ev, const CallArgs& args, const oscad::ASTNode& n
 
     try {
         if (ext == ".json") return loadJsonAsValue(path);
-        if (isMeshExt(ext)) return meshToVnf(loadMeshByExt(path, ext));
-        if (ext == ".dxf" || ext == ".svg" || ext == ".pdf") {
+        if (isMeshExt(ext)) {
+            const LoadedMesh mesh = loadMeshByExt(path, ext);
+            for (const std::string& w : mesh.warnings) ev.warn("import: '" + path + "': " + w, &node.position());
+            return meshToVnf(mesh);
+        }
+        if (ext == ".dxf" || ext == ".svg") {
             std::vector<Contour2d> contours;
             if (ext == ".dxf") {
                 std::optional<std::string> layer;