X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela.lisp;h=b9b415a0b711121da8cb8dcea11faf2a75194669;hb=8b8cbb5b5b97e337dd6790aa7959a2dd68853e1b;hp=8cd0da8271b25d7324862b454a0cd7054412be3f;hpb=c31ef82b8f98c9011aa5a80777ad374566d743aa;p=gacela.git

diff --git a/gacela.lisp b/gacela.lisp
index 8cd0da8..b9b415a 100644
--- 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))
@@ -161,31 +153,55 @@
 (defun make-resource-texture (&key filename min-filter mag-filter)
   `(:type texture :filename ,filename :min-filter ,min-filter :mag-filter ,mag-filter))
 
-(defun make-resource-font (&key filename size encoding)
-  `(:type font :filename ,filename :size ,size :enconding ,encoding))
+(defun make-resource-font (&key filename encoding)
+  `(:type font :filename ,filename :enconding ,encoding))
+
+(defmacro get-rtime (key)
+  `(resource-time (gethash ,key resources-table)))
+
+(defmacro get-rplist (key)
+  `(resource-plist (gethash ,key resources-table)))
+
+(defmacro get-rconstructor (key)
+  `(resource-constructor (gethash ,key resources-table)))
 
-(let ((resources-table (make-hash-table :test 'equal)))
+(defmacro get-rdestructor (key)
+  `(resource-destructor (gethash ,key resources-table)))
+
+(let ((resources-table (make-hash-table :test 'equal))
+      (expiration-time 50000))
+
+  (defun set-expiration-time (new-time)
+    (setq expiration-time new-time))
 
   (defun set-resource (key plist constructor destructor &key static)
+    (expire-resources)
     (setf (gethash key resources-table)
 	  (make-resource :plist plist
 			 :constructor constructor
 			 :destructor destructor
-			 :free-function free-function
-			 :time (if static -1 (SDL_GetTicks)))))
+			 :time (if static t (SDL_GetTicks)))))
 
   (defun get-resource (key)
-    (let ((resource (gethash key resources-table)))
-      (cond ((null resource) nil)
-	    (t (cond ((/= (resource-time resource) -1)
-		      (setf (resource-time resource) (SDL_GetTicks))
-		      (setf (gethash key resources-table) resource)))
-	       (resource-plist resource)))))
+    (cond ((null (gethash key resources-table)) nil)
+	  (t (let ((time (get-rtime key)))
+	       (cond ((null time) (funcall (get-rconstructor key)))
+		     ((numberp time) (setf (get-rtime key) (SDL_GetTicks))))
+	       (get-rplist key)))))
+
+  (defun free-resource (key)
+    (funcall (get-rdestructor key))
+    (setf (get-rtime key) nil))
+
+  (defun expire-resource (key &optional (now (SDL_GetTicks)))
+    (let ((time (get-rtime key)))
+      (cond ((and (numberp time) (> (- now time) expiration-time)) (free-resource key)))))
+
+  (defun expire-resources ()
+    (maphash (lambda (key res) (expire-resource key)) resources-table))
 
   (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
@@ -242,9 +258,8 @@
 	 (setq running nil))))
 
 (defun quit-game ()
-;  (free-all-resources)
+  (free-all-resources)
 ;  (quit-audio)
-;  (quit-ttf)
   (quit-video-mode)
 ;  (quit-all-procs)
 ;  (clear-events)