diff --git a/extra/cfdg/models/aqua-star/aqua-star.factor b/extra/cfdg/models/aqua-star/aqua-star.factor index f692328515..dbb7eb5ed0 100644 --- a/extra/cfdg/models/aqua-star/aqua-star.factor +++ b/extra/cfdg/models/aqua-star/aqua-star.factor @@ -25,11 +25,12 @@ iterate? [ ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: run ( -- ) -[ -1 b ] >background -{ -60 140 -120 140 } viewport set -0.1 threshold set -[ anemone-begin ] start-shape set -cfdg-window ; +: init ( -- ) + [ -1 b ] >background + { -60 140 -120 140 } >viewport + 0.1 >threshold + [ anemone-begin ] >start-shape ; + +: run ( -- ) [ init ] cfdg-window. ; MAIN: run diff --git a/extra/cfdg/models/chiaroscuro/chiaroscuro.factor b/extra/cfdg/models/chiaroscuro/chiaroscuro.factor index 31f78c459e..1034f1527b 100644 --- a/extra/cfdg/models/chiaroscuro/chiaroscuro.factor +++ b/extra/cfdg/models/chiaroscuro/chiaroscuro.factor @@ -29,11 +29,12 @@ DEFER: white ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: run ( -- ) -[ -0.5 b ] >background -{ -3 6 -2 6 } viewport set -0.01 threshold set -[ chiaroscuro ] start-shape set -cfdg-window ; +: init ( -- ) + [ -0.5 b ] >background + { -3 6 -2 6 } >viewport + 0.01 >threshold + [ chiaroscuro ] >start-shape ; + +: run ( -- ) [ init ] cfdg-window. ; MAIN: run diff --git a/extra/cfdg/models/flower6/flower6.factor b/extra/cfdg/models/flower6/flower6.factor index b77968c863..91fecd7fe5 100644 --- a/extra/cfdg/models/flower6/flower6.factor +++ b/extra/cfdg/models/flower6/flower6.factor @@ -18,12 +18,13 @@ iterate? [ ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: run ( -- ) -[ ] >background -{ -1 2 -1 2 } viewport set -0.01 threshold set -[ flower6 ] start-shape set -cfdg-window ; +: init ( -- ) + [ ] >background + { -1 2 -1 2 } >viewport + 0.01 >threshold + [ flower6 ] >start-shape ; + +: run ( -- ) [ init ] cfdg-window. ; MAIN: run diff --git a/extra/cfdg/models/game1-turn6/game1-turn6.factor b/extra/cfdg/models/game1-turn6/game1-turn6.factor index 0cd65242fb..3e0994112a 100644 --- a/extra/cfdg/models/game1-turn6/game1-turn6.factor +++ b/extra/cfdg/models/game1-turn6/game1-turn6.factor @@ -37,11 +37,12 @@ DEFER: start ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: run ( -- ) -[ 66 hue 0.4 sat 0.5 b ] >background -{ -5 10 -5 10 } viewport set -0.001 >threshold -[ start ] >start-shape -cfdg-window ; +: init ( -- ) + [ 66 hue 0.4 sat 0.5 b ] >background + { -5 10 -5 10 } >viewport + 0.001 >threshold + [ start ] >start-shape ; + +: run ( -- ) [ init ] cfdg-window. ; MAIN: run \ No newline at end of file diff --git a/extra/cfdg/models/lesson/lesson.factor b/extra/cfdg/models/lesson/lesson.factor index 287e572929..5902c121ae 100644 --- a/extra/cfdg/models/lesson/lesson.factor +++ b/extra/cfdg/models/lesson/lesson.factor @@ -96,12 +96,13 @@ iterate? [ ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: run ( -- ) -[ ] >background -{ -5 25 -15 25 } viewport set -0.03 threshold set -[ toc ] start-shape set -cfdg-window ; +: init ( -- ) + [ ] >background + { -5 25 -15 25 } >viewport + 0.03 >threshold + [ toc ] >start-shape ; + +: run ( -- ) [ init ] cfdg-window. ; MAIN: run diff --git a/extra/cfdg/models/rules08/rules08.factor b/extra/cfdg/models/rules08/rules08.factor index d14aa04fb1..20099d225a 100644 --- a/extra/cfdg/models/rules08/rules08.factor +++ b/extra/cfdg/models/rules08/rules08.factor @@ -51,12 +51,13 @@ DEFER: line ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: run ( -- ) +: init ( -- ) [ -1 b ] >background { -20 40 -20 40 } viewport set [ centre ] >start-shape - 0.0001 >threshold - cfdg-window ; + 0.0001 >threshold ; + +: run ( -- ) [ init ] cfdg-window. ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/extra/cfdg/models/sierpinski/sierpinski.factor b/extra/cfdg/models/sierpinski/sierpinski.factor index 1acee8309a..2333506f29 100644 --- a/extra/cfdg/models/sierpinski/sierpinski.factor +++ b/extra/cfdg/models/sierpinski/sierpinski.factor @@ -26,14 +26,12 @@ iterate? [ ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: run ( -- ) -[ ] >background -{ -4 8 -4 8 } viewport set -0.01 >threshold -[ top ] >start-shape -cfdg-window ; - -MAIN: run - +: init ( -- ) + [ ] >background + { -4 8 -4 8 } >viewport + 0.01 >threshold + [ top ] >start-shape ; +: run ( -- ) [ init ] cfdg-window. ; +MAIN: run \ No newline at end of file diff --git a/extra/cfdg/models/snowflake/snowflake.factor b/extra/cfdg/models/snowflake/snowflake.factor index 951f449e68..9efb3352fa 100644 --- a/extra/cfdg/models/snowflake/snowflake.factor +++ b/extra/cfdg/models/snowflake/snowflake.factor @@ -25,12 +25,13 @@ spike ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: run ( -- ) -[ ] >background -{ -40 80 -40 80 } viewport set -0.1 threshold set -[ snowflake ] start-shape set -cfdg-window ; +: init ( -- ) + [ ] >background + { -40 80 -40 80 } >viewport + 0.1 >threshold + [ snowflake ] >start-shape ; + +: run ( -- ) [ init ] cfdg-window. ; MAIN: run diff --git a/extra/cfdg/models/spirales/spirales.factor b/extra/cfdg/models/spirales/spirales.factor index 60e4384fe0..985c21643e 100644 --- a/extra/cfdg/models/spirales/spirales.factor +++ b/extra/cfdg/models/spirales/spirales.factor @@ -29,12 +29,13 @@ DEFER: line ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: run ( -- ) +: init ( -- ) [ -1 b ] >background { -20 40 -20 40 } viewport set [ line ] >start-shape - 0.03 >threshold - cfdg-window ; + 0.03 >threshold ; + +: run ( -- ) [ init ] cfdg-window. ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!