(no commit message)

[gacela.git] / gacela_ttf.lisp

diff --git a/gacela_ttf.lisp b/gacela_ttf.lisp
index 3cb84932e975b4303fcd72dbb52cd85e69897eff..f0e21a26babfcd9d8f3e7de6a034cae287f19c2e 100644 (file)
--- a/gacela_ttf.lisp
+++ b/gacela_ttf.lisp
@@ -16,23 +16,27 @@
 
 (in-package :gacela)
 
-(defun load-font (font-file &key (size 80) (encoding ft_encoding_unicode) static)
-  (let ((key (make-resource-font :filename font-file :size size :encoding encoding)))
-    (cond ((get-resource key) key)
+(defun load-font (font-file &key (size 40) (encoding ft_encoding_unicode) static)
+  (let* ((key (make-resource-font :filename font-file :encoding encoding))
+        (res (get-resource key)))
+    (cond (res (ftglSetFontFaceSize (getf res :id-font) size 72)
+              key)
          (t (true-load-font font-file size encoding static)))))
 
 (defun true-load-font (font-file size encoding static)
-  (let ((key (make-resource-font :filename font-file :size size :encoding encoding))
+  (let ((key (make-resource-font :filename font-file :encoding encoding))
        (font (ftglCreateTextureFont font-file)))
     (cond ((/= font 0)
           (ftglSetFontFaceSize font size 72)
           (ftglSetFontCharMap font encoding)
           (set-resource key
                         `(:id-font ,font)
-                        (lambda () (true-load-font font-file size encoding static))
+                        (lambda () (true-load-font font-file encoding static))
                         (lambda () (ftglDestroyFont font))
                         :static static)
           key))))
 
-(defun render-text (text font)
-  (ftglRenderFont (getf (get-resource font) :id-font) text FTGL_RENDER_ALL))
+(defun render-text (text font &key size)
+  (let ((id-font (getf (get-resource font) :id-font)))
+    (cond (size (ftglSetFontFaceSize id-font size 72)))
+    (ftglRenderFont id-font text FTGL_RENDER_ALL)))