From cf104ef0db7370eb15f16b64432587b41bae4198 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Tue, 29 Jul 2008 19:09:00 -0500 Subject: [PATCH 1/6] slides: use colors --- extra/slides/slides.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/slides/slides.factor b/extra/slides/slides.factor index c3c105143e..05aa6779f5 100755 --- a/extra/slides/slides.factor +++ b/extra/slides/slides.factor @@ -3,7 +3,7 @@ USING: arrays hashtables help.markup help.stylesheet io io.styles kernel math models namespaces sequences ui ui.gadgets ui.gadgets.books ui.gadgets.panes ui.gestures ui.render -parser accessors ; +parser accessors colors ; IN: slides : stylesheet From 95b097789ce37ef87414a7ff0f80d0352a00fa88 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Tue, 29 Jul 2008 19:37:24 -0500 Subject: [PATCH 2/6] Add ui.gadgets.cartesian --- extra/ui/gadgets/cartesian/cartesian.factor | 50 +++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 extra/ui/gadgets/cartesian/cartesian.factor diff --git a/extra/ui/gadgets/cartesian/cartesian.factor b/extra/ui/gadgets/cartesian/cartesian.factor new file mode 100644 index 0000000000..08e04e669e --- /dev/null +++ b/extra/ui/gadgets/cartesian/cartesian.factor @@ -0,0 +1,50 @@ + +USING: kernel combinators opengl.gl + ui.render ui.gadgets ui.gadgets.slate + accessors ; + +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 ) + init-slate + -10 >>x-min + 10 >>x-max + -10 >>y-min + 10 >>y-max + -1 >>z-min + 1 >>z-max ; + +: ( -- cartesian ) cartesian new init-cartesian ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +M: cartesian draw-gadget* ( cartesian -- ) + GL_PROJECTION glMatrixMode + glLoadIdentity + dup + { + [ x-min>> ] [ x-max>> ] + [ y-min>> ] [ y-max>> ] + [ z-min>> ] [ z-max>> ] + } + cleave + glOrtho + GL_MODELVIEW glMatrixMode + glLoadIdentity + call-next-method ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + From 80c599e9ea7b4783d13385dbe2c2388ee71bc59a Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Tue, 29 Jul 2008 21:15:27 -0500 Subject: [PATCH 3/6] automata.ui: Use color objects --- extra/automata/ui/ui.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/automata/ui/ui.factor b/extra/automata/ui/ui.factor index cfb0462877..037cf41118 100644 --- a/extra/automata/ui/ui.factor +++ b/extra/automata/ui/ui.factor @@ -30,7 +30,7 @@ IN: automata.ui : draw-bitmap ( bitmap -- ) GL_POINTS glBegin (draw-bitmap) glEnd ; -: display ( -- ) black gl-color bitmap> draw-bitmap ; +: display ( -- ) black set-color bitmap> draw-bitmap ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! From c7048ccacc266640ec4d4bcc51ef02f7d923eab8 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Tue, 29 Jul 2008 21:15:54 -0500 Subject: [PATCH 4/6] ui.gadgets.slate: init-slate --- extra/ui/gadgets/slate/slate.factor | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/extra/ui/gadgets/slate/slate.factor b/extra/ui/gadgets/slate/slate.factor index 2ef740e580..05b2de2e06 100644 --- a/extra/ui/gadgets/slate/slate.factor +++ b/extra/ui/gadgets/slate/slate.factor @@ -5,12 +5,19 @@ IN: ui.gadgets.slate TUPLE: slate < gadget action pdim graft ungraft ; +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: init-slate ( slate -- slate ) + init-gadget + [ ] >>action + { 200 200 } >>pdim + [ ] >>graft + [ ] >>ungraft ; + : ( action -- slate ) - slate new-gadget - swap >>action - { 100 100 } >>pdim - [ ] >>graft - [ ] >>ungraft ; + slate new + init-slate + swap >>action ; M: slate pref-dim* ( slate -- dim ) pdim>> ; From 0b9e6538c0ae6c2428cfba45dfc8801520b1ee79 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Tue, 29 Jul 2008 21:16:14 -0500 Subject: [PATCH 5/6] 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* ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + From 6ac694f70fdbbf218c0b3bcc76af38779a9d8070 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Tue, 29 Jul 2008 21:16:34 -0500 Subject: [PATCH 6/6] golden-section: Use cartesian gadget --- extra/golden-section/golden-section.factor | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/extra/golden-section/golden-section.factor b/extra/golden-section/golden-section.factor index 807ef1355a..05e7f68d0a 100644 --- a/extra/golden-section/golden-section.factor +++ b/extra/golden-section/golden-section.factor @@ -2,7 +2,7 @@ USING: kernel namespaces math math.constants math.functions math.order arrays sequences opengl opengl.gl opengl.glu ui ui.render ui.gadgets ui.gadgets.theme - ui.gadgets.slate colors accessors combinators.cleave + ui.gadgets.cartesian colors accessors combinators.cleave processing.shapes ; IN: golden-section @@ -39,20 +39,17 @@ IN: golden-section ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: display ( -- ) - GL_PROJECTION glMatrixMode - glLoadIdentity - -400 400 -400 400 -1 1 glOrtho - GL_MODELVIEW glMatrixMode - glLoadIdentity - golden-section ; - : golden-section-window ( -- ) [ - [ display ] - { 600 600 } >>pdim + + { 600 600 } >>pdim + { -400 400 } x-range + { -400 400 } y-range + [ golden-section ] >>action "Golden Section" open-window ] with-ui ; +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + MAIN: golden-section-window