X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela.lisp;h=fb8438b9c9ff674edb540cbbbd7fd0a7cf47ae7e;hb=377bf34ac61998549b24e339e3a3eea80734b6e3;hp=5f52cb045cabdc692124eb42e8ee085a051ad0ad;hpb=95beeaac7a0e035769abb62ad6ce049e0ea7ef82;p=gacela.git

diff --git a/gacela.lisp b/gacela.lisp
index 5f52cb0..fb8438b 100644
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -168,9 +168,14 @@
 (defmacro get-rdestructor (key)
   `(resource-destructor (gethash ,key resources-table)))
 
-(let ((resources-table (make-hash-table :test 'equal)))
+(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
@@ -188,17 +193,27 @@
     (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) (free-resource key)) resources-table)))
 
 
-;;; Connection with the GUI
-(let (socket)
-  (defun connect-to-gui ()
-    (setq socket (si::socket 1984 :host "localhost")))
+;;; Gacela Server for development mode
+(let (socket clients)
+  (defun start-server (port)
+    (when (null socket) (setq socket (si::socket port :server #'eval-from-clients))))
+
+  (defun check-server-connections ()
+    (when (and socket (si::listen socket)) (push (si:accept socket) clients)))
 
-  (defun eval-from-gui ()
-    (cond ((and socket (listen socket)) (eval (read socket))))))
+  (defun eval-from-clients ()
+    (dolist (cli clients) (when (si::listen cli) (eval (read cli))))))
 
 
 ;;; GaCeLa Functions
@@ -234,14 +249,22 @@
      (init-video-mode)
      (SDL_WM_SetCaption ,title "")
      (init-frame-time)
+     (check-server-connections)
+     (eval-from-clients)
+     (refresh-running-mobs)
      (process-events)
      (do () ((quit?))
 	 (glClear (+ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT))
+	 (logic-mobs)
+	 (render-mobs)
 	 (glLoadIdentity)
 	 ,@code
 	 (SDL_GL_SwapBuffers)
 	 (delay-frame)
 	 (init-frame-time)
+	 (check-server-connections)
+	 (eval-from-clients)
+	 (refresh-running-mobs)
 	 (process-events)
 	 (setq running nil))))
 
@@ -249,7 +272,7 @@
   (free-all-resources)
 ;  (quit-audio)
   (quit-video-mode)
-;  (quit-all-procs)
+  (quit-all-mobs)
 ;  (clear-events)
 ;  (quit-events)
   (quit-sdl))