openscad-cpp-evaluator 0.4.1__tar.gz → 0.4.3__tar.gz

{openscad_cpp_evaluator-0.4.1 → openscad_cpp_evaluator-0.4.3}/PKG-INFO

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

{openscad_cpp_evaluator-0.4.1 → openscad_cpp_evaluator-0.4.3}/bindings/module.cpp

@@ -109,6 +109,20 @@ nb::object posToPy(const oscad::Position* p) {
     return facadeAttr("_Position")(p->line, p->column, p->origin, p->start_offset, p->end_offset);
 }
 
+// Mirrors the reference's ColoredBody.role string values exactly (minus
+// "highlight_ghost" -- see BodyRole's own ponytail comment in
+// colored_body.hpp for why that 5th, renderer-overlay-only state isn't
+// modeled here yet).
+const char* roleToString(oscadeval::BodyRole role) {
+    switch (role) {
+        case oscadeval::BodyRole::Highlight:  return "highlight";
+        case oscadeval::BodyRole::Background: return "background";
+        case oscadeval::BodyRole::ShowOnly:   return "show_only";
+        case oscadeval::BodyRole::Normal:
+        default:                              return "normal";
+    }
+}
+
 // One evaluated body's mesh + attributes, shaped to match what the renderer
 // already reads off a manifold3d mesh (vert_properties (nVert, numProp),
 // tri_verts (nTri, 3), run_original_id (nRun,), run_index (nRun+1,) -- the
@@ -126,10 +140,26 @@ nb::dict bodyToDict(oscadeval::ColoredBody& cb) {
     d["run_index"] = vecToNumpy(std::move(mesh.runIndex), {mesh.runIndex.size()});
     d["num_prop"] = static_cast<int>(numProp);
     d["flat_preview"] = cb.flatPreview;
+    d["role"] = roleToString(cb.role);
     if (cb.color)
         d["color"] = nb::make_tuple((*cb.color)[0], (*cb.color)[1], (*cb.color)[2], (*cb.color)[3]);
     else
         d["color"] = nb::none();
+    // Per-triangle RGBA, set only for a real multi-color CSG merge (see
+    // Evaluator::attachTriColors) -- None for the common single-material
+    // case, matching the reference's ColoredBody.tri_colors exactly (an
+    // (numTri, 4) float32 array or None). The renderer reads this to split
+    // one merged body's triangles across separate opaque/translucent draw
+    // buffers.
+    if (cb.triColors) {
+        const std::vector<std::array<float, 4>>& src = *cb.triColors;
+        std::vector<float> flat;
+        flat.reserve(src.size() * 4);
+        for (const auto& rgba : src) flat.insert(flat.end(), rgba.begin(), rgba.end());
+        d["tri_colors"] = vecToNumpy(std::move(flat), {src.size(), 4});
+    } else {
+        d["tri_colors"] = nb::none();
+    }
     return d;
 }
 

{openscad_cpp_evaluator-0.4.1 → openscad_cpp_evaluator-0.4.3}/pyproject.toml

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

{openscad_cpp_evaluator-0.4.1 → openscad_cpp_evaluator-0.4.3}/python/openscad_cpp_evaluator/__init__.py

@@ -287,6 +287,8 @@ class ColoredBody:
     color: Optional[tuple]             # RGBA 0-1, or None to follow the theme
     section: object = None             # kept for API parity (always None here)
     flat_preview: bool = False
+    tri_colors: Optional[object] = None  # (numTri, 4) float32 ndarray, real multi-color CSG merges only
+    role: str = "normal"               # "normal" | "highlight" | "background" | "show_only"
 
 
 def bodies_from_dicts(body_dicts) -> list:
@@ -295,7 +297,8 @@ def bodies_from_dicts(body_dicts) -> list:
     instances. Shared by Evaluator.evaluate() and a debug session's own live
     partial-render (see debug_evaluate()'s `generate_partial` hook kwarg,
     module.cpp) so both paths convert identically."""
-    return [ColoredBody(_BodyShim(d), d["color"], None, d["flat_preview"]) for d in body_dicts]
+    return [ColoredBody(_BodyShim(d), d["color"], None, d["flat_preview"], d.get("tri_colors"),
+                         d.get("role", "normal")) for d in body_dicts]
 
 
 class Evaluator:

{openscad_cpp_evaluator-0.4.1 → openscad_cpp_evaluator-0.4.3}/tests/test_python_bindings.py

@@ -192,6 +192,46 @@ def test_dyn_explicit_distinguishes_seeded_from_script_assigned():
     assert "$fa" not in ev.dyn_explicit
 
 
+def test_tri_colors_populated_for_a_real_multicolor_csg_merge():
+    # Found via BelfrySCAD's own renderer crashing on ColoredBody.tri_colors
+    # missing entirely -- the C++ core (Evaluator::attachTriColors,
+    # booleans.cpp) already computes this, bodyToDict() just never exposed
+    # it. union()-ing an opaque cube with a translucent sphere forces a real
+    # merge with two distinct triangle colors.
+    path = _write("union() { color([1,0,0,1]) cube(10); "
+                   "color([0,1,0,0.5]) translate([5,5,5]) sphere(8); }")
+    ev = Evaluator()
+    bodies, _ = ev.evaluate(path)
+    assert len(bodies) == 1
+    tri_colors = bodies[0].tri_colors
+    assert tri_colors is not None
+    num_tris = bodies[0].body.to_mesh().tri_verts.shape[0]
+    assert tri_colors.shape == (num_tris, 4)
+    # Two distinct colors actually present, not e.g. all-default filler.
+    assert len({tuple(row) for row in tri_colors}) >= 2
+
+
+def test_tri_colors_is_none_for_an_ordinary_single_color_body():
+    path = _write("cube(1);")
+    ev = Evaluator()
+    bodies, _ = ev.evaluate(path)
+    assert len(bodies) == 1
+    assert bodies[0].tri_colors is None
+
+
+def test_role_defaults_to_normal_and_reflects_modifiers():
+    # Found in the same pass as tri_colors: bodyToDict() never exposed
+    # ColoredBody.role either, crashing the renderer on any real render
+    # (it reads cb.role for every body, not just modified ones).
+    path = _write("cube(1);\n#sphere(1);\n%cylinder(h=1,r=1);\n!cube(2);\n")
+    ev = Evaluator()
+    bodies, _ = ev.evaluate(path)
+    roles = sorted(b.role for b in bodies)
+    # show_only (!) present anywhere -> only show_only + highlight bodies
+    # survive evaluate()'s own filter (see anyShowOnly in csg_resolve.cpp).
+    assert roles == ["highlight", "show_only"]
+
+
 def main():
     tests = [v for k, v in sorted(globals().items()) if k.startswith("test_") and callable(v)]
     failures = []