diff options
| author | Andrés Cuervo <andrescuervor@gmail.com> | 2023-05-11 21:47:48 +0000 |
|---|---|---|
| committer | Andrés Cuervo <andrescuervor@gmail.com> | 2023-05-11 21:47:48 +0000 |
| commit | 09ccccf4496798f54cb49110c3a06256cc7fea00 (patch) | |
| tree | e370cbf56690ed2f09c2f0db3a67794d2e437374 /virtual-programs/intersect.folk | |
| parent | Make circles proper circles, add hex- & octagon (diff) | |
| download | folk-09ccccf4496798f54cb49110c3a06256cc7fea00.tar.gz folk-09ccccf4496798f54cb49110c3a06256cc7fea00.zip | |
Remove some nested Whens
Diffstat (limited to 'virtual-programs/intersect.folk')
| -rw-r--r-- | virtual-programs/intersect.folk | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/virtual-programs/intersect.folk b/virtual-programs/intersect.folk index ef0f4c79..351a293c 100644 --- a/virtual-programs/intersect.folk +++ b/virtual-programs/intersect.folk @@ -8,27 +8,23 @@ When $this has neighbor /n/ { #Wish $this has neighbors -When /someone/ wishes /p/ has neighbors { - When $p has region /r/ { - When /p2/ has region /r2/ { - if {$p eq $p2} { return } - lassign [regionToBbox $r] bMinX bMinY bMaxX bMaxY - lassign [regionToBbox $r2] b2MinX b2MinY b2MaxX b2MaxY - - set hasIntersections [rectanglesOverlap [list $bMinX $bMinY] \ - [list $bMaxX $bMaxY]\ - [list $b2MinX $b2MinY]\ - [list $b2MaxX $b2MaxY]\ - false ] - #Display::stroke [list [list $bMinX $bMinY] {500 500}] 3 blue - #Display::stroke [list [list $bMaxX $bMaxY] {500 500}] 3 red +When /someone/ wishes /p/ has neighbors & /p/ has region /r/ & /p2/ has region /r2/ { + if {$p eq $p2} { return } + lassign [regionToBbox $r] bMinX bMinY bMaxX bMaxY + lassign [regionToBbox $r2] b2MinX b2MinY b2MaxX b2MaxY + + set hasIntersections [rectanglesOverlap [list $bMinX $bMinY] \ + [list $bMaxX $bMaxY]\ + [list $b2MinX $b2MinY]\ + [list $b2MaxX $b2MaxY]\ + false ] + #Display::stroke [list [list $bMinX $bMinY] {500 500}] 3 blue + #Display::stroke [list [list $bMaxX $bMaxY] {500 500}] 3 red - if {$hasIntersections} { - Claim $p has neighbor $p2 - #Display::stroke [list [list $b2MinX $b2MinY] {500 500}] 3 red - #Display::stroke [list [list $b2MaxX $b2MaxY] {500 500}] 3 white - #Display::stroke [list [list $b2MinX $b2MinY] [list $b2MaxX $b2MaxY]] 10 blue - } - } + if {$hasIntersections} { + Claim $p has neighbor $p2 + #Display::stroke [list [list $b2MinX $b2MinY] {500 500}] 3 red + #Display::stroke [list [list $b2MaxX $b2MaxY] {500 500}] 3 white + #Display::stroke [list [list $b2MinX $b2MinY] [list $b2MaxX $b2MaxY]] 10 blue } }
\ No newline at end of file |