mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-27 02:41:17 +00:00
Port the exact loop area, the offset traversal fix, and the 2D sketch ladder
Carries snaporca 572f794c84, d0f9a0052a, 9f7e4e3627 and 3974f8a170. Parity holds: 17 files identical, 8 diverging by their expected counts. EXACT AREA. A loop's area is now integrated entity by entity in traversal order — Green's theorem — instead of being shoelaced over the render polyline, which faceted every arc into 24 chords and lost 2.02 mm2 on a 3706.86 mm2 stadium. 0.054%, invisible on screen, and wrong in a number reported as "the area". OFFSET FOLLOWS THE TRAVERSAL. Offsetting a mirrored profile put one half on the wrong side and split the loop in two, because the chainer only followed p1->p0 links and each entity's offset side was taken from its stored direction. Chains are now orientation-aware, seeded at a free end, offset by `reversed ? -d : d`, and normalised head-to-tail on the way out — so offset is correct for any input ordering and its own output cannot reintroduce the problem. Both are the same underlying lesson, which has now cost three separate defects: an entity's STORED direction is not its direction of TRAVEL around the loop. THE LADDER. scripts/sketch-ladder.py is a graded suite of 2D sketches judged the way a person judges them — VERTEX, LENGTH, ARC, TANGENT, SYMMETRY, CLOSED — with area only as a cross-check, because area is derived and nobody can confirm it by eye. Eight rungs from a rectangle up to MPD5 from the StudyCadCam corpus, a dia 27 x 95 pin reproduced as its revolve half-profile with the R5 fillet tangency solved exactly. Entirely 2D: no extrude or any solid feature. Kernel here: all tests passed, 2681 assertions in 231 test cases, including the new "profile: a mirrored half offsets as one loop, not two". GUI target builds and links. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5
parent
510e63dff2
commit
cbbd24dcb4
@@ -162,3 +162,26 @@ TEST_CASE("profile: an open chain offsets without being forced closed", "[Sketch
|
||||
// The interior seam is repaired: the two offset segments still meet.
|
||||
REQUIRE_THAT((out[0].p1 - out[1].p0).norm(), WithinAbs(0.0, 1e-9));
|
||||
}
|
||||
|
||||
TEST_CASE("profile: a mirrored half offsets as one loop, not two", "[SketchProfile]")
|
||||
{
|
||||
// The classic "draw half, mirror it" gesture on a stadium. mirror_entities emits a half
|
||||
// that travels the opposite way round, so the concatenation must still chain as ONE closed
|
||||
// loop and its mirrored cap must offset outward like the original, not inward.
|
||||
const double L = 30, R = 15, d = 4;
|
||||
const std::vector<SketchEntity> half = {
|
||||
line({0, -R}, {L, -R}),
|
||||
arc({L, 0}, R, -M_PI / 2, M_PI / 2),
|
||||
line({L, R}, {0, R}),
|
||||
};
|
||||
std::vector<SketchEntity> all = half;
|
||||
for (const auto& e : SketchEngine::mirror_entities(half, Vec2d(0, 0), Vec2d(0, 1)))
|
||||
all.push_back(e);
|
||||
REQUIRE(closed_wires(all) == 1);
|
||||
|
||||
const auto out = SketchEngine::offset_entities(all, -d); // -d = outward for this loop
|
||||
REQUIRE(closed_wires(out) == 1);
|
||||
for (const auto& o : out)
|
||||
if (o.type == SketchEntity::Type::Arc)
|
||||
REQUIRE_THAT(o.radius, WithinAbs(R + d, 1e-9));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user