diff --git a/extra/cfdg/models/spirales/spirales.factor b/extra/cfdg/models/spirales/spirales.factor index 985c21643e..f804b6ba83 100644 --- a/extra/cfdg/models/spirales/spirales.factor +++ b/extra/cfdg/models/spirales/spirales.factor @@ -7,33 +7,19 @@ DEFER: line ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: block ( -- ) - [ - [ circle ] do - [ 0.3 s 60 flip line ] do - ] - recursive ; +: block ( -- ) { [ circle ] [ 0.3 s 60 flip line ] } rule ; -: a1 ( -- ) - [ - [ 0.95 s 2 x 12 r 0.5 b 10 hue 1.5 sat a1 ] do - [ block ] do - ] - recursive ; +: a1 ( -- ) { [ 0.95 s 2 x 12 r 0.5 b 10 hue 1.5 sat a1 ] [ block ] } rule ; -: line ( -- ) - -0.3 a - [ 0 rotate a1 ] do - [ 120 rotate a1 ] do - [ 240 rotate a1 ] do ; +: line ( -- ) -0.3 a { [ 0 r a1 ] [ 120 r a1 ] [ 240 r a1 ] } rule ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! : init ( -- ) - [ -1 b ] >background - { -20 40 -20 40 } viewport set - [ line ] >start-shape - 0.03 >threshold ; + [ -1 b ] >background + { -20 40 -20 40 } >viewport + [ line ] >start-shape + 0.04 >threshold ; : run ( -- ) [ init ] cfdg-window. ;