(define-module (gacela system)
+ #:use-module ((bongodb) #:renamer (symbol-prefix-proc 'bongodb:))
#:use-module (ice-9 receive)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-9)
- #:use-module (srfi srfi-9 gnu))
+ #:use-module (srfi srfi-9 gnu)
+ #:export (define-component
+ export-component
+ get-component-type
+ make-entity-set
+ entity-list
+ entity-count
+ new-entity
+ get-entity
+ remove-entity
+ set-entity
+ set-entity-components
+ remove-entity-components
+ modify-entities
+ entities-changes
+ entities-changes?
+ get-entities-changes
+ find-entities-by-components
+ define-system
+ make-system
+ join-systems
+ thread-systems
+ get-key
+ get-component))
;;; Component definitions
a
(syntax->datum a)))
args))))
+ (define (filtered-args args)
+ (let ((datum (map (lambda (a) (syntax->datum a)) args)))
+ (map (lambda (a) (datum->syntax x a))
+ (map (lambda (a) (if (list? a) (car a) a))
+ (filter (lambda (a) (not (keyword? a))) datum)))))
(syntax-case x ()
((_ name field ...)
(with-syntax ((make-name (concat "make-" #'name))
+ (make-name-record (concat "make-" #'name "-record"))
(name? (concat #'name "?"))
- ((field-getter ...) (map (lambda (f) (concat #'name "-" f)) #'(field ...)))
- ((field-setter ...) (map (lambda (f) (concat "set-" #'name "-" f "!")) #'(field ...))))
+ ((field-name ...) (filtered-args #'(field ...)))
+ ((field-getter ...) (map (lambda (f) (concat #'name "-" f)) (filtered-args #'(field ...))))
+ ((field-setter ...) (map (lambda (f) (concat "set-" #'name "-" f "!")) (filtered-args #'(field ...)))))
#'(begin
+ (define* (make-name field ...)
+ (make-name-record field-name ...))
(define-record-type name
- (make-name field ...)
+ (make-name-record field-name ...)
name?
- (field field-getter field-setter)
+ (field-name field-getter field-setter)
...)
(set-record-type-printer! name
(lambda (record port)
(format port "#<[~a]" 'name)
- (format port " ~a: ~a" 'field (field-getter record))
+ (format port " ~a: ~a" 'field-name (field-getter record))
...
(format port ">")))
'name))))))
(define (get-component-type component)
(record-type-name (record-type-descriptor component)))
-(export define-component
- export-component
- get-component-type)
-
;;; Entities and components
(define (make-entity-set . changes)
- (modify-entities
- (cons (make-hash-table) (make-hash-table))
- changes))
+ (modify-entities (bongodb:make-collection) changes))
(define (entity-list entity-set)
- (hash-map->list (lambda (k v) (cons k v)) (car entity-set)))
+ (bongodb:find entity-set))
(define (entity-count entity-set)
- (hash-count (const #t) (car entity-set)))
+ (bongodb:count entity-set))
(define (normalize-components components)
(map
c))
components))
-(define (register-components entity components clist)
- (cond ((null? components) clist)
- (else
- (let* ((type (car components))
- (elist (hash-ref clist type)))
- (hash-set! clist type
- (cond (elist
- (lset-adjoin eq? elist entity))
- (else
- (list entity))))
- (register-components entity (cdr components) clist)))))
-
-(define (unregister-components entity components clist)
- (cond ((null? components) clist)
- (else
- (let* ((type (car components))
- (elist (lset-difference eq? (hash-ref clist type) (list entity))))
- (cond ((null? elist)
- (hash-remove! clist type))
- (else
- (hash-set! clist type elist)))
- (unregister-components entity (cdr components) clist)))))
-
-(define (component-names components)
- (map (lambda (c) (car c)) components))
-
-(define (entity-component-names key entity-set)
- (component-names
- (hash-ref (car entity-set) key)))
-
(define (entity-ref key entity-set)
(hash-get-handle (car entity-set) key))
-(define (new-entity . new-components)
- (lambda (entity-set)
- (let ((key (gensym))
- (nc (normalize-components new-components)))
- (hash-set! (car entity-set) key nc)
- (register-components key (component-names nc) (cdr entity-set))
- (values
- entity-set
- (cons key nc)))))
+(define (new-entity entity-set . new-components)
+ (receive (new-set new-keys) (bongodb:insert entity-set (normalize-components new-components))
+ (values new-set (car new-keys))))
+
+(define (get-entity entity-set key)
+ (let ((entity (bongodb:find entity-set (bongodb:$eq '_id key))))
+ (and entity (car entity))))
(define (remove-entity key)
(lambda (entity-set)
(else
(modify-entities ((car changes) entity-set) (cdr changes)))))
-(export make-entity-set
- entity-list
- entity-count
- new-entity
- remove-entity
- set-entity
- set-entity-components
- remove-entity-components
- modify-entities)
-
;;; Making systems
(else
(run-wait (cdr thd) (cons (join-thread (car thd)) res)))))))
-(export entities-changes
- entities-changes?
- get-entities-changes
- find-entities-by-components
- define-system
- make-system
- join-systems
- thread-systems)
-
;;; Entities and components access inside systems
(define (get-component component-name entity)
(assoc-ref (cdr entity) component-name))
-
-(export get-key
- get-component)