X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_mobs.lisp;h=105e0441fc8af08e24535493e3d92bc3f21d479a;hb=cb537bf64e0effe6e8b43cb98e23936d1434a9fb;hp=8ea8c5e3fc98d0cbf7e559c786df5353fc328dc1;hpb=69b45b9d2d36662c3e1c70bebd2c776958a70515;p=gacela.git

diff --git a/gacela_mobs.lisp b/gacela_mobs.lisp
index 8ea8c5e..105e044 100755
--- a/gacela_mobs.lisp
+++ b/gacela_mobs.lisp
@@ -17,7 +17,7 @@
 
 ;;; World of Mob
 
-;(in-package :gacela)
+(in-package :gacela)
 
 (defmacro makemob (name &rest methods)
   `(defun ,name (&rest args &aux (option (car args)))
@@ -30,42 +30,31 @@
 			       (t (cons (list option `(apply ,body (cdr args))) (options (cddr m)))))))
 	       (options methods)))))
 
-(defmacro defmob (name variables &key init logic render)
-  `(let ((make-name ',(intern (concatenate 'string "MAKE-" (string name)))))
-     (setf (symbol-function make-name)
-	   (makemob ,variables :init ,init :logic ,logic :render ,render))
-     make-name))
 
-;(defmacro makemob (variables &key init logic render)
-;  `(lambda
-;     ,(if (null variables) () (cons '&key variables))
-;     (mob-structure ,variables ,init ,logic ,render)))
+(let (running-mobs mobs-to-add mobs-to-quit)
+  (defun mob-on (mob)
+    (push mob mobs-to-add))
 
-(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 run-mobs (option &key args function)
+    (dolist (mob running-mobs)
+      (cond (function (funcall function)))
+      (apply mob (cons option args))))
 
-(defun init-mob (mob)
-  (funcall (getf mob :init)))
+  (defun mob-off (mob)
+    (push mob mobs-to-quit))
 
-(defun logic-mob (mob)
-  (funcall (getf mob :logic)))
+  (defun refresh-running-mobs ()
+    (do ((mob (pop mobs-to-add) (pop mobs-to-add))) ((null mob))
+	(push mob running-mobs)
+	(funcall mob :init))
+    (setq running-mobs (reverse (set-difference running-mobs mobs-to-quit :test #'equal))))
 
-(defun render-mob (mob)
-  (funcall (getf mob :render)))
+  (defun quit-all-mobs ()
+    (setq running-mobs nil mobs-to-add nil mobs-to-quit nil)))
 
-(let (running-mobs mobs-to-add mobs-to-quit)
-  (defun mob-on (mob)
-    (push mob mobs-to-add))
 
-  (defun mob-off (mob)
-    (push mob mobs-to-quit)))
+(defun logic-mobs ()
+  (run-mobs :logic))
+
+(defun render-mobs ()
+  (run-mobs :render :function (lambda () (glLoadIdentity))))