X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela_mobs.scm;h=5ae3296ab0287601d48b91062623f2e5aa3930b4;hb=b50916459d90f604043ea688750c55a516636796;hp=d273556d51de2247e9259141cc38a1c947a50ac0;hpb=c09ace17399a4f6ffc5da5b498385b77473b5795;p=gacela.git

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index d273556..5ae3296 100755
--- a/src/gacela_mobs.scm
+++ b/src/gacela_mobs.scm
@@ -17,36 +17,122 @@
 
 ;;; Mobs Factory
 
-(define-macro (hash-add-mob hash-table mob)
-  `(hash-set! ,hash-table (procedure-name ,mob) (lambda () (,mob))))
-
-(define-macro (hash-remove-mob hash-table mob)
-  `(hash-remove! ,hash-table (procedure-name ,mob)))
-
-
-(define add-mob #f)
-(define kill-mob #f)
-(define get-mob-world #f)
-(define mobs #f)
-(define vreload #f)
-
-(let ((active-mobs (make-hash-table)) (reload #f))
-  (set! add-mob
-	(lambda (mob)
-	  (hash-add-mob active-mobs mob)
-	  (set! reload #t)))
-
-  (set! kill-mob
-	(lambda (mob)
-	  (hash-remove-mob active-mobs mob)
-	  (set! reload #t)))
-
-  (set! get-mob-world
-	(lambda ()
-	  (cond (reload
-		 (set! reload #f)
-		 (hash-map->list (lambda (k v) v) active-mobs))
-		(else #f))))
-
-  (set! mobs (lambda () active-mobs))
-  (set! vreload (lambda () reload)))
+(define show-mob-hash #f)
+(define hide-mob-hash #f)
+(define get-active-mobs #f)
+(define mobs-changed? #f)
+
+(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! hide-mob-hash
+	(lambda (key)
+	  (hash-remove! key)
+	  (set! changed #t)))
+
+  (set! get-active-mobs
+	(lambda* (#:optional (refreshed #t))
+	  (set! changed (not refreshed))
+	  (hash-map->list (lambda (k v) v) active-mobs)))
+
+  (set! mobs-changed?
+	(lambda () changed)))
+
+
+(define-macro (show-mob mob)
+  `(show-mob-hash ',mob (lambda (option) (,mob option))))
+
+(define-macro (hide-mob mob)
+  `(hide-mob-hash ',mob))
+
+(define (process-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 (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))))))
+
+
+;;; Making 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)
+  `(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))))
+		 ((get-actions)
+		  actions)
+		 ((set-actions)
+		  (if (not (null? params)) (set! actions (car params))))
+		 ((get-renders)
+		  renders)
+		 ((set-renders)
+		  (if (not (null? params)) (set! renders (car params))))
+		 ((render)
+		  (for-each (lambda (render) ((cdr render) attr)) renders))))))
+     (cond ((not (null? ',look))
+	    (mob 'set-renders
+		 (list (cons
+			'default-look
+			(lambda-look ,attr ,@look))))))
+     mob))