From: jsancho <devnull@localhost>
Date: Wed, 4 Nov 2009 15:25:54 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=cb537bf64e0effe6e8b43cb98e23936d1434a9fb;p=gacela.git

---

diff --git a/gacela.lisp b/gacela.lisp
index b9b415a..de3a3f8 100644
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -246,14 +246,18 @@
      (init-video-mode)
      (SDL_WM_SetCaption ,title "")
      (init-frame-time)
+     (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)
+	 (refresh-running-mobs)
 	 (process-events)
 	 (setq running nil))))
 
@@ -261,7 +265,7 @@
   (free-all-resources)
 ;  (quit-audio)
   (quit-video-mode)
-;  (quit-all-procs)
+  (quit-all-mobs)
 ;  (clear-events)
 ;  (quit-events)
   (quit-sdl))
diff --git a/gacela_mobs.lisp b/gacela_mobs.lisp
index 0b05c5d..105e044 100755
--- a/gacela_mobs.lisp
+++ b/gacela_mobs.lisp
@@ -30,28 +30,15 @@
 			       (t (cons (list option `(apply ,body (cdr args))) (options (cddr m)))))))
 	       (options methods)))))
 
-(defmacro mob-structure (variables init logic render)
-  `(list
-    :init (lambda () ,init)
-    :logic (lambda () ,logic)
-    :render (lambda () ,render)
-    :context (lambda ()
-	       ,(if variables
-		    `(mapcar #'list
-			     ',(mapcar #'car+ variables)
-			     (multiple-value-list
-			      (values-list ,(cons 'list (mapcar #'car+ variables)))))
-		  nil))))
 
 (let (running-mobs mobs-to-add mobs-to-quit)
   (defun mob-on (mob)
     (push mob mobs-to-add))
 
-  (defun logic-mobs ()
-    (dolist (mob running-mobs) (funcall mob :logic)))
-
-  (defun render-mobs ()
-    (dolist (mob running-mobs) (funcall mob :render)))
+  (defun run-mobs (option &key args function)
+    (dolist (mob running-mobs)
+      (cond (function (funcall function)))
+      (apply mob (cons option args))))
 
   (defun mob-off (mob)
     (push mob mobs-to-quit))
@@ -64,3 +51,10 @@
 
   (defun quit-all-mobs ()
     (setq running-mobs nil mobs-to-add nil mobs-to-quit nil)))
+
+
+(defun logic-mobs ()
+  (run-mobs :logic))
+
+(defun render-mobs ()
+  (run-mobs :render :function (lambda () (glLoadIdentity))))