X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_ttf.lisp;h=3cb84932e975b4303fcd72dbb52cd85e69897eff;hb=4fe9bd9e78b0e3cee1133da2abcb05bc98322b31;hp=89d9b6803873520b641c4d9748246f60c269def6;hpb=62879aade12d2cd6858f68a1bf5d224bc61b5f86;p=gacela.git

diff --git a/gacela_ttf.lisp b/gacela_ttf.lisp
index 89d9b68..3cb8493 100644
--- a/gacela_ttf.lisp
+++ b/gacela_ttf.lisp
@@ -16,12 +16,23 @@
 
 (in-package :gacela)
 
-(defun open-font (font-file &optional (size 80) (encoding ft_encoding_unicode))
-  (let ((font (ftglCreateTextureFont font-file)))
+(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)
+	  (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))
+	(font (ftglCreateTextureFont font-file)))
     (cond ((/= font 0)
 	   (ftglSetFontFaceSize font size 72)
 	   (ftglSetFontCharMap font encoding)
-	   font))))
+	   (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)
-  (ftglRenderFont font text FTGL_RENDER_ALL))
+  (ftglRenderFont (getf (get-resource font) :id-font) text FTGL_RENDER_ALL))