(no commit message)

[gacela.git] / src / gacela_mobs.scm

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index 6b9d6997f42e402576435c6aaaf5f494d6639aa6..8120e0369b649f089e7508dcdb83a5e3adbd2f5f 100755 (executable)
--- a/src/gacela_mobs.scm
+++ b/src/gacela_mobs.scm
@@ -51,30 +51,43 @@
 (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
-       (lambda-mob ,attr ,@look))))
-
-(define-macro (lambda-mob attr . look)
+(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)
-                            (cons `(draw-texture ,line) lines)
-                            (cons line images))
+                            (let ((var (gensym)))
+                              (values (cons `(draw-texture ,var) lines)
+                                      (cons `(,var (load-texture ,line)) images))))
                            (else
-                            (cons line lines)))
-                     (values lines images))))))
+                            (values (cons line lines)
+                                    images))))))))
 
   (receive (look-lines look-images) (process-look look)
-          `(let ((attr ',attr))
-             (lambda (option)
-               (case option
-                 ((#:render)
-                  (glPushMatrix)
-                  ,@look-lines
-;          ,@(map (lambda (x) (if (string? x) `(draw-texture ,x) x)) look)
-                  (glPopMatrix)))))))
+          `(let ,look-images
+               (lambda ()
+                 (glPushMatrix)
+                 ,@look-lines
+                 (glPopMatrix)))))
+
+(define-macro (define-mob mob-head . look)
+  (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))