X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_ttf.lisp;h=9d8c0c57b39457194f39c132c76e8f644d556d2a;hb=377bf34ac61998549b24e339e3a3eea80734b6e3;hp=931f3c89ba2b688ecceab160975915916e042abf;hpb=18b7b395aeba9aabdd47c52a0ae6bcd7d0f78f00;p=gacela.git

diff --git a/gacela_ttf.lisp b/gacela_ttf.lisp
index 931f3c8..9d8c0c5 100644
--- a/gacela_ttf.lisp
+++ b/gacela_ttf.lisp
@@ -16,13 +16,15 @@
 
 (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)
@@ -34,5 +36,7 @@
 			 :static static)
 	   key))))
 
-(defun render-text (text font)
-  (ftglRenderFont (getf 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)))