diff options
| -rw-r--r-- | examples/shmup/shmup.scm | 8 | ||||
| -rw-r--r-- | examples/tetra/tetra.scm | 12 | ||||
| -rw-r--r-- | guix.scm | 20 | ||||
| -rw-r--r-- | starling/asset.scm | 2 | ||||
| -rw-r--r-- | starling/kernel.scm | 6 | ||||
| -rw-r--r-- | starling/node-2d.scm | 20 | ||||
| -rw-r--r-- | starling/transition.scm | 2 |
7 files changed, 36 insertions, 34 deletions
diff --git a/examples/shmup/shmup.scm b/examples/shmup/shmup.scm index fa757e5..95f6292 100644 --- a/examples/shmup/shmup.scm +++ b/examples/shmup/shmup.scm @@ -3,10 +3,10 @@ (chickadee math matrix) (chickadee math rect) (chickadee math vector) - (chickadee render color) - (chickadee render shapes) - (chickadee render texture) - (chickadee render sprite) + (chickadee graphics color) + (chickadee graphics shapes) + (chickadee graphics texture) + (chickadee graphics sprite) (chickadee scripting) (ice-9 match) (oop goops) diff --git a/examples/tetra/tetra.scm b/examples/tetra/tetra.scm index 5bb2ac5..b02aeea 100644 --- a/examples/tetra/tetra.scm +++ b/examples/tetra/tetra.scm @@ -24,11 +24,11 @@ (chickadee math matrix) (chickadee math rect) (chickadee math vector) - (chickadee render color) - (chickadee render font) - (chickadee render particles) - (chickadee render texture) - (chickadee render sprite) + (chickadee graphics color) + (chickadee graphics font) + (chickadee graphics particles) + (chickadee graphics texture) + (chickadee graphics sprite) (chickadee scripting) (ice-9 match) (oop goops) @@ -63,7 +63,7 @@ (define-asset atlas (load-block-atlas "images/blocks.png")) (define-asset star (load-image "images/star.png")) -(define-asset click-font (load-font "fonts/click.xml")) +(define-asset click-font (load-bitmap-font "fonts/click.xml")) ;;; @@ -44,14 +44,15 @@ (gnu packages) (gnu packages audio) (gnu packages autotools) - (gnu packages pkg-config) - (gnu packages texinfo) - (gnu packages guile) + (gnu packages fontutils) (gnu packages gl) - (gnu packages sdl) - (gnu packages mp3) - (gnu packages maths) + (gnu packages guile) (gnu packages image) + (gnu packages maths) + (gnu packages mp3) + (gnu packages pkg-config) + (gnu packages sdl) + (gnu packages texinfo) (gnu packages xiph)) (define target-guile guile-3.0) @@ -127,7 +128,7 @@ SDL2 C shared library via the foreign function interface.") (license lgpl3+)))) (define chickadee - (let ((commit "c2f39ea3e873ad9663c28c4c870ba47cda32497e")) + (let ((commit "85c32e4c1302a3c37a1ebb4cf7b4888affdc4f61")) (package (name "chickadee") (version (string-append "0.5.0-1." (string-take commit 7))) @@ -138,7 +139,7 @@ SDL2 C shared library via the foreign function interface.") (commit commit))) (sha256 (base32 - "0ibii5g0b6ax2ijmv7n44ly8fbi8jrycjkzmvhqfbym250g4rrfp")))) + "1f9vjd18k7iixmz48z3l6zdc4apg489m9i6rpfljadp9wy3ws5py")))) (build-system gnu-build-system) (arguments '(#:make-flags '("GUILE_AUTO_COMPILE=0") @@ -153,7 +154,8 @@ SDL2 C shared library via the foreign function interface.") ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) (inputs - `(("guile" ,target-guile) + `(("freetype" ,freetype) + ("guile" ,target-guile) ("libvorbis" ,libvorbis) ("mpg123" ,mpg123) ("openal" ,openal))) diff --git a/starling/asset.scm b/starling/asset.scm index d898655..3a9b6bf 100644 --- a/starling/asset.scm +++ b/starling/asset.scm @@ -22,7 +22,7 @@ ;;; Code: (define-module (starling asset) - #:use-module (chickadee render texture) + #:use-module (chickadee graphics texture) #:use-module (ice-9 ftw) #:use-module (ice-9 match) #:use-module (oop goops) diff --git a/starling/kernel.scm b/starling/kernel.scm index 0a73bbd..c50cd98 100644 --- a/starling/kernel.scm +++ b/starling/kernel.scm @@ -25,9 +25,9 @@ (define-module (starling kernel) #:use-module (chickadee audio) #:use-module (chickadee game-loop) - #:use-module (chickadee render) - #:use-module (chickadee render gpu) - #:use-module (chickadee render viewport) + #:use-module (chickadee graphics) + #:use-module (chickadee graphics gpu) + #:use-module (chickadee graphics viewport) #:use-module (gl) #:use-module (ice-9 match) #:use-module (oop goops) diff --git a/starling/node-2d.scm b/starling/node-2d.scm index 6a33ed3..709eeec 100644 --- a/starling/node-2d.scm +++ b/starling/node-2d.scm @@ -26,16 +26,16 @@ #: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 particles) - #:use-module (chickadee render shapes) - #:use-module (chickadee render sprite) - #:use-module (chickadee render texture) - #:use-module (chickadee render tiled) - #:use-module (chickadee render viewport) + #:use-module (chickadee graphics) + #:use-module (chickadee graphics color) + #:use-module (chickadee graphics font) + #:use-module (chickadee graphics framebuffer) + #:use-module (chickadee graphics particles) + #:use-module (chickadee graphics shapes) + #:use-module (chickadee graphics sprite) + #:use-module (chickadee graphics texture) + #:use-module (chickadee graphics tiled) + #:use-module (chickadee graphics viewport) #:use-module (chickadee scripting) #:use-module (ice-9 match) #:use-module (oop goops) diff --git a/starling/transition.scm b/starling/transition.scm index e368176..7d28dce 100644 --- a/starling/transition.scm +++ b/starling/transition.scm @@ -22,7 +22,7 @@ (define-module (starling transition) #:use-module (chickadee math rect) - #:use-module ((chickadee render color) #:select (make-color)) + #:use-module ((chickadee graphics color) #:select (make-color)) #:use-module (chickadee scripting) #:use-module (ice-9 match) #:use-module (oop goops) |