(no commit message)

[gacela.git] / src / gacela_mobs.scm

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index 6081cb4af4cbd6ca683693bcaa8205dd11683696..497e827a3fd95287602e54048f953e1cf5e53d9f 100755 (executable)
--- a/src/gacela_mobs.scm
+++ b/src/gacela_mobs.scm
@@ -15,65 +15,44 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(use-modules (srfi srfi-1))
+;;; Mobs Factory
 
-;;; Mob Factory
+(define add-mob #f)
+(define kill-mob #f)
+(define get-active-mobs #f)
+(define reload-mobs? #f)
 
-(define-macro (makemob name . methods)
-  `(define* (,name . args)
-     (let ((option (car args)))
-       ,(union
-        `(case option
-           (:on (mob-on ',name))
-           (:off (mob-off ',name)))
-        (define (options m)
-          (let ((option (car m)) (body (cadr m)))
-            (cond ((null? m) '())
-                  (else (cons (list option `(apply ,body (cdr args))) (options (cddr m)))))))
-        (options methods)))))
-
-
-(define mob-on #f)
-(define run-mobs #f)
-(define mob-off #f)
-(define refresh-running-mobs #f)
-(define quit-all-mobs #f)
-
-(let ((running-mobs '()) (mobs-to-add '()) (mobs-to-quit '()))
-  (set! mob-on
+(let ((active-mobs '(m1 m2)) (reload #f))
+  (set! add-mob
        (lambda (mob)
-         (push mob mobs-to-add)))
+         (pushnew (procedure-name mob) active-mobs)
+         (set! reload #t)))
 
-  (set! run-mobs
-       (lambda* (option #:key args function)
-         (define (run-mobs-rec mobs)
-           (cond ((null? mobs) #f)
-                 (else
-                  (cond (function (function)))
-                  (secure-block #f (apply (car mobs) (cons option args)))
-                  (or #t (run-mobs-rec (cdr mobs))))))))
-
-  (set! mob-off
+  (set! kill-mob
        (lambda (mob)
-         (push mob mobs-to-quit)))
-
-  (set! refresh-running-mobs
-       (lambda ()
-         (do ((mob (pop mobs-to-add) (pop mobs-to-add))) ((null? mob))
-           (push mob running-mobs)
-           (secure-block nil (mob #:init)))
-         (set! running-mobs (reverse (lset-difference eq? running-mobs mobs-to-quit)))
-         (set! mobs-to-quit '())))
-
-  (set! quit-all-mobs
-       (lambda ()
-         (set! running-mobs '())
-         (set! mobs-to-add '())
-         (set! mobs-to-quit '()))))
-
-
-(define (logic-mobs)
-  (run-mobs #:logic))
-
-(define (render-mobs)
-  (run-mobs #:render #:function (lambda () (glLoadIdentity))))
+         (set! active-mobs (lset-difference eq? active-mobs (list (procedure-name mob))))
+         (set! reload #t)))
+
+  (set! get-active-mobs
+       (lambda () active-mobs))
+
+  (set! reload-mobs?
+       (lambda () reload)))
+
+
+(define-macro (get-mobs-function)
+  (let ((mobs (get-active-mobs)))
+    `(lambda () ,@(map (lambda (mob) `(,mob)) mobs))))
+
+(define-macro (define-mob mob-head . look)
+  (let ((name (car mob-head)) (attr (cdr mob-head)))
+    `(begin
+       (define ,name #f)
+       (let ((attr ,attr))
+        (set! ,name
+              (lambda (option)
+                (case option
+                  ((#:render)
+                   (glPushMatrix)
+                   ,@(map (lambda (x) (if (string? x) `(draw-image ,x) x)) look)
+                   (glPopMatrix)))))))))