openscad-cpp-evaluator 1.50.0__tar.gz → 1.50.2__tar.gz

{openscad_cpp_evaluator-1.50.0 → openscad_cpp_evaluator-1.50.2}/CLAUDE.md

@@ -1975,7 +1975,9 @@ is evaluated before the clock starts. Times under 1 ms print in microseconds (`f
 
 `alpha_wrap(alpha, offset) { ... }` shrink-wraps its children in a closed, manifold skin
 (BelfrySCAD #941; `supported_feature("alpha-wrap")` is 1). The skin follows any concavity a ball
-of radius `alpha` can enter and bridges any gap or hole narrower than that; every point of it lies
+of radius `alpha` can enter and bridges any gap or hole that ball cannot pass, i.e. narrower than about
+`2*alpha` (not a sharp cut-off: from ~1.5x alpha to 2x alpha + offset a gap may be bridged only
+partly, leaving strands, which CGAL's own Alpha_wrap_3 does too -- BelfrySCAD #941); every point of it lies
 `offset` outside the input. Defaults are CGAL's: alpha 1/20 of the bounding-box diagonal, offset
 alpha/30. All Normal 3D children are wrapped together into one body taking the first one's colour,
 **including an open `polyhedron()`'s raw triangles** (`ColoredBody::rawMesh`) -- wrapping geometry
@@ -2001,6 +2003,9 @@ warning). A non-positive or non-numeric `alpha`/`offset` warns and leaves the ch
   input (separating-axis tet/triangle test over a BVH) onto the offset surface.
 - The skin is built as `MeshGL64`: rounding Steiner points to float can fold the thin triangles a
   small offset produces. Input is read from each body's float `MeshGL`.
+- The finished skin is `Simplify(offset / 100)`ed: its points all lie on the offset surface, so its
+  flat sides are many coplanar triangles. Measured 1.05-3.3x fewer triangles (two cubes 7,284 ->
+  2,238; bracket at alpha 0.5 11,858 -> 4,134), volume within 0.001%, no measurable time (#941).
 - `checkCancel()` every 256 gates; a 5M-Steiner-point runaway guard warns and returns the children.
 - Measured: a 242-triangle bracket wraps in 5 ms at alpha 3 (362 faces) and 137 ms at alpha 0.5
   (11.9k faces); extruded text, 2,468 triangles, 0.7 s at alpha 0.5 and 4 s at alpha 0.2 (102k

{openscad_cpp_evaluator-1.50.0 → openscad_cpp_evaluator-1.50.2}/PKG-INFO

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

{openscad_cpp_evaluator-1.50.0 → openscad_cpp_evaluator-1.50.2}/external/openscad_cpp_parser/src/grammar/lexer.l

@@ -88,7 +88,17 @@ NUMLIT  0[xX][0-9A-Fa-f]+|[0-9]+([.][0-9]*)?([eE][+-]?[0-9]+)?|[.][0-9]+([eE][+-
     // U+FEFF (EF BB BF, a byte-order mark, anywhere in the file) and a bare
     // A0, Latin-1's no-break space.
 }
-"//"[^\n]*               { /* skip line comment */ }
+\xe2\x80\xa8|\xe2\x80\xa9|\xc2\x85 {
+    // U+2028 LINE SEPARATOR, U+2029 PARAGRAPH SEPARATOR and U+0085 NEXT
+    // LINE: line breaks to look at, so whitespace that also ends a `//`
+    // comment (below). Qt's editor types U+2028 for Shift+Enter, and it
+    // shows as a new line (BelfrySCAD #949). It does NOT count as a line:
+    // the editor numbers its lines by block and a U+2028 sits inside one,
+    // so every line and column after it still matches the editor's.
+    // OpenSCAD's lexer rejects all three.
+}
+    /* A line comment ends at a newline or at any separator above. */
+"//"([^\n\xe2\xc2]|\xe2[^\x80\n]|\xe2\x80[^\xa8\xa9\n]|\xc2[^\x85\n])* { /* skip line comment */ }
 "/*"([^*]|\*+[^*/])*\*+"/" { /* skip block comment */ }
 
 {IDENT} {

{openscad_cpp_evaluator-1.50.0 → openscad_cpp_evaluator-1.50.2}/external/openscad_cpp_parser/tests/test_lexical.cpp

@@ -483,6 +483,22 @@ TEST(LexicalWhitespace, NoBreakSpaceByteOrderMarkAndLatin1A0) {
     }
 }
 
