(no commit message)

[gacela.git] / gacela_ttf.lisp

diff --git a/gacela_ttf.lisp b/gacela_ttf.lisp
index 89d9b6803873520b641c4d9748246f60c269def6..1d9aec72239cea4d9cd28e26deeae48fd8a9cb91 100644 (file)
--- a/gacela_ttf.lisp
+++ b/gacela_ttf.lisp
@@ -14,14 +14,33 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-(in-package :gacela)
 
-(defun open-font (font-file &optional (size 80) (encoding ft_encoding_unicode))
-  (let ((font (ftglCreateTextureFont font-file)))
+(eval-when (compile load eval)
+          (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+          (in-package 'gacela :nicknames '(gg) :use '(lisp)))
+
+
+(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 :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))
+(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)))