X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela_mobs.scm;h=8c687dc5b42158dd01748059c7c88e552aa7c6da;hb=91e03880066280940b29a89eae28510e124e58cb;hp=de76938d5f14d41e5f2c802897b286d7896105b1;hpb=b82a1140db7d69b576d6b625c4932d66123a36fd;p=gacela.git

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index de76938..8c687dc 100755
--- a/src/gacela_mobs.scm
+++ b/src/gacela_mobs.scm
@@ -17,49 +17,190 @@
 
 ;;; Mobs Factory
 
-(define add-mob-lambda #f)
-(define kill-mob-symbol #f)
+(define show-mob-hash #f)
+(define hide-mob-hash #f)
 (define get-active-mobs #f)
+(define clear-active-mobs #f)
 (define mobs-changed? #f)
 
-(let ((active-mobs '()) (changed #f))
-  (set! add-mob-lambda
-	(lambda (mob)
-	  (pushnew mob active-mobs)
+(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! kill-mob-symbol
-	(lambda (mob)
-	  (set! active-mobs (lset-difference eq? active-mobs (list mob)))
+  (set! hide-mob-hash
+	(lambda (key)
+	  (hash-remove! key)
 	  (set! changed #t)))
 
   (set! get-active-mobs
 	(lambda* (#:optional (refreshed #t))
 	  (set! changed (not refreshed))
-	  active-mobs))
+	  (hash-map->list (lambda (k v) v) active-mobs)))
+
+  (set! clear-active-mobs
+	(lambda ()
+	  (set! changed #t)
+	  (hash-clear! active-mobs)))
 
   (set! mobs-changed?
 	(lambda () changed)))
 
 
-(define-macro (add-mob mob)
-  `(add-mob-lambda (lambda (option) (,mob option))))
+(define-macro (show-mob mob)
+  `(show-mob-hash ',mob (lambda (option) (,mob option))))
+
+(define-macro (hide-mob mob)
+  `(hide-mob-hash ',mob))
+
+(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
+
+(define (get-attr list name default)
+  (let ((value (assoc-ref list name)))
+    (cond (value (car value))
+	  (else default))))
 
-(define-macro (kill-mob mob)
-  `(kill-mob-symbol ',mob))
+(define (attr-def attr)
+  (let ((name (car attr))
+	(value (cadr attr)))
+    `(,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
+	   (let ((line (car look)))
+	     (receive (lines images) (process-look (cdr look))
+		      (cond ((string? line)
+			     (let ((var (gensym)))
+			       (values (cons `(draw-texture ,var) lines)
+				       (cons `(,var (load-texture ,line)) images))))
+			    (else
+			     (values (cons line lines)
+				     images))))))))
+
+  (receive (look-lines look-images) (process-look look)
+	   `(let ,look-images
+		(lambda (attributes)
+		  (let ,(map attr-def attr)
+		    (glPushMatrix)
+		    ,@look-lines
+		    (glPopMatrix))))))
 
-(define (process-mobs mobs)
-  (for-each (lambda (m) (m #:render)) mobs))
+
+;;; Making mobs
 
 (define-macro (define-mob mob-head . look)
   (let ((name (car mob-head)) (attr (cdr mob-head)))
-    `(begin
-       (define ,name #f)
-       (let ((attr ',attr))
-	 (set! ,name
-	       (lambda (option)
-		 (case option
-		   ((#:render)
-		    (glPushMatrix)
-		    ,@(map (lambda (x) (if (string? x) `(draw-image ,x) x)) look)
-		    (glPopMatrix)))))))))
+    `(define ,name
+       (lambda-mob ,attr ,@look))))
+
+(define-macro (lambda-mob attr . look)
+  `(let ((mob #f))
+     (set! mob
+	   (let ((attr ',attr) (actions '()) (looks '()))
+	     (lambda (option . params)
+	       (case option
+		 ((get-attr)
+		  attr)
+		 ((set-attr)
+		  (if (not (null? params)) (set! attr (car params))))
+		 ((get-actions)
+		  actions)
+		 ((set-actions)
+		  (if (not (null? params)) (set! actions (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))
+	    (mob 'set-looks
+		 (list (cons
+			'default-look
+			(lambda-look ,attr ,@look))))))
+     mob))
+
+(define-macro (define-mob mob-def)
+  (let ((name (car mob-def)) (def (cdr mob-def)))
+    `(define ,name
+       (lambda-mob ,def))))
+
+(defmacro* lambda-mob (#:key (attr '()) (action #f) (look #f))
+  `(let ((attr ,attr) (action ,action) (look ,look))
+     (lambda (option . params)
+       (case option
+	 ((get-attr)
+	  attr)
+	 ((set-attr)
+	  (if (not (null? params)) (set! attr (car params))))
+	 ((get-action)
+	  action)
+	 ((set-action)
+	  (if (not (null? params)) (set! action (car params))))
+	 ((get-look)
+	  look)
+	 ((set-look)
+	  (if (not (null? params)) (set! look (car params))))
+	 ((run-mob)
+	  (lambda (action)
+		     (set! attr ((cdr action) attr)))
+		   actions))
+		 ((render)
+		  (for-each
+		   (lambda (look)
+		     ((cdr look) attr))
+		   looks))))))
+
+
+(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)))