(no commit message)

diff --git a/gacela.lisp b/gacela.lisp
index 45df43c9891388c4eb2a905a7474066d03c49eeb..8cd0da8271b25d7324862b454a0cd7054412be3f 100644 (file)
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -156,7 +156,7 @@
 
 
 ;;; Resources Manager
-(defstruct resource plist free-function time)
+(defstruct resource plist constructor destructor time)
 
 (defun make-resource-texture (&key filename min-filter mag-filter)
   `(:type texture :filename ,filename :min-filter ,min-filter :mag-filter ,mag-filter))
@@ -166,9 +166,11 @@
 
 (let ((resources-table (make-hash-table :test 'equal)))
 
-  (defun set-resource (key plist free-function &key static)
+  (defun set-resource (key plist constructor destructor &key static)
     (setf (gethash key resources-table)
          (make-resource :plist plist
+                        :constructor constructor
+                        :destructor destructor
                         :free-function free-function
                         :time (if static -1 (SDL_GetTicks)))))
 

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 79c3edbaf22e3785d16379588ef10003bb63316d..4c96b580808241293ca9850554bdf83885877f7a 100644 (file)
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -92,6 +92,7 @@
                      (SDL_FreeSurface image)
                      (set-resource key
                                    `(:id-texture ,texture :width ,real-w :height ,real-h)
+                                   (lambda () (load-texture filename :min-filter min-filter :mag-filter mag-filter :static static))
                                    (lambda () (glDeleteTextures 1 `(,texture)))
                                    :static static)
                      key)))))))))

diff --git a/gacela_ttf.lisp b/gacela_ttf.lisp
index 6fbe4e58c958bcffc2d9b692403455cc6760ae16..0077ad42aa4c372cb5056bf9e9132c387199e9d6 100644 (file)
--- a/gacela_ttf.lisp
+++ b/gacela_ttf.lisp
@@ -26,6 +26,7 @@
                    (ftglSetFontCharMap font encoding)
                    (set-resource key
                                  `(:id-font ,font)
+                                 (lambda () (open-font font-file :size size :encoding encoding :static static))
                                  (lambda () (ftglDestroyFont font))
                                  :static static)
                    key)))))))