X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=gacela_mobs.lisp;h=3c6fec0831830540895f716f4e4907e343ae998e;hb=f10809a34db64030c3ae87bd78e7b8b634d5ae34;hp=ccbad071b0317ffd21bc1a840cb0cbccfec196c9;hpb=c15ca80ca1532efd4f7fbd11b837297037b841d9;p=gacela.git

diff --git a/gacela_mobs.lisp b/gacela_mobs.lisp
index ccbad07..3c6fec0 100755
--- a/gacela_mobs.lisp
+++ b/gacela_mobs.lisp
@@ -15,7 +15,7 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-;;; World of Mob
+;;; Mob Factory
 
 (in-package :gacela)
 
@@ -23,38 +23,38 @@
   `(defun ,name (&rest args &aux (option (car args)))
      ,(union
        `(case option
-	      (:on (mob-on #',name))
-	      (:off (mob-off #',name)))
+	      (:on (mob-on ',name))
+	      (:off (mob-off ',name)))
        (labels ((options (m &aux (option (car m)) (body (cadr m)))
 			 (cond ((null m) nil)
 			       (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))))
-
-(defun init-mob (mob)
-  (funcall (getf mob :init)))
-
-(defun logic-mob (mob)
-  (funcall (getf mob :logic)))
-
-(defun render-mob (mob)
-  (funcall (getf mob :render)))
 
 (let (running-mobs mobs-to-add mobs-to-quit)
   (defun mob-on (mob)
     (push mob mobs-to-add))
 
+  (defun run-mobs (option &key args function)
+    (dolist (mob running-mobs)
+      (cond (function (funcall function)))
+      (apply (symbol-function mob) (cons option args))))
+
   (defun mob-off (mob)
-    (push mob mobs-to-quit)))
+    (push mob mobs-to-quit))
+
+  (defun refresh-running-mobs ()
+    (do ((mob (pop mobs-to-add) (pop mobs-to-add))) ((null mob))
+	(push mob running-mobs)
+	(funcall (symbol-function mob) :init))
+    (setq running-mobs (reverse (set-difference running-mobs mobs-to-quit))))
+
+  (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))))