diff options
| author | David Thompson <dthompson2@worcester.edu> | 2015-03-09 08:52:14 -0400 |
|---|---|---|
| committer | David Thompson <dthompson2@worcester.edu> | 2015-03-09 08:58:42 -0400 |
| commit | d84bb24d2359be9c4be7b3e4f05caf3daf68f243 (patch) | |
| tree | d57b082948ef75bdd0f9cc5d1c15a8d70d784d26 /examples/font.scm | |
| parent | 8ac70ff3cef2963c460ce5382e37946eb0a4914e (diff) | |
render: Merge <group> into <model>.
* sly/render/model.scm (<model>): Add 'transform' and 'children' fields.
(model-transform, model-children): New accessors.
(make-model): Add 'transform' and 'children' keyword arguments.
(set-transform-identity!): New procedure.
(draw-model): Recursively draw model and all children.
(model-paint, model-blend): Renamed.
(paint, blend, group, group*, move, place): New procedures.
* sly/render/group.scm: Delete.
* Makefile.am (SOURCES): Remove it.
* examples/2048/2048.scm: Update example.
* examples/animation.scm: Likewise.
* examples/font.scm: Likewise.
* examples/joystick.scm: Likewise.
* examples/mines/mines.scm: Likewise.
* examples/simple.scm: Likewise.
* examples/tilemap.scm: Likewise.
* README.org (Example): Update sample code.
Diffstat (limited to 'examples/font.scm')
| -rw-r--r-- | examples/font.scm | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/examples/font.scm b/examples/font.scm index 177879e..b3fcfc3 100644 --- a/examples/font.scm +++ b/examples/font.scm @@ -24,7 +24,7 @@ (sly render color) (sly render font) (sly render model) - (sly render group) + (sly render model) (sly input mouse)) (load "common.scm") @@ -34,21 +34,20 @@ (define font (load-default-font 18)) (define-signal message-label - (group-move (vector2 320 240) - (group - (label font "The quick brown fox jumped over the lazy dog." - #:anchor 'center)))) + (move (vector2 320 240) + (label font "The quick brown fox jumped over the lazy dog." + #:anchor 'center))) (define-signal fps-label (signal-map (lambda (fps) (let ((text (format #f "FPS: ~d" fps))) - (group-move (vector2 0 480) (group (label font text))))) + (move (vector2 0 480) (label font text)))) fps)) (define-signal mouse-label (signal-map (lambda (p) (let ((text (format #f "Mouse: (~d, ~d)" (vx p) (vy p)))) - (group-move (vector2 0 460) (group (label font text))))) + (move (vector2 0 460) (label font text)))) (signal-throttle 5 mouse-position))) (define-signal scene @@ -56,7 +55,7 @@ (define camera (orthographic-camera 640 480)) -(add-hook! draw-hook (lambda _ (draw-group (signal-ref scene) camera))) +(add-hook! draw-hook (lambda _ (draw-model (signal-ref scene) camera))) (with-window (make-window #:title "Fonts") (start-game-loop)) |