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

diff --git a/src/gacela_mobs.scm b/src/gacela_mobs.scm
index 6081cb4..8120e03 100755
--- a/src/gacela_mobs.scm
+++ b/src/gacela_mobs.scm
@@ -15,65 +15,79 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(use-modules (srfi srfi-1))
+;;; Mobs Factory
 
-;;; Mob Factory
+(define show-mob-hash #f)
+(define hide-mob-hash #f)
+(define get-active-mobs #f)
+(define mobs-changed? #f)
 
-(define-macro (makemob name . methods)
-  `(define* (,name . args)
-     (let ((option (car args)))
-       ,(union
-	 `(case option
-	    (:on (mob-on ',name))
-	    (:off (mob-off ',name)))
-	 (define (options m)
-	   (let ((option (car m)) (body (cadr m)))
-	     (cond ((null? m) '())
-		   (else (cons (list option `(apply ,body (cdr args))) (options (cddr m)))))))
-	 (options methods)))))
+(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)))
 
-(define mob-on #f)
-(define run-mobs #f)
-(define mob-off #f)
-(define refresh-running-mobs #f)
-(define quit-all-mobs #f)
+  (set! get-active-mobs
+	(lambda* (#:optional (refreshed #t))
+	  (set! changed (not refreshed))
+	  (hash-map->list (lambda (k v) v) active-mobs)))
 
-(let ((running-mobs '()) (mobs-to-add '()) (mobs-to-quit '()))
-  (set! mob-on
-	(lambda (mob)
-	  (push mob mobs-to-add)))
+  (set! mobs-changed?
+	(lambda () changed)))
 
-  (set! run-mobs
-	(lambda* (option #:key args function)
-	  (define (run-mobs-rec mobs)
-	    (cond ((null? mobs) #f)
-		  (else
-		   (cond (function (function)))
-		   (secure-block #f (apply (car mobs) (cons option args)))
-		   (or #t (run-mobs-rec (cdr mobs))))))))
 
-  (set! mob-off
-	(lambda (mob)
-	  (push mob mobs-to-quit)))
+(define-macro (show-mob mob)
+  `(show-mob-hash ',mob (lambda (option) (,mob option))))
 
-  (set! refresh-running-mobs
-	(lambda ()
-	  (do ((mob (pop mobs-to-add) (pop mobs-to-add))) ((null? mob))
-	    (push mob running-mobs)
-	    (secure-block nil (mob #:init)))
-	  (set! running-mobs (reverse (lset-difference eq? running-mobs mobs-to-quit)))
-	  (set! mobs-to-quit '())))
+(define-macro (hide-mob mob)
+  `(hide-mob-hash ',mob))
 
-  (set! quit-all-mobs
-	(lambda ()
-	  (set! running-mobs '())
-	  (set! mobs-to-add '())
-	  (set! mobs-to-quit '()))))
+(define (process-mobs mobs)
+  (for-each (lambda (m) (m #:render)) mobs))
 
+(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)
+			     (let ((var (gensym)))
+			       (values (cons `(draw-texture ,var) lines)
+				       (cons `(,var (load-texture ,line)) images))))
+			    (else
+			     (values (cons line lines)
+				     images))))))))
 
-(define (logic-mobs)
-  (run-mobs #:logic))
+  (receive (look-lines look-images) (process-look look)
+	   `(let ,look-images
+		(lambda ()
+		  (glPushMatrix)
+		  ,@look-lines
+		  (glPopMatrix)))))
 
-(define (render-mobs)
-  (run-mobs #:render #:function (lambda () (glLoadIdentity))))
+(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))