openscad-cpp-evaluator 1.49.5__tar.gz → 1.49.7__tar.gz

{openscad_cpp_evaluator-1.49.5 → openscad_cpp_evaluator-1.49.7}/CMakeLists.txt

@@ -79,6 +79,10 @@ if(MSVC)
   # unconditionally (a POSIX extension our code already relies on), so no
   # equivalent is needed there.
   add_compile_definitions(_USE_MATH_DEFINES)
+  # Narrow string literals as UTF-8, as every other compiler writes them.
+  # Without it MSVC encodes "\u00b5" in the ANSI code page, a lone 0xB5 byte,
+  # and profile_time()'s "4.7 µs" failed to decode on reaching Python.
+  add_compile_options(/utf-8)
   # /MP: compile a target's source files in parallel. MSBuild's own /m (what
   # `cmake --build -j` passes) runs PROJECTS in parallel but each project's
   # files one at a time, and nearly everything here is one big library, so a

{openscad_cpp_evaluator-1.49.5 → openscad_cpp_evaluator-1.49.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openscad_cpp_evaluator
-Version: 1.49.5
+Version: 1.49.7
 Summary: C++ OpenSCAD evaluator with Python bindings
 Author: NeuSCAD Contributors
 License-Expression: MIT AND OFL-1.1

{openscad_cpp_evaluator-1.49.5 → openscad_cpp_evaluator-1.49.7}/include/openscad_cpp_evaluator/colored_body.hpp

@@ -132,6 +132,12 @@ struct ColoredBody {
     bool isDisplayOnly() const { return rawMesh.has_value(); }
 };
 
+// A `%` body or a `#` operand's ghost copy: drawn, never part of the model,
+// so an operation that consumes its children's geometry must skip it.
+inline bool isModifierGhost(const ColoredBody& b) {
+    return b.role == BodyRole::Background || b.role == BodyRole::HighlightGhost;
+}
+
 // The cached questions -- see ColoredBody::knownEmpty. Ask Manifold once per
 // body, never once per tree level.
 inline bool bodyIsEmpty(ColoredBody& b) {

{openscad_cpp_evaluator-1.49.5 → openscad_cpp_evaluator-1.49.7}/pyproject.toml

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

{openscad_cpp_evaluator-1.49.5 → openscad_cpp_evaluator-1.49.7}/src/builtins/booleans.cpp

@@ -64,11 +64,14 @@ RoleSplit splitByRole(const std::vector<ColoredBody>& bodies) {
 
 // Unions every 2D child into a single CrossSection; nullopt if there are no
 // 2D children at all. Mirrors _to_cross_section. Shared by
-// linear_extrude/rotate_extrude/roof (extrude.cpp, roof.cpp).
+// linear_extrude/rotate_extrude/offset/roof (extrude.cpp, roof.cpp).
+// A `%` body and a `#` operand's ghost copy are display aids, not model:
+// unioning them in filled a differenced-away notch back in (BelfrySCAD
+// #866). OpenSCAD shows neither under these operations, so they are dropped.
 std::optional<manifold::CrossSection> toCrossSection(const std::vector<ColoredBody>& bodies) {
     std::optional<manifold::CrossSection> cs;
     for (const ColoredBody& b : bodies) {
-        if (!b.section) continue;
+        if (!b.section || isModifierGhost(b)) continue;
         cs = cs ? (*cs + *b.section) : *b.section;
     }
     return cs;

{openscad_cpp_evaluator-1.49.5 → openscad_cpp_evaluator-1.49.7}/src/builtins/extrude.cpp

@@ -471,7 +471,9 @@ std::vector<ColoredBody> generateProjection(Evaluator&, const CSGParams& params,
     const std::vector<ColoredBody> bodies = flattenCsgTree(children);
     std::vector<ColoredBody> bodies3d;
     for (const ColoredBody& c : bodies) {
-        if (c.body) bodies3d.push_back(c);
+        // Not a `%` body or a `#` ghost: projecting them drew the
+        // differenced-away part's outline (BelfrySCAD #866). See toCrossSection.
+        if (c.body && !isModifierGhost(c)) bodies3d.push_back(c);
     }
     if (bodies3d.empty()) return {};
 

{openscad_cpp_evaluator-1.49.5 → openscad_cpp_evaluator-1.49.7}/tests/test_extrude_roof.cpp

@@ -260,6 +260,31 @@ TEST(Projection, CutFillsWhereAPolyhedronOverlapsItself) {
     EXPECT_NEAR(e.bodies[0].section->Area(), 6.0, 1e-6);
 }
 
+// A `#` operand is drawn again as a ghost and a `%` body is drawn but not
+// modelled; neither may reach the operation. Both leaked into projection()
+// and every 2D-consuming operation (BelfrySCAD #866): the ghost refilled
+// the cut-away corner and the `%` cube added its square.
+TEST(Projection, ModifierGhostsAreNotProjected) {
+    for (const char* src : {
+             "projection() difference() { cube([4,4,1]); #translate([-1,-1,-1]) cube(3); }",
+             "projection() union() { difference() { cube([4,4,1]); #translate([-1,-1,-1]) cube(3); }"
+             "  %translate([10,0,0]) cube(1); }"}) {
+        Evaluated e = evalSrc(src);
+        double area = 0;
+        for (const ColoredBody& b : e.bodies)
+            if (b.section) area += b.section->Area();
+        EXPECT_NEAR(area, 12.0, 1e-6) << src;
+    }
+}
+
+TEST(LinearExtrude, ModifierGhostsAreNotExtruded) {
+    Evaluated e = evalSrc("linear_extrude(1) difference() { square(4); #translate([-1,-1]) square(3); }");
+    double volume = 0;
+    for (const ColoredBody& b : e.bodies)
+        if (b.body) volume += b.body->Volume();
+    EXPECT_NEAR(volume, 12.0, 1e-6);
+}
+
 // -- offset -----------------------------------------------------------------
 
 TEST(Offset, RoundGrowsAreaBySquarePerimeterPlusCircleCorners) {

{openscad_cpp_evaluator-1.49.5 → openscad_cpp_evaluator-1.49.7}/tests/test_profile_time.cpp

@@ -133,7 +133,7 @@ TEST(ProfileTime, ExpressionFormRunsUnderTheBytecodeVm) {
 }
 
 TEST(ProfileTime, UnderAMillisecondIsInMicroseconds) {
-    EXPECT_EQ(fmtMs(0.0047), "4.7 \u00b5s");
-    EXPECT_EQ(fmtMs(0.5), "500.0 \u00b5s");
+    EXPECT_EQ(fmtMs(0.0047), "4.7 \xC2\xB5s");   // UTF-8 bytes, not the literal: MSVC once wrote 0xB5
+    EXPECT_EQ(fmtMs(0.5), "500.0 \xC2\xB5s");
     EXPECT_EQ(fmtMs(12.4), "12.40 ms");
 }

{openscad_cpp_evaluator-1.49.5 → openscad_cpp_evaluator-1.49.7}/tests/test_python_bindings.py

@@ -1319,3 +1319,10 @@ def test_export_of_an_empty_model_uses_openscads_words(tmp_path):
         export_model(str(tmp_path / "empty.stl"), ev.geometry)
     with pytest.raises(EvalError, match=r"Current top level object is not a 2D object\."):
         export_model(str(tmp_path / "empty.svg"), ev.geometry)
+
+
+def test_profile_time_microseconds_reach_python_as_utf8(tmp_path):
+    """MSVC without /utf-8 wrote the µ as a lone cp1252 byte, and the echo
+    failed to decode, aborting the script (BelfrySCAD #883's CI)."""
+    out = _echoes(tmp_path, 'x = profile_time("t") 1;\n')
+    assert any("µs" in e or " ms" in e for e in out), out