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

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

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

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

@@ -130,6 +130,21 @@ nb::dict bodyToDict(oscadeval::ColoredBody& cb) {
         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.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "openscad_cpp_evaluator"
-version = "0.4.1"
+version = "0.4.2"
 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.2}/python/openscad_cpp_evaluator/__init__.py

@@ -287,6 +287,7 @@ 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
 
 
 def bodies_from_dicts(body_dicts) -> list:
@@ -295,7 +296,7 @@ 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")) for d in body_dicts]
 
 
 class Evaluator:

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

@@ -192,6 +192,33 @@ 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 main():
     tests = [v for k, v in sorted(globals().items()) if k.startswith("test_") and callable(v)]
     failures = []