(no commit message)

[gacela.git] / gacela_ttf.lisp

diff --git a/gacela_ttf.lisp b/gacela_ttf.lisp
index 6fbe4e58c958bcffc2d9b692403455cc6760ae16..9d8c0c57b39457194f39c132c76e8f644d556d2a 100644 (file)
--- a/gacela_ttf.lisp
+++ b/gacela_ttf.lisp
@@ -16,19 +16,27 @@
 
 (in-package :gacela)
 
-(defun open-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)
-         (t
-          (let ((font (ftglCreateTextureFont font-file)))
-            (cond ((/= font 0)
-                   (ftglSetFontFaceSize font size 72)
-                   (ftglSetFontCharMap font encoding)
-                   (set-resource key
-                                 `(:id-font ,font)
-                                 (lambda () (ftglDestroyFont font))
-                                 :static static)
-                   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 render-text (text font)
-  (ftglRenderFont (getf font :id-font) text FTGL_RENDER_ALL))
+(defun true-load-font (font-file size encoding static)
+  (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 () (ftglDestroyFont font))
+                        :static static)
+          key))))
+
+(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)))