(no commit message)

diff --git a/gacela.lisp b/gacela.lisp
index b9b415a0b711121da8cb8dcea11faf2a75194669..de3a3f886a848fee75beb12de1266fa5758bb080 100644 (file)
--- 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 0b05c5d97a7379ce1e05b5339e00447a6ec15deb..105e0441fc8af08e24535493e3d92bc3f21d479a 100755 (executable)
--- 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))))