diff options
| -rw-r--r-- | examples/game-controller.scm | 42 | ||||
| -rw-r--r-- | examples/grid.scm | 13 | ||||
| -rw-r--r-- | examples/images/controller-buttons.png | bin | 22106 -> 21986 bytes |
3 files changed, 31 insertions, 24 deletions
diff --git a/examples/game-controller.scm b/examples/game-controller.scm index 252f368..77a0ac0 100644 --- a/examples/game-controller.scm +++ b/examples/game-controller.scm @@ -6,6 +6,7 @@ (chickadee render texture) (ice-9 match)) +(define batch #f) (define controller #f) (define atlas #f) (define button-icons @@ -36,23 +37,26 @@ (define (load) (set! no-controller-msg-pos (vec2 (center-text no-controller-msg) 240.0)) - (set! atlas (split-texture (load-image "images/controller-buttons.png") - 80 80))) + (let ((texture (load-image "images/controller-buttons.png"))) + (set! atlas (split-texture texture 80 80)) + (set! batch (make-sprite-batch texture)))) (define (controller-add new-controller) (set! controller (or controller new-controller)) (set! controller-name-pos (vec2 (center-text (controller-name controller)) 440.0))) - (define (draw alpha) (if controller - (with-batched-sprites - (draw-text (controller-name controller) controller-name-pos) - (for-each (match-lambda + (begin + (sprite-batch-clear! batch) + (draw-text (controller-name controller) controller-name-pos) + (for-each (match-lambda ((axis p tile) (let ((alpha (controller-axis controller axis))) - (draw-sprite (texture-atlas-ref atlas tile) p - #:tint (color 1.0 1.0 1.0 alpha))))) + (sprite-batch-add! + batch p + #:texture-region (texture-atlas-ref atlas tile) + #:tint (color 1.0 1.0 1.0 alpha))))) trigger-icons) (for-each (match-lambda (((and (or 'left-stick 'right-stick) button) @@ -67,19 +71,23 @@ (if (eq? button 'left-stick) 'left-y 'right-y)))) - (draw-sprite (texture-atlas-ref atlas released) - p) + (sprite-batch-add! batch p + #:texture-region (texture-atlas-ref atlas released)) (when (or pressed? (not (zero? x)) (not (zero? y))) - (draw-sprite (texture-atlas-ref atlas pressed) - (vec2+ p (vec2 (* x 16.0) (* y -16.0))))))) + (sprite-batch-add! + batch + (vec2+ p (vec2 (* x 16.0) (* y -16.0))) + #:texture-region (texture-atlas-ref atlas pressed))))) ((button p released pressed) (let ((pressed? (controller-button-pressed? controller button))) - (draw-sprite (texture-atlas-ref - atlas - (if pressed? pressed released)) - p)))) - button-icons)) + (sprite-batch-add! + batch p + #:texture-region + (texture-atlas-ref atlas + (if pressed? pressed released)))))) + button-icons) + (draw-sprite-batch batch)) (draw-text no-controller-msg no-controller-msg-pos))) (run-game #:load load #:draw draw #:controller-add controller-add) diff --git a/examples/grid.scm b/examples/grid.scm index f20f64d..e9fe2cc 100644 --- a/examples/grid.scm +++ b/examples/grid.scm @@ -67,13 +67,12 @@ (set-rect-y! %cell-rect (* y size)) (draw-filled-rect %cell-rect cell-color)) grid) - (with-batched-sprites - (for-each-cell (lambda (cell x y) - (set-vec2-x! %cell-count-pos (+ (* x size) (/ size 2))) - (set-vec2-y! %cell-count-pos (+ (* y size) (/ size 2))) - (draw-text (number->string* (cell-count cell)) - %cell-count-pos)) - grid))) + (for-each-cell (lambda (cell x y) + (set-vec2-x! %cell-count-pos (+ (* x size) (/ size 2))) + (set-vec2-y! %cell-count-pos (+ (* y size) (/ size 2))) + (draw-text (number->string* (cell-count cell)) + %cell-count-pos)) + grid)) (for-each-item (lambda (item rect) (if (eq? item 'player) (draw-filled-rect rect player-color) diff --git a/examples/images/controller-buttons.png b/examples/images/controller-buttons.png Binary files differindex 377b397..2a4a469 100644 --- a/examples/images/controller-buttons.png +++ b/examples/images/controller-buttons.png |
