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

diff --git a/src/system.scm b/src/system.scm
index ea9476a..2a9365b 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
@@ -88,46 +97,70 @@
 		   (else
 		    (assoc-set! clist type elist))))))))
 
-(define (new-entity new-components entities components)
-  (let ((key (gensym)))
-    (values
-     (acons key new-components entities)
-     (register-components key
-			  (map (lambda (c) (car c)) new-components)
-			  components)
-     key)))
-
-(define (remove-entity key entities components)
-  (let ((clist (map (lambda (c) (car c)) (assoc-ref entities key))))
-    (values
-     (assoc-remove! entities key)
-     (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)))
-    (values
-     (assoc-set! entities key new-components)
-     (register-components key (lset-difference eq? nclist clist)
-			  (unregister-components key (lset-difference eq? clist nclist) components)))))
-
-(define (set-entity-components key new-components entities components)
-  (define (set-components clist new-components)
-    (cond ((null? new-components)
-	   clist)
-	  (else
-	   (set-components
-	    (if (cdar new-components)
-		(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))
-
-   
+(define (new-entity . new-components)
+  (lambda (entities components)
+    (let ((key (gensym))
+	  (nc (normalize-components new-components)))
+      (values
+       (acons key nc entities)
+       (register-components key
+			    (map (lambda (c) (car c)) nc)
+			    components)
+       key))))
+
+(define (remove-entity key)
+  (lambda (entities components)
+    (let ((clist (map (lambda (c) (car c)) (assoc-ref entities key))))
+      (values
+       (assoc-remove! entities key)
+       (unregister-components key clist components)))))
+
+(define (set-entity key . new-components)
+  (lambda (entities 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 nc)
+       (register-components key (lset-difference eq? nclist clist)
+			    (unregister-components key (lset-difference eq? clist nclist) components))))))
+
+(define (set-entity-components key . new-components)
+  (lambda (entities components)
+    (let ((nc (normalize-components new-components))
+	  (clist (alist-copy (assoc-ref entities key))))
+      (for-each
+       (lambda (c)
+	 (assoc-set! clist (car c) (cdr c)))
+       nc)
+      (values
+       (assoc-set! entities key clist)
+       (register-components key (map (lambda (c) (car c)) nc) components)))))
+
+(define (remove-entity-components key . old-components)
+  (lambda (entities components)
+    (let ((clist (alist-copy (assoc-ref entities key))))
+      (for-each
+       (lambda (c)
+	 (assoc-remove! clist c))
+       old-components)
+      (values
+       (assoc-set! entities key clist)
+       (unregister-components key old-components components)))))
+
+(define (modify-entities changes entities components)
+  (cond ((null? changes)
+	 (values entities components))
+	(else
+	 (receive (e c) ((car changes) entities components)
+	   (modify-entities (cdr changes) e c)))))
+
 (export new-entity
 	remove-entity
 	set-entity
-	set-entity-components)
+	set-entity-components
+	remove-entity-components
+	modify-entities)
 
 
 ;;; Making systems
@@ -142,28 +175,53 @@
 		  (lset-intersection eq? e* (find-entities-by-components c (cdr t)))))))))
 		  
 
-(define (make-system component-types system-fun)
+(define-macro (make-system component-types system-func)
+  `(let ((func ,system-func))
+     (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 (car x) ',component-types)) (cdr x)))) e*))
+	      (res (func e**)))
+	 (lambda* (#:optional (entities2 #f) (components2 #f))
+	   (let ((e (if (and entities2 components2) entities2 entities))
+		 (c (if (and entities2 components2) components2 components)))
+	     (modify-entities res e c)))))))
+
+
+(define-macro (define-system head system-func)
+  (let ((name (car head))
+	(component-types (cdr head)))
+    `(define ,name (make-system ,component-types ,system-func))))
+
+
+(define (join-systems . systems)
   (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*))
-	   (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 run ((s systems) (e entities) (c components))
+      (cond ((null? s)
+	     (values e c))
+	    (else
+	     (receive (e2 c2) (((car s) e c))
+	       (run (cdr s) e2 c2)))))))
+
+
+(define (threaded-systems . systems)
+  (lambda (entities components)
+    (let run-wait ((thd
+		    (map
+		     (lambda (s)
+		       (call-with-new-thread
+			(lambda () (s entities components))))
+		     systems))
+		   (e entities) (c components))
+      (cond ((null? thd)
+	     (values e c))
+	    (else
+	     (receive (e2 c2) ((join-thread (car thd)) e c)
+	       (run-wait (cdr thd) e2 c2)))))))
+
 
 (export find-entities-by-components
-	make-system)
+	define-system
+	make-system
+	join-systems
+	threaded-systems)