X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela.scm;h=b9d13160dccac4bce3695d60fb0922e657d3393f;hb=2eee3eb546a25305d548fcb331769be84fd3a38f;hp=9096ddf88f4ee7401c16705d7e72f6479e7a4f82;hpb=0f5f0a460230c18782cc8e70fcd6fd0991cd09a1;p=gacela.git

diff --git a/src/gacela.scm b/src/gacela.scm
index 9096ddf..b9d1316 100644
--- a/src/gacela.scm
+++ b/src/gacela.scm
@@ -33,7 +33,6 @@
 	    game-loop
 	    gacela-script
 	    game-running?
-	    set-game-code
 	    show-mob-hash
 	    hide-mob-hash
 	    get-active-mobs
@@ -50,16 +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-code #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"))))
@@ -89,58 +87,85 @@
 (run-in-game-loop resize-screen)
 
 (define-macro (game . code)
-  `(let ((game-function ,(if (null? code)
-			     `(lambda () #f)
-			     `(lambda () ,@code))))
-     (set-game-code game-function)
-     (cond ((not (game-running?))
-	    (game-loop)))))
+  `(set! game-loop-procedure
+    ,(if (null? code)
+	 `#f
+	 `(lambda (game-elements) ,@code))))
 
 (define (init-gacela)
-  (hide-all-mobs)
-  (set-game-code (lambda () #f))
+;  (hide-all-mobs)
   (cond ((not game-loop-thread)
-	 (set! game-loop-thread (call-with-new-thread (lambda () (game))))))
-  (while (not loop-flag))
+	 (set! game-loop-thread (call-with-new-thread (lambda () (cond ((not (game-running?)) (game-loop))))))))
+  (while (not game-loop-flag))
   #t)
 
 (define (quit-gacela)
-  (hide-all-mobs)
-  (set-game-code (lambda () #f))
+;  (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)
-		(if (procedure? game-code)
-		    (catch #t
-			   (lambda () (game-code))
-			   (lambda (key . args) #f)))
-		(run-mobs)
-		(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 (set-game-code game-function)
-  (set! game-code game-function))
+(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
@@ -151,8 +176,9 @@
 (define *bpp-screen* 32)
 (define *frames-per-second* 20)
 (define *mode* '2d)
+(define *fullscreen* 'off)
 
-(define* (set-game-properties! #:key title width height bpp fps mode)
+(define* (set-game-properties! #:key title width height bpp fps mode fullscreen)
   (if title
       (set-screen-title! title))
   (if bpp
@@ -166,10 +192,12 @@
       (set-frames-per-second! fps))
   (if mode
       (if (eq? mode '3d) (set-3d-mode) (set-2d-mode)))
+  (if fullscreen
+      (set-fullscreen! fullscreen))
   (get-game-properties))
 
 (define (get-game-properties)
-  `((title . ,(get-screen-title)) (width . ,(get-screen-width)) (height . ,(get-screen-height)) (bpp . ,(get-screen-bpp)) (fps . ,(get-frames-per-second)) (mode . ,(if (3d-mode?) '3d '2d))))
+  `((title . ,(get-screen-title)) (width . ,(get-screen-width)) (height . ,(get-screen-height)) (bpp . ,(get-screen-bpp)) (fps . ,(get-frames-per-second)) (mode . ,(if (3d-mode?) '3d '2d)) (fullscreen . ,(get-fullscreen))))
 
 
 ;;; Mobs Factory
@@ -346,3 +374,9 @@
 (define-macro (define-scene name . body)
   `(define (,name)
      ,@body))
+
+
+(module-map (lambda (sym var)
+	      (if (not (eq? sym '%module-public-interface))
+		  (module-export! (current-module) (list sym))))
+	    (current-module))