diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/12-canvas-drawing-language.lisp | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/examples/12-canvas-drawing-language.lisp b/examples/12-canvas-drawing-language.lisp index f89a48a..8020550 100644 --- a/examples/12-canvas-drawing-language.lisp +++ b/examples/12-canvas-drawing-language.lisp @@ -9,33 +9,35 @@ (defclass canvas-lang-demo (ww:application) ()) (ww:defhandler quit - (ww::on-keydown (app scancode) + (ww:on-keydown (app scancode) (when (eql :scancode-q scancode) - (ww::stop)))) + (ww:stop)))) (ww:defhandler clear-and-draw - (ww::on-perframe (canvas time) - (ww::clear-canvas canvas :r 255 :g 255 :b 255) + (ww:on-perframe (canvas time) + (ww:clear-canvas canvas :r 255 :g 255 :b 255) (draw-stuff canvas) - (ww::blit canvas))) + (ww:blit canvas))) ;; draw a triangle, each side is a different color (defun triangle-at (x y) - (ww::move-to x y) - (ww::canvas-pen-color (list 0 200 200 255)) - (ww::stroke-rel 150 0) - (ww::canvas-pen-color (list 0 0 200 255)) - (ww::stroke-rel -50 100) - (ww::canvas-pen-color (list 0 200 0 255)) - (ww::stroke-rel -100 -100)) + (ww:with-current-pen + (ww:move-pen-to x y) + (ww:canvas-pen-color (list 0 200 200 255)) + (ww:stroke-rel 150 0) + (ww:canvas-pen-color (list 0 0 200 255)) + (ww:stroke-rel -50 100) + (ww:canvas-pen-color (list 0 200 0 255)) + (ww:stroke-rel -100 -100))) ;; draw a filled triangle using the current pen (defun filled-triangle-at (x y) - (ww::move-to x y) - (ww::fill-rel-path - '((100 100) - (100 -100)))) + (ww:with-current-pen + (ww:move-pen-to x y) + (ww:fill-rel-path + '((100 100) + (100 -100))))) ;; a pen function - gets more blue the closer x y is to 0 0 (defun lower-the-bluer (x y) @@ -53,7 +55,7 @@ ;; draws a "flower" like pinwheel using bezier curves (defun flower (&optional (petals 5)) - (ww::with-pen (:width 1) + (ww:with-pen (:width 1) (let ((r ; radius (sqrt (+ (* 25 25) (* 100 100)))) (psw ; petal semi-width @@ -69,21 +71,21 @@ (* r (cos (+ a psw)))) (list 0 0)) do - (ww::fill-rel-bezier ctls 12) + (ww:fill-rel-bezier ctls 12) ;; draw border of each petal - (ww::with-pen (:color (list 0 50 200 255)) - (ww::stroke-rel-bezier ctls 12)))))) + (ww:with-pen (:color (list 0 50 200 255)) + (ww:stroke-rel-bezier ctls 12)))))) (defun draw-stuff (canvas) - (ww::with-canvas canvas + (ww:with-canvas canvas ;; set canvas color. - (ww::canvas-pen-color #'plaid1) + (ww:canvas-pen-color #'plaid1) (filled-triangle-at 250 200) ;; temporarily use a different pen configuration - (ww::with-pen (:color #'lower-the-bluer :width 2) + (ww:with-pen (:color #'lower-the-bluer :width 2) ;; draw a flower stem - (ww::stroke-bezier + (ww:stroke-bezier '((0 0) (200 120) (50 350) (200 100) (300 400)) 12) ;; draw a flower @@ -111,7 +113,7 @@ (ww:add-handler canvas #'quit))) (defun start (&optional (side 500)) - (ww::start + (ww:start (make-instance 'canvas-lang-demo :fps 10 |