(no commit message)

[gacela.git] / src / gacela_mobs.scm

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index de76938d5f14d41e5f2c802897b286d7896105b1..e0e2edd8ba5f7c718b7b6807a6354a98f2faec9e 100755 (executable)
--- a/src/gacela_mobs.scm
+++ b/src/gacela_mobs.scm
@@ -17,49 +17,71 @@
 
 ;;; Mobs Factory
 
-(define add-mob-lambda #f)
-(define kill-mob-symbol #f)
+(define show-mob-hash #f)
+(define hide-mob-hash #f)
 (define get-active-mobs #f)
+(define clear-active-mobs #f)
 (define mobs-changed? #f)
 
-(let ((active-mobs '()) (changed #f))
-  (set! add-mob-lambda
-       (lambda (mob)
-         (pushnew mob active-mobs)
+(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! kill-mob-symbol
-       (lambda (mob)
-         (set! active-mobs (lset-difference eq? active-mobs (list mob)))
+  (set! hide-mob-hash
+       (lambda (key)
+         (hash-remove! key)
          (set! changed #t)))
 
   (set! get-active-mobs
        (lambda* (#:optional (refreshed #t))
          (set! changed (not refreshed))
-         active-mobs))
+         (hash-map->list (lambda (k v) v) active-mobs)))
+
+  (set! clear-active-mobs
+       (lambda ()
+         (set! changed #t)
+         (hash-clear! active-mobs)))
 
   (set! mobs-changed?
        (lambda () changed)))
 
 
-(define-macro (add-mob mob)
-  `(add-mob-lambda (lambda (option) (,mob option))))
+(define-macro (show-mob mob)
+  (cond ((list? mob)
+        `(let ((m ,mob))
+           (show-mob-hash (m 'get-mob-id) m)))
+       (else
+        `(show-mob-hash (,mob 'get-mob-id) (lambda () (,mob))))))
+
+(define-macro (hide-mob mob)
+  `(hide-mob-hash ',mob))
 
-(define-macro (kill-mob mob)
-  `(kill-mob-symbol ',mob))
+(define (run-mobs mobs)
+  (for-each
+   (lambda (m)
+     (glPushMatrix)
+     (m)
+     (glPopMatrix))
+   mobs))
 
-(define (process-mobs mobs)
-  (for-each (lambda (m) (m #:render)) mobs))
 
-(define-macro (define-mob mob-head . look)
+;;; Making mobs
+
+(define-macro (define-mob mob-head . body)
   (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)))))))))
+    `(define ,(string->symbol (string-concatenate (list "make-" (symbol->string name))))
+       (lambda ()
+        (lambda-mob ,attr ,@body)))))
+
+(define-macro (lambda-mob attr . body)
+  `(let ,(cons '(mob-id (gensym)) attr)
+     (lambda* (#:optional (option #f))
+       (case option
+        ((get-mob-id)
+         mob-id)
+        (else
+         (catch #t
+                (lambda () ,@body)
+                (lambda (key . args) #f)))))))