(no commit message)

[gacela.git] / src / gacela_mobs.scm

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index 12a0ef1d8aa90163e40a2469adfda912ac2b4184..ede4235cb653b04fc96f7a1489b21a7e5eff6554 100755 (executable)
--- a/src/gacela_mobs.scm
+++ b/src/gacela_mobs.scm
@@ -15,99 +15,49 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(use-modules (srfi srfi-1))
-
-;;; Actions for mobs
-
-(define-macro (define-action action-def . code)
-  (let ((name (car action-def)) (attr (cdr action-def)))
-    `(define (,name mob-attr)
-       (let ,(map attribute-definition attr)
-        ,@code
-        ,(cons 'list (map attribute-result attr))))))
-
-(define (attribute-definition attribute)
-  (let ((name (if (list? attribute) (car attribute) attribute))
-       (value (if (list? attribute) (cadr attribute) #f)))
-    `(,name (let ((v (assoc-ref mob-attr ',name))) (if v (cdr v) ,value)))))
-
-(define (attribute-result attribute)
-  (let ((name (if (list? attribute) (car attribute) attribute)))
-    `(list ',name ,name)))
-
-
-;;; Mob Factory
-
-(define-macro (makemob name . methods)
-  `(define* (,name . args)
-     (let ((option (car args)))
-       ,(lset-union eq?
-        `(case option
-           (:on (mob-on ',name))
-           (:off (mob-off ',name)))
-        (define (options m)
-          (let ((option (car m)) (body (cadr m)))
-            (cond ((null? m) '())
-                  (else (cons (list option `(apply ,body (cdr args))) (options (cddr m)))))))
-        (options methods)))))
-
-(define-macro (makemob name . methods)
-  (define (options m)
-    (cond ((null? m) '((else #f)))
-         (else
-          (let ((option (caar m)) (body (cadar m)))
-            (cons `((,option) (apply ,body (cdr args))) (options (cdr m)))))))
-  (let ((m (options methods)))
-    `(define (,name . args)
-       (let ((option (car args)))
-        (case option
-          ((#:on) (mob-on ',name))
-          ((#:off) (mob-off ',name))
-          ,@m)))))
-
-
-(define mob-on #f)
-(define run-mobs #f)
-(define mob-off #f)
-(define refresh-running-mobs #f)
-(define quit-all-mobs #f)
-
-(let ((running-mobs '()) (mobs-to-add '()) (mobs-to-quit '()))
-  (set! mob-on
-       (lambda (mob)
-         (push mob mobs-to-add)))
-
-  (set! run-mobs
-       (lambda* (option #:key args function)
-         (define (run-mobs-rec mobs)
-           (cond ((null? mobs) #f)
-                 (else
-                  (cond (function (function)))
-                  (catch #t (lambda () (apply (car mobs) (cons option args))) (lambda (key . args) #f))
-                  (or #t (run-mobs-rec (cdr mobs))))))
-         (run-mobs-rec running-mobs)))
-
-  (set! mob-off
-       (lambda (mob)
-         (push mob mobs-to-quit)))
-
-  (set! refresh-running-mobs
-       (lambda ()
-         (do ((mob (pop mobs-to-add) (pop mobs-to-add))) ((null? mob))
-           (push mob running-mobs)
-           (catch #t (lambda () (mob #:init)) (lambda (key . args) #f)))
-         (set! running-mobs (reverse (lset-difference eq? running-mobs mobs-to-quit)))
-         (set! mobs-to-quit '())))
-
-  (set! quit-all-mobs
-       (lambda ()
-         (set! running-mobs '())
-         (set! mobs-to-add '())
-         (set! mobs-to-quit '()))))
-
-
-(define (logic-mobs)
-  (run-mobs #:logic))
-
-(define (render-mobs)
-  (run-mobs #:render #:function (lambda () (glLoadIdentity))))
+;;; Mobs Factory
+
+(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))))))))