X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fengine.scm;h=4e311a0d9db97ca872e2cf9bfa162bca67d9e262;hb=0cf99813777069f2fce8fe895fbbdcaaf98699eb;hp=13b5dc83ff6c80db717656fd10d28d97263161a9;hpb=3b8bea0edf160748d20a12e3b1e7e3503a33da7b;p=gacela.git

diff --git a/src/engine.scm b/src/engine.scm
index 13b5dc8..4e311a0 100644
--- a/src/engine.scm
+++ b/src/engine.scm
@@ -25,21 +25,30 @@
 
 ;;; Engine definitions
 
+(define (default-delay) 0.1)
+
+(define-component engine-inner-properties
+  delay)
+
 (define-record-type engine
-  (make-engine-record entities mutex system)
+  (make-engine-record entities mutex running-mutex system)
   engine?
   (entities engine-entities set-engine-entities!)
   (mutex engine-mutex set-engine-mutex!)
+  (running-mutex engine-running-mutex set-engine-running-mutex!)
   (system engine-system set-engine-system!))
 
 (set-record-type-printer! engine
   (lambda (record port)
-    (format port "#<[engine] entities: ~a>"
+    (format port "#<[engine] state: ~a, entities: ~a>"
+	    (if (engine-running? record) "Running" "Stopped")
 	    (length (car (engine-entities record))))))
 
 (define (make-engine . systems)
   (make-engine-record
-   '(() ())
+   (receive (e c) ((new-entity (make-engine-inner-properties (default-delay))) '() '())
+     (list e c))
+   (make-mutex)
    (make-mutex)
    (if (not (= (length systems) 1))
        (join-systems systems)
@@ -51,16 +60,111 @@
      (define name
        (make-engine system ...)))))
 
+(define (engine-running? engine)
+  (mutex-locked? (engine-running-mutex engine)))
+
 (export make-engine
-	define-engine)
+	define-engine
+	engine-running?)
+
+(export-component engine-inner-properties)
 
 
 ;;; Engine Access Protocol Interface
 
-(define (with-engine engine . changes)
-  (with-mutex (engine-mutex engine)
-    (let ((entities (engine-entities engine)))
-      (receive (e c) (modify-entities changes (car entities) (cadr entities))
-        (set-engine-entities! engine (list e c))))))
+(define current-engine-mutex (make-mutex))
+(define current-engine-list '())
+
+(define (current-engine)
+  (with-mutex current-engine-mutex
+    (assoc-ref current-engine-list (current-thread))))
+
+(define (set-current-engine! engine)
+  (with-mutex current-engine-mutex
+    (set! current-engine-list
+	  (cond (engine
+		 (assoc-set! current-engine-list (current-thread) engine))
+		(else
+		 (assoc-remove! current-engine-list (current-thread)))))))
+
+(define* (get-entity key #:key (engine (current-engine)))
+  (assoc key (car (engine-entities engine))))
+
+(define* (get-entities-by-components component-types #:key (engine (current-engine)))
+  (map (lambda (e)
+	 (get-entity e #:engine engine))
+       (find-entities-by-components (cadr (engine-entities engine)) component-types)))
+
+(define-syntax define-entity-setter
+  (syntax-rules ()
+    ((_ name! name)
+     (define (name! . args)
+       (let ((f (apply name args))
+	     (engine (current-engine)))
+	 (receive (e c r) (f (car (engine-entities engine)) (cadr (engine-entities engine)))
+	   (set-engine-entities! engine (list e c))
+	   r))))))
+
+(define-entity-setter new-entity! new-entity)
+(define-entity-setter remove-entity! remove-entity)
+(define-entity-setter set-entity! set-entity)
+(define-entity-setter set-entity-components! set-entity-components)
+(define-entity-setter remove-entity-components! remove-entity-components)
+
+(define-syntax with-engine
+  (syntax-rules ()
+    ((_ engine body ...)
+     (let ((old-engine (current-engine)))
+       (set-current-engine! engine)
+       (let ((res (with-mutex (engine-mutex engine)
+		    body
+		    ...)))
+	 (set-current-engine! old-engine)
+	 res)))))
+
+(export current-engine
+	set-current-engine!
+	get-entity
+	get-entities-by-components
+	new-entity!
+	remove-entity!
+	set-entity!
+	set-entity-components!
+	remove-entity-components!
+	with-engine)
+
+
+;;; Engine execution
+
+(define (start-engine engine)
+  (cond ((not (engine-running? engine))
+	 (with-mutex (engine-running-mutex engine)
+	   (let loop ()
+	     (let ((delay 0))
+	       (with-engine engine
+	         (receive (e c) ((apply (engine-system engine) (engine-entities engine)))
+		   (set-engine-entities! engine (list e c)))
+		 (set! delay (engine-inner-properties-delay (get-component 'engine-inner-properties (car (get-entities-by-components '(engine-inner-properties)))))))
+	       (usleep (inexact->exact (* delay 1000000))))
+	     (if (not (engine-stopping? engine #:clean #t))
+		 (loop)))))))
+
+(define (stop-engine engine)
+  (with-engine engine
+    (new-entity! '(engine-halt . #t)))
+  'engine-halt)
+
+(define* (engine-stopping? engine #:key (clean #f))
+  (let ((halt #f))
+    (with-engine engine
+      (let halt-engine ((halts (get-entities-by-components '(engine-halt))))
+	(cond ((not (null? halts))
+	       (set! halt #t)
+	       (cond (clean
+		      (remove-entity! (caar halts))
+		      (halt-engine (cdr halts))))))))
+    halt))
 
-(export with-engine)
+(export start-engine
+	stop-engine
+	engine-stopping?)