diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2021-02-25 23:57:06 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2021-02-25 23:57:06 +0100 |
| commit | 7bd387d35baea9f6861c81f4286f68999849ea63 (patch) | |
| tree | b5f6d9123753c0cfb546bc1a0baee15eb1ecc198 /engine | |
| parent | 9ecdd2b37166625e99a76844f7ff0b27c2ff3022 (diff) | |
Move from (chickadee render ...) to (chickadee graphics ...).
The only notable changes are listed below:
* engine/node-2d.scm (draw)<filled-rect>: Use new API from (chickadee
graphics path).
* scenes/game.scm (draw)<stats>: Same.
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/node-2d.scm | 28 | ||||
| -rw-r--r-- | engine/shell.scm | 8 |
2 files changed, 24 insertions, 12 deletions
diff --git a/engine/node-2d.scm b/engine/node-2d.scm index 3de1597..d5919aa 100644 --- a/engine/node-2d.scm +++ b/engine/node-2d.scm @@ -1,5 +1,6 @@ ;;; Lisp Game Jam 2018 ;;; Copyright © 2018 David Thompson <davet@gnu.org> +;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This program is free software: you can redistribute it and/or ;;; modify it under the terms of the GNU General Public License as @@ -20,13 +21,13 @@ #:use-module (chickadee math matrix) #:use-module (chickadee math rect) #:use-module (chickadee math vector) - #:use-module (chickadee render) - #:use-module (chickadee render color) - #:use-module (chickadee render font) - #:use-module (chickadee render framebuffer) - #:use-module (chickadee render shapes) - #:use-module (chickadee render sprite) - #:use-module (chickadee render texture) + #:use-module (chickadee graphics) + #:use-module (chickadee graphics color) + #:use-module (chickadee graphics font) + #:use-module (chickadee graphics framebuffer) + #:use-module (chickadee graphics path) + #:use-module (chickadee graphics sprite) + #:use-module (chickadee graphics texture) #:use-module (chickadee scripting) #:use-module (ice-9 match) #:use-module (engine assets) @@ -346,7 +347,18 @@ (color #:accessor color #:init-form black #:init-keyword #:color)) (define-method (draw (r <filled-rect>) alpha) - (draw-filled-rect (region r) (color r) #:matrix (world-matrix r))) + (draw-canvas (make-canvas + (with-style + ((fill-color (color r))) + (fill + (rectangle (vec2 (rect-left (region r)) + (rect-bottom (region r))) + (rect-width (region r)) + (rect-height (region r))))) + ;; TODO: wrong type + ;#:matrix + ;(world-matrix r) + ))) ;;; diff --git a/engine/shell.scm b/engine/shell.scm index 3182483..14ae081 100644 --- a/engine/shell.scm +++ b/engine/shell.scm @@ -1,6 +1,6 @@ ;;; Lisp Game Jam 2018 +;;; Copyright © 2018, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 David Thompson <davet@gnu.org> -;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This program is free software: you can redistribute it and/or ;;; modify it under the terms of the GNU General Public License as @@ -21,9 +21,9 @@ #:use-module (chickadee math matrix) #:use-module (chickadee math rect) #:use-module (chickadee math vector) - #:use-module (chickadee render) - #:use-module (chickadee render framebuffer) - #:use-module (chickadee render sprite) + #:use-module (chickadee graphics) + #:use-module (chickadee graphics framebuffer) + #:use-module (chickadee graphics sprite) #:use-module (chickadee scripting) #:use-module (ice-9 format) #:use-module (ice-9 match) |