X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela.lisp;h=d5d28525a2f56718f986c9704f302937858eee39;hb=4cb43f867b6a2fcf40ced44ac937d8930005d01e;hp=3f75376d1027ea30daabcee77c35d8fbaf9264bc;hpb=18b7b395aeba9aabdd47c52a0ae6bcd7d0f78f00;p=gacela.git

diff --git a/gacela.lisp b/gacela.lisp
index 3f75376..d5d2852 100644
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -15,7 +15,7 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(in-package :gacela)
+(in-package :gacela :nicknames '(gg))
 
 ;;; Default values for Gacela
 (defvar *width-screen* 640)
@@ -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,57 +153,73 @@
 (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))
+      (expiration-time 50000))
 
-(let ((resources-table (make-hash-table :test 'equal)))
+  (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 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
+;;; Connection with Gacela Skin
 (let (socket)
-  (defun connect-to-gui ()
-    (setq socket (si::socket 1984 :host "localhost")))
+  (defun start-skin-client (port)
+    (when (null socket) (setq socket (si::socket port :host "localhost"))))
 
-  (defun eval-from-gui ()
-    (cond ((and socket (listen socket)) (eval (read socket))))))
+  (defun eval-from-skin ()
+    (when (si::listen socket)
+      (secure-block socket (eval (read socket)))))
 
+  (defun stop-skin-client ()
+    (when socket
+      (si::close socket)
+      (setq socket nil))))
 
-;;; GaCeLa Functions
-(let (commands)
-  (defun prog-command (command)
-    (setq commands (cons command commands)))
-
-  (defun run-commands ()
-    (cond (commands
-	   (let (running)
-	     (setq running commands)
-	     (setq commands nil)
-	     (labels ((run-com (comlst)
-			       (cond (comlst (run-com (cdr comlst))
-					     (eval (read-from-string (concatenate 'string "(progn " (car comlst) ")")))))))
-		     (run-com running)))))))
 
+;;; GaCeLa Functions
 (let (time (time-per-frame (/ 1000.0 *frames-per-second*)))
   (defun set-frames-per-second (fps)
     (setq time-per-frame (/ 1000.0 fps)))
@@ -223,30 +231,43 @@
     (let ((frame-time (- (SDL_GetTicks) time)))
       (cond ((< frame-time time-per-frame)
 	     (SDL_Delay (- time-per-frame frame-time)))))))
-      
+
 
 (defmacro run-game (title &body code)
-  `(progn
+  `(let ((game-function (lambda () ,@code)))
      (init-video-mode)
      (SDL_WM_SetCaption ,title "")
-     (init-frame-time)
-     (process-events)
-     (do () ((quit?))
-	 (glClear (+ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT))
-	 (glLoadIdentity)
-	 ,@code
-	 (SDL_GL_SwapBuffers)
-	 (delay-frame)
-	 (init-frame-time)
-	 (process-events)
-	 (setq running nil))))
+     (set-game-code game-function)
+     (cond ((not (game-running?))
+	    (init-frame-time)
+	    (process-events)
+	    (game-loop)))))
+
+(let (running game-code)
+  (defun game-loop ()
+    (setq running t)
+    (do () ((quit?))
+	(glClear (+ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT))
+	(glLoadIdentity)
+	(when (functionp game-code) (funcall game-code))
+	(SDL_GL_SwapBuffers)
+	(delay-frame)
+	(init-frame-time)
+	(eval-from-skin)
+	(process-events))
+    (setq running nil))
+
+  (defun game-running? ()
+    running)
+
+  (defun set-game-code (game-function)
+    (setq game-code game-function)))
 
 (defun quit-game ()
-;  (free-all-resources)
+  (free-all-resources)
 ;  (quit-audio)
-;  (quit-ttf)
   (quit-video-mode)
-;  (quit-all-procs)
+  (quit-all-mobs)
 ;  (clear-events)
 ;  (quit-events)
   (quit-sdl))