From a7e4a6cc4c4d89f5d8e2830e5fd933fdc5d6a00c Mon Sep 17 00:00:00 2001 From: Omar Rizwan Date: Fri, 23 Dec 2022 17:13:06 -0500 Subject: Fixup tags-and-calibration in hacky way for stricter scoping --- virtual-programs/tags-and-calibration.folk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'virtual-programs') diff --git a/virtual-programs/tags-and-calibration.folk b/virtual-programs/tags-and-calibration.folk index fa32304c..1d3afc8e 100644 --- a/virtual-programs/tags-and-calibration.folk +++ b/virtual-programs/tags-and-calibration.folk @@ -55,15 +55,15 @@ set ::H [subst { }] set ::Hinv [solvePGauss $::H [math::linearalgebra::mkIdentity 3]] -proc cameraToProjector {cameraPoint} { +proc ::cameraToProjector {cameraPoint} { # FIXME: this is slow but not the cause of leak - lassign [matmul $::H [list [lindex $cameraPoint 0] [lindex $cameraPoint 1] 1]] Hx Hy Hz + lassign [::math::linearalgebra::matmul $::H [list [lindex $cameraPoint 0] [lindex $cameraPoint 1] 1]] Hx Hy Hz set Hx [expr {$Hx / $Hz}] set Hy [expr {$Hy / $Hz}] return [list $Hx $Hy] } -proc projectorToCamera {projectorPoint} { - lassign [matmul $::Hinv [list [lindex $projectorPoint 0] [lindex $projectorPoint 1] 1]] Hinvx Hinvy Hinvz +proc ::projectorToCamera {projectorPoint} { + lassign [::math::linearalgebra::matmul $::Hinv [list [lindex $projectorPoint 0] [lindex $projectorPoint 1] 1]] Hinvx Hinvy Hinvz set Hinvx [expr {$Hinvx / $Hinvz}] set Hinvy [expr {$Hinvy / $Hinvz}] return [list $Hinvx $Hinvy] -- cgit v1.2.3