Run resize operations in game loop.

[gacela.git] / src / gacela_mobs.scm

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index dabb9dc2a40102aa5202fb171f510c52bfc1e3e6..a0d2bf7cda4def0b7dbd78b7c4e31c258a64b5c7 100755 (executable)
--- a/src/gacela_mobs.scm
+++ b/src/gacela_mobs.scm
@@ -19,30 +19,38 @@
 
 (define show-mob-hash #f)
 (define hide-mob-hash #f)
+(define refresh-active-mobs #f)
 (define get-active-mobs #f)
-(define clear-active-mobs #f)
+(define hide-all-mobs #f)
 (define mobs-changed? #f)
 
-(let ((active-mobs (make-hash-table)) (changed #f))
+(let ((mobs-table (make-hash-table))
+      (active-mobs '())
+      (changed #f))
+
   (set! show-mob-hash
-       (lambda (key mob)
-         (hash-set! active-mobs key mob)
+       (lambda (mob)
+         (hash-set! mobs-table (mob 'get-mob-id) mob)
          (set! changed #t)))
 
   (set! hide-mob-hash
-       (lambda (key)
-         (hash-remove! active-mobs key)
+       (lambda (mob-id)
+         (hash-remove! mobs-table mob-id)
          (set! changed #t)))
 
+  (set! refresh-active-mobs
+       (lambda ()
+         (cond (changed
+                (set! changed #f)
+                (set! active-mobs (hash-map->list (lambda (k v) v) mobs-table))))))
+
   (set! get-active-mobs
-       (lambda* (#:optional (refreshed #t))
-         (set! changed (not refreshed))
-         (hash-map->list (lambda (k v) v) active-mobs)))
+       (lambda () active-mobs))
 
-  (set! clear-active-mobs
+  (set! hide-all-mobs
        (lambda ()
          (set! changed #t)
-         (hash-clear! active-mobs)))
+         (hash-clear! mobs-table)))
 
   (set! mobs-changed?
        (lambda () changed)))
@@ -51,9 +59,9 @@
 (define-macro (show-mob mob)
   (cond ((list? mob)
         `(let ((m ,mob))
-           (show-mob-hash (m 'get-mob-id) m)))
+           (show-mob-hash m)))
        (else
-        `(show-mob-hash (,mob 'get-mob-id) (lambda () (,mob))))))
+        `(show-mob-hash (lambda* (#:optional (option #f)) (,mob option))))))
 
 (define-macro (hide-mob mob)
   (cond ((list? mob)
@@ -62,7 +70,7 @@
        (else
         `(hide-mob-hash (,mob 'get-mob-id)))))
 
-(define (run-mobs mobs)
+(define* (run-mobs #:optional (mobs (get-active-mobs)))
   (for-each
    (lambda (m)
      (glPushMatrix)
@@ -77,19 +85,59 @@
   (let ((name (car mob-head)) (attr (cdr mob-head)))
     `(define ,(string->symbol (string-concatenate (list "make-" (symbol->string name))))
        (lambda* ,(if (null? attr) '() `(#:key ,@attr))
-        (lambda-mob () ,@body)))))
+        (the-mob ',name () ,attr ,@body)))))
 
-(define-macro (lambda-mob attr . body)
+(define-macro (the-mob type attr publish . body)
   (let ((mob-id-symbol (gensym))
-       (type-mob
-    `(let ,(cons `(,mob-id-symbol (gensym)) attr)
+       (type-symbol (gensym))
+       (time-symbol (gensym))
+       (data-symbol (gensym)))
+    `(let ((,mob-id-symbol (gensym))
+          (,type-symbol ,type)
+          (,time-symbol 0)
+          (,data-symbol '())
+          ,@attr)
        (lambda* (#:optional (option #f))
         (define (kill-me)
           (hide-mob-hash ,mob-id-symbol))
+        (define (save-data)
+          (let ((time (get-frame-time)))
+            (cond ((not (= time ,time-symbol))
+                   (set! ,time-symbol time)
+                   (set! ,data-symbol ,(cons 'list (map (lambda (x) `(cons ',(car x) ,(car x))) publish)))))))
+        (define (get-data)
+          ,data-symbol)
+        (define (filter-mobs type fun)
+          #t)
+        (define (map-mobs fun type)
+          (let ((mobs (filter (lambda (m) (and (eq? (m 'get-type) type) (not (eq? (m 'get-mob-id) ,mob-id-symbol)))) (get-active-mobs))))
+            (map (lambda (m) (fun (m 'get-data))) mobs)))
         (case option
           ((get-mob-id)
            ,mob-id-symbol)
+          ((get-type)
+           ,type-symbol)
+          ((get-data)
+           (save-data)
+           ,data-symbol)
           (else
+           (save-data)
            (catch #t
-                  (lambda () ,@body)
+                  (lambda () ,@body)
                   (lambda (key . args) #f))))))))
+
+(define-macro (lambda-mob attr . body)
+  `(the-mob 'undefined ,attr '() ,@body))
+
+
+;;; Collisions
+
+(define-macro (lambda-mob-data attr . body)
+  `(lambda ,attr ,@body))
+
+(define-macro (define-collision-check name mobs . body)
+  `(defmacro* ,name (#:optional m)
+     `(let ,(cond (m `((mob-id (,m 'get-mob-id)) (mob-type (,m 'get-type))))
+                 (else `()))
+       
+       mob-id)))