(no commit message)

[gacela.git] / src / gacela_mobs.scm

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index 927d8b138af7125823b8b549e1dcf20605211e83..5e159075b945586567e7154096dd4386de42b53e 100755 (executable)
--- a/src/gacela_mobs.scm
+++ b/src/gacela_mobs.scm
@@ -48,8 +48,11 @@
 (define-macro (hide-mob mob)
   `(hide-mob-hash ',mob))
 
-(define (process-mobs mobs)
-  (for-each (lambda (m) (m #:render)) mobs))
+(define (run-mob-actions mobs)
+  (for-each (lambda (m) (m 'run-actions)) mobs))
+
+(define (render-mobs mobs)
+  (for-each (lambda (m) (m 'render)) mobs))
 
 
 ;;; Actions and looks for mobs
@@ -66,7 +69,7 @@
 
 (define (attr-save attr)
   (let ((name (car attr)))
-    `(assoc-set! attributes ',name (list ,name))))
+    `(set! attributes (assoc-set! attributes ',name (list ,name)))))
 
 (define-macro (define-action action-head . code)
   (let ((name (car action-head)) (attr (cdr action-head)))
@@ -80,7 +83,7 @@
        ,(cons 'begin (map attr-save attr))
        attributes)))
 
-(define-macro (lambda-look . look)
+(define-macro (lambda-look attr . look)
   (define (process-look look)
     (cond ((null? look) (values '() '()))
          (else
@@ -96,10 +99,11 @@
 
   (receive (look-lines look-images) (process-look look)
           `(let ,look-images
-               (lambda ()
-                 (glPushMatrix)
-                 ,@look-lines
-                 (glPopMatrix)))))
+               (lambda (attributes)
+                 (let ,(map attr-def attr)
+                   (glPushMatrix)
+                   ,@look-lines
+                   (glPopMatrix))))))
 
 
 ;;; Making mobs
@@ -112,7 +116,7 @@
 (define-macro (lambda-mob attr . look)
   `(let ((mob #f))
      (set! mob
-          (let ((attr ',attr) (actions '()) (renders '()))
+          (let ((attr ',attr) (actions '()) (looks '()))
             (lambda (option . params)
               (case option
                 ((get-attr)
@@ -123,11 +127,42 @@
                  actions)
                 ((set-actions)
                  (if (not (null? params)) (set! actions (car params))))
-                ((get-renders)
-                 renders)
-                ((set-renders)
-                 (if (not (null? params)) (set! renders (car params))))))))
+                ((get-looks)
+                 looks)
+                ((set-looks)
+                 (if (not (null? params)) (set! looks (car params))))
+                ((run-actions)
+                 (for-each
+                  (lambda (action)
+                    (set! attr ((cdr action) attr)))
+                  actions))
+                ((render)
+                 (for-each
+                  (lambda (look)
+                    ((cdr look) attr))
+                  looks))))))
      (cond ((not (null? ',look))
-           (display ',look)
-           (newline)))
+           (mob 'set-looks
+                (list (cons
+                       'default-look
+                       (lambda-look ,attr ,@look))))))
      mob))
+
+(define (get-mob-attr mob var)
+  (let ((value (assoc-ref (mob 'get-attr) var)))
+    (if value (car value) #f)))
+
+(define (set-mob-attr! mob var value)
+  (mob 'set-attr (assoc-set! (mob 'get-attr) var (list value))))
+
+(define (add-mob-action mob name action)
+  (mob 'set-actions (assoc-set! (mob 'get-actions) name action)))
+
+(define (quit-mob-action mob name)
+  (mob 'set-actions (assoc-remove! (mob 'get-actions) name)))
+
+(define (add-mob-look mob name look)
+  (mob 'set-looks (assoc-set! (mob 'get-looks) name look)))
+
+(define (quit-mob-look mob name)
+  (mob 'set-looks (assoc-remove! (mob 'get-looks) name)))