From 0b9e6538c0ae6c2428cfba45dfc8801520b1ee79 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Tue, 29 Jul 2008 21:16:14 -0500 Subject: [PATCH] ui.gadgets.cartesian: range words --- extra/ui/gadgets/cartesian/cartesian.factor | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/extra/ui/gadgets/cartesian/cartesian.factor b/extra/ui/gadgets/cartesian/cartesian.factor index 08e04e669e..027c1061a8 100644 --- a/extra/ui/gadgets/cartesian/cartesian.factor +++ b/extra/ui/gadgets/cartesian/cartesian.factor @@ -1,5 +1,5 @@ -USING: kernel combinators opengl.gl +USING: kernel combinators sequences opengl.gl ui.render ui.gadgets ui.gadgets.slate accessors ; @@ -7,15 +7,6 @@ IN: ui.gadgets.cartesian ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: init-slate ( slate -- slate ) - init-gadget - [ ] >>action - { 200 200 } >>pdim - [ ] >>graft - [ ] >>ungraft ; - -! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - TUPLE: cartesian < slate x-min x-max y-min y-max z-min z-max perspective ; : init-cartesian ( cartesian -- cartesian ) @@ -48,3 +39,9 @@ M: cartesian draw-gadget* ( cartesian -- ) ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +: x-range ( cartesian range -- cartesian ) first2 [ >>x-min ] [ >>x-max ] bi* ; +: y-range ( cartesian range -- cartesian ) first2 [ >>y-min ] [ >>y-max ] bi* ; +: z-range ( cartesian range -- cartesian ) first2 [ >>z-min ] [ >>z-max ] bi* ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +