summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2018-12-16 20:37:24 -0500
committerDavid Thompson <dthompson2@worcester.edu>2018-12-16 20:37:24 -0500
commita9ed3d67870b5adcafb00d102513d54ce347f562 (patch)
tree3c976d0612302bd36d08d10046507257616006c6
parentdd22ccda714499f0dda9123a66403c81f37f060d (diff)
Update to the latest Chickadee commit.
-rw-r--r--guix.scm4
-rw-r--r--starling/kernel.scm14
-rw-r--r--starling/node-2d.scm2
3 files changed, 10 insertions, 10 deletions
diff --git a/guix.scm b/guix.scm
index b54af4b..f02e2eb 100644
--- a/guix.scm
+++ b/guix.scm
@@ -137,7 +137,7 @@ SDL2 C shared library via the foreign function interface.")
(license lgpl3+))))
(define chickadee
- (let ((commit "3a5f0b977dd6ef7581b200515275cc67d8378138"))
+ (let ((commit "0436ff21bca02e382a980ba7a436878eebebd4a3"))
(package
(name "chickadee")
(version "0.1")
@@ -148,7 +148,7 @@ SDL2 C shared library via the foreign function interface.")
(commit commit)))
(sha256
(base32
- "0f0l5ndla2j8b0dwygr79mh26brsshrdg9zfn9g1pbk4gxjghip0"))))
+ "160pkr1v9gqhqm6ly1a2p22mkqrshd603ql0zg0521pajs29rs87"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags '("GUILE_AUTO_COMPILE=0")
diff --git a/starling/kernel.scm b/starling/kernel.scm
index 49520b8..da82b8d 100644
--- a/starling/kernel.scm
+++ b/starling/kernel.scm
@@ -23,7 +23,7 @@
;;; Code:
(define-module (starling kernel)
- #:use-module (chickadee)
+ #:use-module (chickadee game-loop)
#:use-module (chickadee render)
#:use-module (chickadee render gpu)
#:use-module (chickadee render viewport)
@@ -279,12 +279,12 @@
(parameterize ((current-kernel kernel))
(push-scene scene)
(activate kernel)
- (run-game #:update (lambda (dt) (update* kernel dt))
- #:render (lambda (alpha) (render* kernel alpha))
- #:error (lambda (stack key args)
- (on-error kernel stack key args))
- #:time elapsed-time
- #:update-hz (update-hz kernel))))
+ (run-game* #:update (lambda (dt) (update* kernel dt))
+ #:render (lambda (alpha) (render* kernel alpha))
+ #:error (lambda (stack key args)
+ (on-error kernel stack key args))
+ #:time elapsed-time
+ #:update-hz (update-hz kernel))))
(lambda ()
(deactivate kernel)
(close-window! (window kernel))))))
diff --git a/starling/node-2d.scm b/starling/node-2d.scm
index 260f9b9..7ae9a30 100644
--- a/starling/node-2d.scm
+++ b/starling/node-2d.scm
@@ -480,7 +480,7 @@
;;;
(define-class <label> (<node-2d>)
- (font #:accessor font #:init-keyword #:font)
+ (font #:accessor font #:init-keyword #:font #:init-thunk default-font)
(text #:accessor text #:init-form "" #:init-keyword #:text))
(define-method (render (label <label>) alpha)