From b6937b539edf3117b7e570756c881fb880d48b49 Mon Sep 17 00:00:00 2001 From: Adrian Mariano Date: Sat, 6 Nov 2021 19:29:49 -0400 Subject: [PATCH] fix doc errors --- regions.scad | 12 ++++++---- tests/test_regions.scad | 51 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 5 deletions(-) diff --git a/regions.scad b/regions.scad index 6fc0771..03491f6 100644 --- a/regions.scad +++ b/regions.scad @@ -252,10 +252,11 @@ function is_region_simple(region, eps=EPSILON) = // Examples(2D,NoAxes): Alternatively with the nonzero option you can get the perimeter: // pentagram = turtle(["move",100,"left",144], repeat=4); // region = make_region(pentagram,nonzero=true); -// stroke(region, width=1,closed=true); +// rainbow(region)stroke($item, width=1,closed=true); // Example(2D,NoAxes): To crossing squares become two L-shaped components // region = make_region([square(10), move([5,5],square(8))]); // rainbow(region)stroke($item, width=.3,closed=true); + function make_region(polys,nonzero=false,eps=EPSILON) = let(polys=force_region(polys)) assert(is_region(polys), "Input is not a region") @@ -320,16 +321,17 @@ module region(r) // point = The point to test. // region = The region to test against, as a list of polygon paths. // eps = Acceptable variance. Default: `EPSILON` (1e-9) -// Example(2D,NoAxes): +// Example(2D,NoAxes): Green points are in the region, red ones are outside // region = [for(i=[2:8]) hexagon(r=i)]; -// for(x=[-4:4],y=[-4:4]) color(point_in_region +// region(region); +// for(x=[-4.5:4.5],y=[-4.5:4.5]) color(point_in_region([x,y],region)==1?"green":"red") move([x,y])circle(r=.1,$fn=12); function point_in_region(point, region, eps=EPSILON) = let(region=force_region(region)) assert(is_region(region), "Region given to point_in_region is not a region") assert(is_vector(point,2), "Point must be a 2D point in point_in_region") _point_in_region(point, region, eps); -function pointin_region(point, region, eps=EPSILON, i=0, cnt=0) = +function _point_in_region(point, region, eps=EPSILON, i=0, cnt=0) = i >= len(region) ? ((cnt%2==1)? 1 : -1) : let( pip = point_in_polygon(point, region[i], eps=eps) @@ -1205,7 +1207,7 @@ function intersection(regions=[],b=undef,c=undef,eps=EPSILON) = function exclusive_or(regions=[],b=undef,c=undef,eps=EPSILON) = let(regions = _list_three(regions,b,c)) len(regions)==0? [] - : len(regions)==1? regions[0] + : len(regions)==1? force_region(regions[0]) : regions[0]==[] ? exclusive_or(list_tail(regions)) : regions[1]==[] ? exclusive_or(list_remove(regions,1)) : exclusive_or([ diff --git a/tests/test_regions.scad b/tests/test_regions.scad index 9a2126b..586d8c5 100644 --- a/tests/test_regions.scad +++ b/tests/test_regions.scad @@ -104,3 +104,54 @@ module test_exclusive_or() { } test_exclusive_or(); + + + +module test_point_in_region(){ + region = [for(i=[2:8]) hexagon(r=i)]; + pir=[for(x=[-6:6],y=[-6:6]) point_in_region([x,y],region)]; + assert_equal(pir, + [-1, -1, -1, 1, 1, -1, 0, -1, 1, 1, -1, -1, -1, -1, 1, 1, + -1, -1, 1, 0, 1, -1, -1, 1, 1, -1, 1, -1, -1, 1, 1, -1, 0, + -1, 1, 1, -1, -1, 1, -1, 1, 1, -1, -1, 1, 0, 1, -1, -1, 1, + 1, -1, -1, 1, -1, 1, 1, -1, 0, -1, 1, 1, -1, 1, -1, -1, 1, + -1, 1, -1, 1, 1, 1, -1, 1, -1, 1, -1, -1, 1, -1, 1, -1, 1, + 1, 1, -1, 1, -1, 1, -1, -1, 1, -1, 1, -1, 1, 1, 1, -1, 1, + -1, 1, -1, -1, 1, -1, 1, 1, -1, 0, -1, 1, 1, -1, 1, -1, -1, + 1, 1, -1, -1, 1, 0, 1, -1, -1, 1, 1, -1, 1, -1, -1, 1, 1, + -1, 0, -1, 1, 1, -1, -1, 1, -1, 1, 1, -1, -1, 1, 0, 1, -1, + -1, 1, 1, -1, -1, -1, -1, 1, 1, -1, 0, -1, 1, 1, -1, -1, -1]); +} +test_point_in_region(); + + +module test_make_region(){ + pentagram = turtle(["move",100,"left",144], repeat=4); + region1 = make_region(pentagram); + assert_approx(region1, + [[[0, 0], [38.196601125, 0], [30.9016994375, 22.451398829]], [[50, + 36.3271264003], [19.0983005625, 58.7785252292], [30.9016994375, + 22.451398829]], [[69.0983005625, 22.451398829], [50, 36.3271264003], + [80.9016994375, 58.7785252292]], [[61.803398875, 3.5527136788e-15], + [69.0983005625, 22.451398829], [100, 0]], [[38.196601125, 0], + [61.803398875, 3.94430452611e-31], [50, -36.3271264003]]]); + region2 = make_region(pentagram,nonzero=true); + assert_approx(region2, + [[[0, 0], [38.196601125, 0], [50, -36.3271264003], + [61.803398875, 3.5527136788e-15], [100, 0], + [69.0983005625, 22.451398829], [80.9016994375, + 58.7785252292], [50, 36.3271264003], [19.0983005625, + 58.7785252292], [30.9016994375, 22.451398829]]]); + region3 = make_region([square(10), move([5,5],square(8))]); + assert_equal(region3, [[[10, 0], [0, 0], [0, 10], [5, 10], [5, 5], [10, 5]], [[5, 10], [10, 10], [10, 5], [13, 5], [13, 13], [5, 13]]]); +} +test_make_region(); + + + +module test_region_area(){ + assert_equal(region_area([square(10), right(20,square(8))]), 164); +} +test_region_area(); + +