X-Git-Url: https://git.jsancho.org/?p=gacela.git;a=blobdiff_plain;f=src%2Fsystem.scm;h=9df7cdcc5a701d84783f04e7157497936888513f;hp=ea9476ab51bbd226286865323b095f7d4e688163;hb=c4ba277c7f9d23516926693b48e704ff3ea5e8f9;hpb=f2cf55b8c51e819bded19f2693aa74ae89abb12b

diff --git a/src/system.scm b/src/system.scm
index ea9476a..9df7cdc 100644
--- a/src/system.scm
+++ b/src/system.scm
@@ -16,6 +16,7 @@
 
 
 (define-module (gacela system)
+  #:use-module (ice-9 receive)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-9))
 
@@ -65,6 +66,14 @@
 
 ;;; Entities and components
 
+(define (normalize-components components)
+  (map
+   (lambda (c)
+     (if (record? c)
+	 `(,(get-component-type c) . ,c)
+	 c))
+   components))
+
 (define (register-components entity components clist)
   (cond ((null? components) clist)
 	(else
@@ -89,11 +98,12 @@
 		    (assoc-set! clist type elist))))))))
 
 (define (new-entity new-components entities components)
-  (let ((key (gensym)))
+  (let ((key (gensym))
+	(nc (normalize-components new-components)))
     (values
-     (acons key new-components entities)
+     (acons key nc entities)
      (register-components key
-			  (map (lambda (c) (car c)) new-components)
+			  (map (lambda (c) (car c)) nc)
 			  components)
      key)))
 
@@ -104,10 +114,11 @@
      (unregister-components key clist components))))
 
 (define (set-entity key new-components entities components)
-  (let ((clist (map (lambda (c) (car c)) (assoc-ref entities key)))
-	(nclist (map (lambda (c) (car c)) new-components)))
+  (let* ((nc (normalize-components new-components))
+	 (clist (map (lambda (c) (car c)) (assoc-ref entities key)))
+	 (nclist (map (lambda (c) (car c)) nc)))
     (values
-     (assoc-set! entities key new-components)
+     (assoc-set! entities key nc)
      (register-components key (lset-difference eq? nclist clist)
 			  (unregister-components key (lset-difference eq? clist nclist) components)))))
 
@@ -121,13 +132,28 @@
 		(assoc-set! clist (caar new-components) (cdar new-components))
 		(assoc-remove! clist (caar new-components)))
 	    (cdr new-components)))))
-  (set-entity key (set-components (alist-copy (assoc-ref entities key)) new-components) entities components))
+  (set-entity key (set-components (alist-copy (assoc-ref entities key)) (normalize-components new-components)) entities components))
+
+(define (set-entities new-entities entities components)
+  (cond ((null? new-entities)
+	 (values entities components))
+	(else
+	 (cond ((not (caar new-entities))
+		(receive (e c k) (new-entity (cdar new-entities) entities components)
+			 (set-entities (cdr new-entities) e c)))
+	       ((not (cdar new-entities))
+		(receive (e c) (remove-entity (caar new-entities) entities components)
+			 (set-entities (cdr new-entities) e c)))
+	       (else
+		(receive (e c) (set-entity-components (caar new-entities) (cdar new-entities) entities components)
+			 (set-entities (cdr new-entities) e c)))))))
 
    
 (export new-entity
 	remove-entity
 	set-entity
-	set-entity-components)
+	set-entity-components
+	set-entities)
 
 
 ;;; Making systems
@@ -146,24 +172,13 @@
   (lambda (entities components)
     (let* ((e (find-entities-by-components components component-types))
 	   (e* (map (lambda (x) (assoc x entities)) e))
-	   (e** (map (lambda (x) (cons (car x) (filter (lambda (x) (memq (get-component-type x) component-types)) (cdr x)))) e*))
+	   (e** (map (lambda (x) (cons (car x) (filter (lambda (x) (memq (car x) component-types)) (cdr x)))) e*))
 	   (res (system-fun e**)))
       (lambda* (#:optional (entities2 #f) (components2 #f))
-        (let* ((e2 (if (and entities2 components2)
-		       (find-entities-by-components components2 component-types)
-		       e))
-	       (e2* (if (and entities2 components2)
-			(map (lambda (x) (assoc x entities2)) e2)
-			e*))
-	       (e2** (if (and entities2 components2)
-			 (map (lambda (x) (cons (car x) (filter (lambda (x) (memq (get-component-type x) component-types)) (cdr x)))) e2*)
-			 e**)))
-	  e2**)))))
-
-; ((1 a b) (2 a b c) (3 c))
-; ((1 a b) (2 a b))
-; ((1 a) (a b))
-; ((1 a) (3 c) (4 a b))
+	(let ((e (if (and entities2 components2) entities2 entities))
+	      (c (if (and entities2 components2) components2 components)))
+	  (set-entities res e c))))))
+
 
 (export find-entities-by-components
 	make-system)