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

diff --git a/src/system.scm b/src/system.scm
index b4f4870..ea9476a 100644
--- a/src/system.scm
+++ b/src/system.scm
@@ -16,12 +16,13 @@
 
 
 (define-module (gacela system)
+  #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-9))
 
 
 ;;; Component definitions
 
-(define (make-symbol . args)
+(define (symbol-concatenate . args)
   (string->symbol
    (string-concatenate
     (map (lambda (a) (if (symbol? a) (symbol->string a) a)) args))))
@@ -30,18 +31,139 @@
   `(begin
      (use-modules (srfi srfi-9) (srfi srfi-9 gnu))
      (define-record-type ,name
-       (,(make-symbol "make-" name) ,@args)
-       ,(make-symbol name "?")
-       ,@(map (lambda (a) (list a (make-symbol name "-" a) (make-symbol "set-" name "-" a "!"))) args))
+       (,(symbol-concatenate "make-" name) ,@args)
+       ,(symbol-concatenate name "?")
+       ,@(map (lambda (a) (list a (symbol-concatenate name "-" a) (symbol-concatenate "set-" name "-" a "!"))) args))
      (set-record-type-printer! ,name
        (lambda (record port)
 	 (format port "#<[~a]" ',name)
-	 ,@(map (lambda (a) `(format port " ~a: ~a" ',a (,(make-symbol name "-" a) record))) args)
+	 ,@(map (lambda (a) `(format port " ~a: ~a" ',a (,(symbol-concatenate name "-" a) record))) args)
 	 (format port ">")))
      ',name))
 
+(define (export-component component)
+  (let ((name (record-type-name component))
+	(m (current-module)))
+    (module-export! m (list
+		       (symbol-concatenate "make-" name)
+		       (symbol-concatenate name "?")))
+    (for-each
+     (lambda (a)
+       (module-export! (current-module)
+		       (list
+			(symbol-concatenate name "-" a)
+			(symbol-concatenate "set-" name "-" a "!"))))
+     (record-type-fields component))))
+
 (define (get-component-type component)
   (record-type-name (record-type-descriptor component)))
 
 (export define-component
+	export-component
 	get-component-type)
+
+
+;;; Entities and components
+
+(define (register-components entity components clist)
+  (cond ((null? components) clist)
+	(else
+	 (let* ((type (car components))
+		(elist (assoc-ref clist type)))
+	   (register-components entity (cdr components)
+	     (assoc-set! clist type
+	       (cond (elist
+		      (lset-adjoin eq? elist entity))
+		     (else
+		      (list entity)))))))))
+
+(define (unregister-components entity components clist)
+  (cond ((null? components) clist)
+	(else
+	 (let* ((type (car components))
+		(elist (lset-difference eq? (assoc-ref clist type) (list entity))))
+	   (unregister-components entity (cdr components)
+	     (cond ((null? elist)
+		    (assoc-remove! clist type))
+		   (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))
+
+   
+(export new-entity
+	remove-entity
+	set-entity
+	set-entity-components)
+
+
+;;; Making systems
+
+(define* (find-entities-by-components c t)
+  (cond ((null? t) '())
+	(else
+	 (let* ((e (assoc-ref c (car t)))
+		(e* (if e e '())))
+	   (cond ((null? (cdr t)) e*)
+		 (else
+		  (lset-intersection eq? e* (find-entities-by-components c (cdr t)))))))))
+		  
+
+(define (make-system component-types system-fun)
+  (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))
+
+(export find-entities-by-components
+	make-system)