(no commit message)

[gacela.git] / src / gacela_mobs.scm

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index 6b9d6997f42e402576435c6aaaf5f494d6639aa6..ca4d5d37c08d00fb7825fd9ecf9c6559c530eea1 100755 (executable)
--- a/src/gacela_mobs.scm
+++ b/src/gacela_mobs.scm
@@ -20,6 +20,7 @@
 (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 (make-hash-table)) (changed #f))
@@ -38,43 +39,56 @@
          (set! changed (not refreshed))
          (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 (show-mob mob)
-  `(show-mob-hash ',mob (lambda (option) (,mob option))))
+  (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))
+  (cond ((list? mob)
+        `(let ((m ,mob))
+           (hide-mob-hash (m 'get-mob-id) m)))
+       (else
+        `(hide-mob-hash (,mob 'get-mob-id) (lambda () (,mob))))))
+
+(define-macro (kill-me)
+  `(hide-mob-hash mob-id))
+
+(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)))
-    `(define ,name
-       (lambda-mob ,attr ,@look))))
-
-(define-macro (lambda-mob attr . look)
-  (define (process-look look)
-    (cond ((null? look) (values '() '()))
-         (else
-          (let ((line (car look)))
-            (receive (lines images) (process-look (cdr look))
-                     (cond ((string? line)
-                            (cons `(draw-texture ,line) lines)
-                            (cons line images))
-                           (else
-                            (cons line lines)))
-                     (values lines images))))))
-
-  (receive (look-lines look-images) (process-look look)
-          `(let ((attr ',attr))
-             (lambda (option)
-               (case option
-                 ((#:render)
-                  (glPushMatrix)
-                  ,@look-lines
-;          ,@(map (lambda (x) (if (string? x) `(draw-texture ,x) x)) look)
-                  (glPopMatrix)))))))
+    `(define ,(string->symbol (string-concatenate (list "make-" (symbol->string name))))
+       (lambda* (#:key ,@attr)
+        (lambda-mob () ,@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)))))))