(no commit message)

[gacela.git] / gacela.lisp

diff --git a/gacela.lisp b/gacela.lisp
index 45df43c9891388c4eb2a905a7474066d03c49eeb..5f52cb045cabdc692124eb42e8ee085a051ad0ad 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,34 +148,48 @@
 
 
 ;;; 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))
 
-(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)))
+
+(defmacro get-rdestructor (key)
+  `(resource-destructor (gethash ,key resources-table)))
 
 (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)))
-      (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 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
@@ -240,9 +246,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)