From 4f156348d37f4e1ff13426ecb320fff71af6fe7e Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 4 Mar 2009 11:44:24 -0600 Subject: [PATCH] inline quadtrees:swizzle. add axes word to math.affine-transforms to remove translation from transform --- extra/math/affine-transforms/affine-transforms.factor | 3 +++ extra/quadtrees/quadtrees.factor | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/extra/math/affine-transforms/affine-transforms.factor b/extra/math/affine-transforms/affine-transforms.factor index 822af51614..132082fdba 100644 --- a/extra/math/affine-transforms/affine-transforms.factor +++ b/extra/math/affine-transforms/affine-transforms.factor @@ -8,6 +8,9 @@ C: affine-transform CONSTANT: identity-transform T{ affine-transform f { 1.0 0.0 } { 0.0 1.0 } { 0.0 0.0 } } +: axes ( a -- a' ) + clone { 0.0 0.0 } >>origin ; + : a.v ( a v -- v ) [ [ x>> ] [ first ] bi* v*n ] [ [ y>> ] [ second ] bi* v*n ] diff --git a/extra/quadtrees/quadtrees.factor b/extra/quadtrees/quadtrees.factor index d9bdbe4aeb..9ce8003736 100644 --- a/extra/quadtrees/quadtrees.factor +++ b/extra/quadtrees/quadtrees.factor @@ -195,5 +195,5 @@ M: quadtree clear-assoc ( assoc -- ) : swizzle ( sequence quot -- sequence' ) [ dup ] dip map [ zip ] [ rect-containing ] bi - [ '[ first2 _ set-at ] each ] [ values ] bi ; + [ '[ first2 _ set-at ] each ] [ values ] bi ; inline