From 8d2799d811e6c8244fcee75661e2919254841bad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Cuervo?= Date: Fri, 9 Jun 2023 14:32:01 -0400 Subject: Remove keyboard hardcoding + cleanup contains fn --- virtual-programs/regions.folk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'virtual-programs') diff --git a/virtual-programs/regions.folk b/virtual-programs/regions.folk index 583e4681..313a48d2 100644 --- a/virtual-programs/regions.folk +++ b/virtual-programs/regions.folk @@ -59,16 +59,15 @@ namespace eval ::region { lassign $r1 vertices edges lassign $vertices a b c d - # 0 <= dot(ab,ap) <= dot(ab,ab) && 0 <= dot(bc,bp) <= dot(bc,bc) - set ab [vec2 sub $b $a] + set ab [vec2 sub $b $a] set ap [vec2 sub $p $a] set bc [vec2 sub $c $b] set bp [vec2 sub $p $b] set dot_abap [vec2 dot $ab $ap] set dot_bcbp [vec2 dot $bc $bp] - return [expr {0 <= $dot_abap && $dot_abap <= [vec2 dot $ab $ab] && \ - 0 <= $dot_bcbp && $dot_bcbp <= [vec2 dot $bc $bc]}] + expr {0 <= $dot_abap && $dot_abap <= [vec2 dot $ab $ab] && \ + 0 <= $dot_bcbp && $dot_bcbp <= [vec2 dot $bc $bc]} } namespace export distance contains -- cgit v1.2.3