(no commit message)

[gacela.git] / src / gacela_mobs.scm

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index d273556d51de2247e9259141cc38a1c947a50ac0..ede4235cb653b04fc96f7a1489b21a7e5eff6554 100755 (executable)
--- a/src/gacela_mobs.scm
+++ b/src/gacela_mobs.scm
@@ -17,36 +17,47 @@
 
 ;;; Mobs Factory
 
-(define-macro (hash-add-mob hash-table mob)
-  `(hash-set! ,hash-table (procedure-name ,mob) (lambda () (,mob))))
-
-(define-macro (hash-remove-mob hash-table mob)
-  `(hash-remove! ,hash-table (procedure-name ,mob)))
-
-
-(define add-mob #f)
-(define kill-mob #f)
-(define get-mob-world #f)
-(define mobs #f)
-(define vreload #f)
-
-(let ((active-mobs (make-hash-table)) (reload #f))
-  (set! add-mob
-       (lambda (mob)
-         (hash-add-mob active-mobs mob)
-         (set! reload #t)))
-
-  (set! kill-mob
-       (lambda (mob)
-         (hash-remove-mob active-mobs mob)
-         (set! reload #t)))
-
-  (set! get-mob-world
-       (lambda ()
-         (cond (reload
-                (set! reload #f)
-                (hash-map->list (lambda (k v) v) active-mobs))
-               (else #f))))
-
-  (set! mobs (lambda () active-mobs))
-  (set! vreload (lambda () reload)))
+(define show-mob-hash #f)
+(define hide-mob-hash #f)
+(define get-active-mobs #f)
+(define mobs-changed? #f)
+
+(let ((active-mobs (make-hash-table)) (changed #f))
+  (set! show-mob-hash
+       (lambda (key mob)
+         (hash-set! active-mobs key mob)
+         (set! changed #t)))
+
+  (set! hide-mob-hash
+       (lambda (key)
+         (hash-remove! key)
+         (set! changed #t)))
+
+  (set! get-active-mobs
+       (lambda* (#:optional (refreshed #t))
+         (set! changed (not refreshed))
+         (hash-map->list (lambda (k v) v) active-mobs)))
+
+  (set! mobs-changed?
+       (lambda () changed)))
+
+
+(define-macro (show-mob mob)
+  `(show-mob-hash ',mob (lambda (option) (,mob option))))
+
+(define-macro (hide-mob mob)
+  `(hide-mob-hash ',mob))
+
+(define (process-mobs mobs)
+  (for-each (lambda (m) (m #:render)) mobs))
+
+(define-macro (define-mob mob-head . look)
+  (let ((name (car mob-head)) (attr (cdr mob-head)))
+    `(define ,name
+       (let ((attr ',attr))
+        (lambda (option)
+          (case option
+            ((#:render)
+             (glPushMatrix)
+             ,@(map (lambda (x) (if (string? x) `(draw-image ,x) x)) look)
+             (glPopMatrix))))))))