Use readable font everywhere.

1 files changed, 15 insertions, 9 deletions

diff --git a/scenes/intro.scm b/scenes/intro.scm
index 285f0a3..0592eed 100644
--- a/scenes/intro.scm
+++ b/scenes/intro.scm
@@ -24,15 +24,15 @@
   #:use-module (engine node-2d)
   #:use-module (engine scene)
   #:use-module (engine shell)
+  #:use-module (config)
   #:use-module (scenes game)
   #:use-module (oop goops)
   #:export (<intro>))
 
 (define-class <intro> (<scene>))
 
-(define-asset intro-font
-  (load-tile-font "assets/fonts/bubblemad_8x8.png" 8 8
-                  " !\"©_%❤'()*+,-./0123456789:←<=>?@abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"))
+(define-asset game-font
+  (load-font "assets/fonts/good_neighbors_starling.xml"))
 
 (define texts
   '("\
@@ -63,17 +63,23 @@ to dry."))
 
 (define-method (populate (intro <intro>))
   (cons
-   (make <label>
-     #:name 'press-enter
-     #:font intro-font
-     #:text "Press enter to start."
-     #:position (vec2 72.0 50.0))
+   (let ((text "Press enter to start.")
+         (font game-font))
+     (make <label>
+       #:name 'press-enter
+       #:font font
+       #:text text
+       #:position
+       (let ((width (font-line-width (asset-ref font) text)))
+         (vec2 (- (/ %width 2)
+                  (/ width 2))
+               30.0))))
    (let* ((text (list-ref texts (random (length texts))))
           (parts (string-split text #\newline)))
      (map (lambda (part i)
             (make <label>
               #:name 'welcome
-              #:font intro-font
+              #:font game-font
               #:text part
               #:position (vec2 16.0 (- 150.0 (* 12 i)))))
           parts (iota (length parts))))))