X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_mobs.lisp;h=264b3e5c228b38b5b92193950b6b3cff0fa8e56e;hb=d89eeb0212cedfe8480e080d32db0644dceb7985;hp=d6d420b7a301dc3a3326f403538c7c265957c21e;hpb=f30b38bc0af13e17b2745890e583c42041bee2e3;p=gacela.git

diff --git a/gacela_mobs.lisp b/gacela_mobs.lisp
index d6d420b..264b3e5 100755
--- a/gacela_mobs.lisp
+++ b/gacela_mobs.lisp
@@ -15,54 +15,47 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-;;; World of Mob
+;;; Mob Factory
 
-;(in-package :gacela)
+(in-package :gacela)
 
 (defmacro makemob (name &rest methods)
   `(defun ,name (&rest args &aux (option (car args)))
-     ,(cond (methods
-	     (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)))))))
-		     (cons 'case (cons 'option (options methods))))))))
+     ,(union
+       `(case option
+	      (: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 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)))
+      (secure-block nil (apply (symbol-function 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)
+	(secure-block nil (funcall (symbol-function mob) :init)))
+    (setq running-mobs (reverse (set-difference running-mobs mobs-to-quit)))
+    (setq mobs-to-quit nil))
 
-(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))))