More verbose mode for working with entities and components; assoc

[gacela.git] / src / test.scm

diff --git a/src/test.scm b/src/test.scm
index 45bdef541de5ae3c5dbd1d7afb6554da99db0955..fc710f21928b165618bac938530593a2259aeb27 100644 (file)
--- 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)
 ))