(no commit message)

[gacela.git] / gacela.lisp

diff --git a/gacela.lisp b/gacela.lisp
index 45df43c9891388c4eb2a905a7474066d03c49eeb..eecc4893ee41e5196887514e79932e302bb571d8 100644 (file)
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -81,14 +81,6 @@
   (glHint GL_PERSPECTIVE_CORRECTION_HINT GL_NICEST)
   t)
 
-(defmacro progn-textures (&body code)
-  `(let (values)
-     (init-video-mode)
-     (glEnable GL_TEXTURE_2D)
-     (setq values (multiple-value-list (progn ,@code)))
-     (glDisable GL_TEXTURE_2D)
-     (apply #'values values)))
-
 (defun init-lighting ()
   (init-video-mode)
   (glEnable GL_LIGHTING))
@@ -156,7 +148,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,11 +158,12 @@
 
 (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
-                        :free-function free-function
-                        :time (if static -1 (SDL_GetTicks)))))
+                        :constructor constructor
+                        :destructor destructor
+                        :time (if static t (SDL_GetTicks)))))
 
   (defun get-resource (key)
     (let ((resource (gethash key resources-table)))
@@ -180,10 +173,12 @@
                      (setf (gethash key resources-table) resource)))
               (resource-plist resource)))))
 
+  (defun free-resource (key)
+    (funcall (resource-destructor (gethash key resources-table)))
+    (setf (resource-time (gethash key resources-table)) nil))
+
   (defun free-all-resources ()
-    (maphash (lambda (key res) (funcall (resource-free-function res) (resource-address res)))
-            resources-table)
-    (clrhash resources-table)))
+    (maphash (lambda (key res) (free-resource key)) resources-table)))
 
 
 ;;; Connection with the GUI