X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela_mobs.scm;h=8120e0369b649f089e7508dcdb83a5e3adbd2f5f;hb=03149b3e627438a3dd317e62aba2befce52cc324;hp=6b9d6997f42e402576435c6aaaf5f494d6639aa6;hpb=f150638c6d3fe992a1557d36d3e1858e9a4f395c;p=gacela.git

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index 6b9d699..8120e03 100755
--- 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))