X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela.scm;h=b9d13160dccac4bce3695d60fb0922e657d3393f;hb=1c898284a9d3ea84cda71e4ff3c6f39c0bba644b;hp=2b9a19ed975e43a2053c49ee78885552b3e19bc3;hpb=3bd2b76b06df2cae29900e213924b02b46ffcd3e;p=gacela.git

diff --git a/src/gacela.scm b/src/gacela.scm
index 2b9a19e..b9d1316 100644
--- a/src/gacela.scm
+++ b/src/gacela.scm
@@ -18,7 +18,6 @@
 (define-module (gacela gacela)
   #:use-module (gacela events)
   #:use-module (gacela video)
-  #:use-module ((gacela video) #:renamer (symbol-prefix-proc 'video:))
   #:use-module (gacela audio)
   #:use-module (ice-9 optargs)
   #:export (*title*
@@ -50,15 +49,15 @@
 		   define-mob
 		   lambda-mob
 		   define-checking-mobs)
-  #:re-export (translate
-	       get-frame-time
+  #:re-export (get-frame-time
 	       3d-mode?))
 
 
 ;;; Main Loop
 
-(define loop-flag #f)
+(define game-loop-flag #f)
 (define game-loop-thread #f)
+(define game-loop-procedure #f)
 
 (define-macro (run-in-game-loop proc)
   (let ((pgl (string->symbol (string-concatenate (list (symbol->string proc) "-in-game-loop"))))
@@ -88,47 +87,85 @@
 (run-in-game-loop resize-screen)
 
 (define-macro (game . code)
-  (if (null? code)
-      #f
-      `(call-with-new-thread (lambda () ,@code))))
+  `(set! game-loop-procedure
+    ,(if (null? code)
+	 `#f
+	 `(lambda (game-elements) ,@code))))
 
 (define (init-gacela)
-  (hide-all-mobs)
+;  (hide-all-mobs)
   (cond ((not game-loop-thread)
 	 (set! game-loop-thread (call-with-new-thread (lambda () (cond ((not (game-running?)) (game-loop))))))))
-  (while (not loop-flag))
+  (while (not game-loop-flag))
   #t)
 
 (define (quit-gacela)
-  (hide-all-mobs)
+;  (hide-all-mobs)
   (set! game-loop-thread #f)
-  (set! loop-flag #f))
+  (set! game-loop-flag #f)
+  (quit-video))
 
 (define (game-loop)
-  (refresh-active-mobs)
+;  (refresh-active-mobs)
   (init-video *width-screen* *height-screen* *bpp-screen* #:title *title* #:mode *mode* #:fps *frames-per-second*)
-  (set! loop-flag #t)
-  (while loop-flag
-	 (init-frame-time)
+  (set! game-loop-flag #t)
+  (let loop ((game-elements '()))
+    (cond (game-loop-flag
+	   (init-frame-time)
 ;	    (check-connections)
-	 (process-events)
-	 (cond ((quit-signal?)
-		(quit-gacela))
-	       (else
-		(clear-screen)
-		(to-origin)
-		(refresh-active-mobs)
-		(run-mobs)
-		(draw-bricks)
-		(flip-screen)
-		(delay-frame))))
-  (quit-video))
-
-(define (gacela-script args)
-  (while loop-flag (sleep 1)))
+	   (process-events)
+	   (cond ((quit-signal?)
+		  (quit-gacela))
+		 (else
+		  (clear-screen)
+		  (to-origin)
+;		  (refresh-active-mobs)
+;		  (run-mobs)
+;		  (run-extensions)
+		  (if game-loop-procedure
+		      (catch #t
+			     (lambda () (set! game-elements (game-loop-procedure game-elements)))
+			     (lambda (key . args) #f)))
+		  (process-game-elements game-elements)
+		  (flip-screen)
+		  (delay-frame)
+		  (loop game-elements)))))))
 
 (define (game-running?)
-  loop-flag)
+  game-loop-flag)
+
+(define (process-game-elements elements)
+  (cond ((not (list? elements))
+	 (process-game-elements (list elements)))
+	(else
+	 (draw-meshes (filter (lambda (e) (mesh? e)) elements)))))
+
+(define (draw-meshes meshes)
+  (cond ((null? meshes) #t)
+	(else
+	 (catch #t
+		(lambda () (mesh-draw (car meshes)))
+		(lambda (key . args) #f))
+	 (draw-meshes (cdr meshes)))))
+
+;;; Extensions to main loop
+
+(define extensions '())
+
+(define (add-extension! proc pri)
+  "Add an extension with a priority to the main loop"
+  (set! extensions
+	(sort (assoc-set! extensions proc pri)
+	      (lambda (a b)
+		(< (cdr a) (cdr b))))))
+
+(define (remove-extension! proc)
+  "Remove an extension from the main loop"
+  (set! extensions
+	(assoc-remove! extensions proc)))
+
+(define (run-extensions)
+  (for-each (lambda (x) ((car x))) extensions))
 
 
 ;;; Game Properties
@@ -339,35 +376,6 @@
      ,@body))
 
 
-;;; Bricks Factory
-
-(define active-bricks '())
-
-(define* (draw-bricks #:optional (bricks active-bricks))
-  (cond ((not (null? bricks))
-	 ((car bricks))
-	 (draw-bricks (cdr bricks)))))
-
-(define-macro (show-brick brick-name)
-  `(set! active-bricks (cons (lambda () (,brick-name)) active-bricks)))
-
-(define-macro (simple-brick brick-code)
-  (let ((name (gensym)))
-    `(begin
-       (define (,name)
-	 ,brick-code)
-       (show-brick ,name)
-       ,name)))
-
-
-;;; Primitive bricks
-
-(define-macro (draw-square . args)
-  `(simple-brick (apply video:draw-square ',args)))
-
-(re-export video:draw-square)
-
-
 (module-map (lambda (sym var)
 	      (if (not (eq? sym '%module-public-interface))
 		  (module-export! (current-module) (list sym))))