+// U+2028/U+2029/U+0085 are whitespace that ends a line comment, without
+// counting as a line (BelfrySCAD's editor numbers lines by block, and a
+// U+2028 sits inside one).
+TEST(LexicalWhitespace, UnicodeLineSeparatorsEndACommentButNotALine) {
+    for (const char* sep : {"\xe2\x80\xa8", "\xe2\x80\xa9", "\xc2\x85"}) {
+        const std::string src = std::string("a = 1;") + sep + "b = 2; // note" + sep + "c = 3;\nd = 4;";
+        auto ast = parseSrc(src);
+        ASSERT_EQ(ast.size(), 4u) << "the comment swallowed c = 3";
+        EXPECT_EQ(ast[2]->position().line, 1);
+        EXPECT_EQ(size_t(ast[2]->position().start_offset), src.find("c = 3"));
+        EXPECT_EQ(ast[3]->position().line, 2);
+    }
+    // Other multi-byte characters stay inside the comment.
+    EXPECT_EQ(parseSrc("a = 1; // \xe2\x80\x94 \xc2\xa0 \xe2\x82\xac c = 3;\nb = 2;").size(), 2u);
+}
+
 // The message quotes a whole character, and names a byte that starts none,
 // so it is always valid UTF-8.
 TEST(LexicalWhitespace, UnexpectedCharacterMessageIsValidUtf8) {

{openscad_cpp_evaluator-1.50.0 → openscad_cpp_evaluator-1.50.2}/pyproject.toml

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

{openscad_cpp_evaluator-1.50.0 → openscad_cpp_evaluator-1.50.2}/src/builtins/alpha_wrap.cpp

@@ -2,7 +2,7 @@
 // manifold skin. A BelfrySCAD extension (BelfrySCAD #941).
 //
 // The skin follows any concavity a ball of radius `alpha` can enter and
-// bridges any gap or hole narrower than that, and every point of it lies
+// bridges any gap or hole that ball cannot pass (about 2*alpha wide), and every point of it lies
 // `offset` outside the input. So it is also a robust rounded outward offset,
 // and a way to wrap geometry too broken for Manifold to accept: an open
 // polyhedron()'s raw triangles are wrapped like any other.
@@ -56,6 +56,11 @@ constexpr double kDefaultOffsetFraction = 1.0 / 30.0;
 // A runaway guard, not a quality knob: a tiny alpha on a big model asks for
 // tens of millions of points, which would exhaust memory long before ending.
 constexpr size_t kMaxSteinerPoints = 5'000'000;
+// The skin's flat sides are cut into many small coplanar triangles, its
+// points all lying on the offset surface. Merging at a tolerance this small
+// next to the offset leaves the rounded edges' shape and the volume alone
+// while cutting the triangle count by up to ~3x (#941).
+constexpr double kMergeFraction = 1.0 / 100.0;
 
 using V3 = std::array<double, 3>;
 V3 operator+(V3 a, V3 b) { return {a[0] + b[0], a[1] + b[1], a[2] + b[2]}; }
@@ -583,6 +588,8 @@ std::vector<ColoredBody> generateAlphaWrap(Evaluator& ev, const CSGParams& param
     manifold::Manifold body(wrap.skin());
     if (body.Status() != manifold::Manifold::Error::NoError) {
         ev.warn("alpha_wrap: the skin is not manifold", &node.position());
+    } else {
+        body = body.Simplify(kMergeFraction * *offset);
     }
     ColoredBody cb = ev.tagGenerated(std::move(body), node, Value{});
     cb.color = color;

{openscad_cpp_evaluator-1.50.0 → openscad_cpp_evaluator-1.50.2}/tests/test_alpha_wrap.cpp

@@ -40,6 +40,16 @@ TEST(AlphaWrap, BridgesGapsNarrowerThanAlpha) {
     EXPECT_EQ(soleBody(narrow).Genus(), 2);
 }
 
+TEST(AlphaWrap, FlatSidesAreMerged) {
+    // Two cubes: without the merge the skin was 7,282 triangles; merged at
+    // offset/100 it is ~2.2k, with the volume unchanged (#941).
+    const std::string two = "{ cube(10); translate([11,0,0]) cube(5); }";
+    Evaluated w = evalSrc("alpha_wrap(0.5, 0.01) " + two);
+    EXPECT_EQ(soleBody(w).Status(), manifold::Manifold::Error::NoError);
+    EXPECT_LT(soleBody(w).NumTri(), 3000u);
+    EXPECT_NEAR(soleBody(w).Volume(), 1132.51, 0.01);
+}
+
 TEST(AlphaWrap, SkinSitsOffsetOutsideTheInput) {
     Evaluated w = evalSrc(std::string("alpha_wrap(0.5, 0.1) ") + kBracket + ";");
     const manifold::Box bb = soleBody(w).BoundingBox();