X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Ftest.scm;h=353987b1edfe30f395eb71d16ceb6d3635d22675;hb=9b261e3a07d92edf68979b46f756413a0ac9247a;hp=021afefc8744e4defc8af120bb12d096af8a3679;hpb=c4ba277c7f9d23516926693b48e704ff3ea5e8f9;p=gacela.git

diff --git a/src/test.scm b/src/test.scm
index 021afef..353987b 100644
--- a/src/test.scm
+++ b/src/test.scm
@@ -30,44 +30,44 @@
   (let ((entities '())
 	(components '())
 	(key #f))
-    (receive (e c k) (new-entity (list (make-a 1 2) (make-b)) entities components)
-	     (set! entities e)
-	     (set! components c)
-	     (set! key k)
-	     (display k) (newline))
+    (receive (e c k) ((new-entity (make-a 1 2) (make-b)) entities components)
+      (set! entities e)
+      (set! components c)
+      (set! key k)
+      (display k) (newline))
     (format #t "New entity with a and b:~%~a~%~a~%~%" entities components)
 
-    (receive (e c k) (new-entity (list (make-a 10 20)) entities components)
-	     (set! entities e)
-	     (set! components c)
-	     (display k) (newline))
+    (receive (e c k) ((new-entity (make-a 10 20)) entities components)
+      (set! entities e)
+      (set! components c)
+      (display k) (newline))
     (format #t "New entity with a:~%~a~%~a~%~%" entities components)
 
-    (receive (e c) (set-entity-components key `((b . #f) ,(make-a 50 50)) entities components)
-	     (set! entities e)
-	     (set! components c))
+    (receive (e c) (modify-entities (list (set-entity-components key (make-a 50 50)) (remove-entity-components key 'b)) entities components)
+      (set! entities e)
+      (set! components c))
     (format #t "First entity removes b and changes a:~%~a~%~a~%~%" entities components)
 
-    (receive (e c) (remove-entity key entities components)
-	     (set! entities e)
-	     (set! components c))
+    (receive (e c) ((remove-entity key) entities components)
+      (set! entities e)
+      (set! components c))
     (format #t "Removes first entity:~%~a~%~a~%~%" entities components)
 
-    (receive (e c k) (new-entity (list (make-a 1 2) (make-b)) entities components)
-	     (set! entities e)
-	     (set! components c)
-	     (set! key k)
-	     (display k) (newline))
+    (receive (e c k) ((new-entity (make-a 1 2) (make-b)) entities components)
+      (set! entities e)
+      (set! components c)
+      (set! key k)
+      (display k) (newline))
     (format #t "New entity with a and b:~%~a~%~a~%~%" entities components)
 
-    (receive (e c) (set-entities `((,key . ((b . #f) ,(make-a 50 50))) (#f . (,(make-a 1000 1000)))) entities components)
-	     (set! entities e)
-	     (set! components c))
+    (receive (e c) (modify-entities (list (set-entity-components key (make-a 50 50)) (remove-entity-components key 'b) (new-entity (make-a 1000 1000))) entities components)
+      (set! entities e)
+      (set! components c))
     (format #t "Last entity removes b and changes a, and new entity with a:~%~a~%~a~%~%" entities components)
 
-    (receive (e c) (set-entities `((,key . #f)) entities components)
-	     (set! entities e)
-	     (set! components c))
+    (receive (e c) (modify-entities (list (remove-entity key)) entities components)
+      (set! entities e)
+      (set! components c))
     (format #t "Remove last entity:~%~a~%~a~%~%" entities components)
 ))
 
@@ -77,7 +77,7 @@
 (define (test2)
   (let ((entities '())
 	(components '()))
-    (receive (e c) (((make-system '() (lambda (e) `((#f . (,(make-a 1 2))) (#f . (,(make-a 10 20)))))) entities components))
+    (receive (e c) (((make-system '() (lambda (e) (list (new-entity (make-a 1 2)) (new-entity (make-a 10 20))))) entities components))
 	     (set! entities e)
 	     (set! components c))
     (format #t "Two new entities with a:~%~a~%~a~%~%" entities components)
@@ -86,3 +86,37 @@
 ))
 
 (export test2)
+
+
+(define (test3)
+  (let ((entities '())
+	(components '())
+	(s1 (make-system '(l)
+	      (lambda (e)
+		(map
+		 (lambda (e1)
+		   `(,(car e1) . ((l . (cons 1 (cdr e1)))))
+		 e)))))
+	(s2 (make-system '(l)
+	      (lambda (e)
+		(map
+		 (lambda (e1)
+		   `(,(car e1) . ((l . (cons 2 (cdr e1))))))
+		 e)))))
+    (receive (e c) (set-entities `((#f . ((l . ()))) (#f . ((l . ())))) entities components)
+      ((join-systems s1 s2) e c))))
+
+(export test3)
+
+
+(define (test4)
+  (let ((f1 (lambda (e c) (sleep 3) (lambda (e2 c2) (values (+ 1 e2) c2))))
+	(f2 (lambda (e c) (sleep 4) (lambda (e2 c2) (values e2 (+ 10 c2))))))
+    (let ((t (current-time)))
+      (receive (e c) ((join-systems f1 f2) 2 2) (format #t "~a~%~a~%" e c))
+      (display (- (current-time) t)) (newline) (newline))
+    (let ((t (current-time)))
+      (receive (e c) ((threaded-systems f1 f2) 2 2) (format #t "~a~%~a~%" e c))
+      (display (- (current-time) t)) (newline) (newline))))
+
+(export test4)