(no commit message)

[gacela.git] / src / gacela_mobs.scm

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index 8120e0369b649f089e7508dcdb83a5e3adbd2f5f..dabb9dc2a40102aa5202fb171f510c52bfc1e3e6 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))
@@ -30,7 +31,7 @@
 
   (set! hide-mob-hash
        (lambda (key)
-         (hash-remove! key)
+         (hash-remove! active-mobs key)
          (set! changed #t)))
 
   (set! get-active-mobs
@@ -38,56 +39,57 @@
          (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))
-
-(define (process-mobs mobs)
-  (for-each (lambda (m) (m #:render)) mobs))
-
-(define-macro (lambda-look . look)
-  (define (process-look look)
-    (cond ((null? look) (values '() '()))
-         (else
-          (let ((line (car look)))
-            (receive (lines images) (process-look (cdr look))
-                     (cond ((string? line)
-                            (let ((var (gensym)))
-                              (values (cons `(draw-texture ,var) lines)
-                                      (cons `(,var (load-texture ,line)) images))))
-                           (else
-                            (values (cons line lines)
-                                    images))))))))
-
-  (receive (look-lines look-images) (process-look look)
-          `(let ,look-images
-               (lambda ()
-                 (glPushMatrix)
-                 ,@look-lines
-                 (glPopMatrix)))))
-
-(define-macro (define-mob mob-head . look)
+  (cond ((list? mob)
+        `(let ((m ,mob))
+           (hide-mob-hash (m 'get-mob-id))))
+       (else
+        `(hide-mob-hash (,mob 'get-mob-id)))))
+
+(define (run-mobs mobs)
+  (for-each
+   (lambda (m)
+     (glPushMatrix)
+     (m)
+     (glPopMatrix))
+   mobs))
+
+
+;;; 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)
-  `(let ((mob #f))
-     (set! mob
-          (let ((attr ',attr) (actions '()) (renders '()))
-            (lambda (option . params)
-              (case option
-                ((get-attr)
-                 attr)
-                ((set-attr)
-                 (if (not (null? params)) (set! attr (car params))))))))
-     (cond ((not (null? ',look))
-           (display ',look)
-           (newline)))
-     mob))
+    `(define ,(string->symbol (string-concatenate (list "make-" (symbol->string name))))
+       (lambda* ,(if (null? attr) '() `(#:key ,@attr))
+        (lambda-mob () ,@body)))))
+
+(define-macro (lambda-mob attr . body)
+  (let ((mob-id-symbol (gensym))
+       (type-mob
+    `(let ,(cons `(,mob-id-symbol (gensym)) attr)
+       (lambda* (#:optional (option #f))
+        (define (kill-me)
+          (hide-mob-hash ,mob-id-symbol))
+        (case option
+          ((get-mob-id)
+           ,mob-id-symbol)
+          (else
+           (catch #t
+                  (lambda () ,@body)
+                  (lambda (key . args) #f))))))))