(no commit message)

[gacela.git] / src / gacela_mobs.scm

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index 51ce54917e9a241a6d68d8ff93ec8673f10cda21..5ae3296ab0287601d48b91062623f2e5aa3930b4 100755 (executable)
--- a/src/gacela_mobs.scm
+++ b/src/gacela_mobs.scm
@@ -62,35 +62,25 @@
 (define (attr-def attr)
   (let ((name (car attr))
        (value (cadr attr)))
-    `(,name (get-attr attributes ',name ,value))))
-
-;; (defmacro make-behaviour (name attr &rest code)
-;;   `(defun ,(get-behaviour-fun-name name) (object-attr)
-;;      (let ,(mapcar #'attribute-definition attr)
-;;        ,@code
-;;        ,(cons 'progn (mapcar #'attribute-save (reverse attr)))
-;;        object-attr)))
-
-;; (defun get-behaviour-fun-name (name)
-;;   (intern (concatenate 'string "BEHAVIOUR-" (string-upcase (string name))) 'gacela))
-
-;; (defun attribute-name (attribute)
-;;   (intern (string attribute) 'keyword))
-
-;; (define (attribute-definition attribute)
-;;   (let* ((name (cond ((list? attribute) (car attribute))
-;;                  (else attribute)))
-;;      (pname (attribute-name name))
-;;      (value (cond ((listp attribute) (cadr attribute)))))
-;;     `(,name (getf object-attr ,pname ,value))))
-
-;; (defun attribute-save (attribute)
-;;   (let* ((name (cond ((listp attribute) (car attribute))
-;;                  (t attribute)))
-;;      (pname (attribute-name name)))
-;;     `(setf (getf object-attr ,pname) ,name)))
-
-(define-macro (lambda-look . look)
+    `(,name (get-attr attributes ',name ',value))))
+
+(define (attr-save attr)
+  (let ((name (car attr)))
+    `(set! attributes (assoc-set! attributes ',name (list ,name)))))
+
+(define-macro (define-action action-head . code)
+  (let ((name (car action-head)) (attr (cdr action-head)))
+    `(define ,name
+       (lambda-action ,attr ,@code))))
+
+(define-macro (lambda-action attr . code)
+  `(lambda (attributes)
+     (let ,(map attr-def attr)
+       ,@code
+       ,(cons 'begin (map attr-save attr))
+       attributes)))
+
+(define-macro (lambda-look attr . look)
   (define (process-look look)
     (cond ((null? look) (values '() '()))
          (else
@@ -106,10 +96,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
@@ -136,8 +127,12 @@
                 ((get-renders)
                  renders)
                 ((set-renders)
-                 (if (not (null? params)) (set! renders (car params))))))))
+                 (if (not (null? params)) (set! renders (car params))))
+                ((render)
+                 (for-each (lambda (render) ((cdr render) attr)) renders))))))
      (cond ((not (null? ',look))
-           (display ',look)
-           (newline)))
+           (mob 'set-renders
+                (list (cons
+                       'default-look
+                       (lambda-look ,attr ,@look))))))
      mob))