X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela.scm;h=1a5a0d96fff0662c449c52e356200005b61b3df9;hb=65b948c4b2b72bbf86304e9e2d84e0527b69b97f;hp=d941351d811976f405714b5135fe3e74c682a847;hpb=f14c83835a29a6d94daf3b0dcfe88f59d8844e34;p=gacela.git

diff --git a/src/gacela.scm b/src/gacela.scm
index d941351..1a5a0d9 100644
--- a/src/gacela.scm
+++ b/src/gacela.scm
@@ -20,9 +20,7 @@
   #:use-module (gacela video)
   #:use-module (gacela audio)
   #:use-module (ice-9 optargs)
-  #:export (load-texture
-	    load-font
-	    *title*
+  #:export (*title*
 	    *width-screen*
 	    *height-screen*
 	    *bpp-screen*
@@ -35,7 +33,6 @@
 	    game-loop
 	    gacela-script
 	    game-running?
-	    set-game-code
 	    show-mob-hash
 	    hide-mob-hash
 	    get-active-mobs
@@ -52,64 +49,13 @@
 		   define-mob
 		   lambda-mob
 		   define-checking-mobs)
-  #:re-export (get-current-color
-	       get-texture-properties
-	       set-current-color
-	       with-color
-	       progn-textures
-	       draw
-	       draw-texture
-	       draw-line
-	       draw-quad
-	       draw-rectangle
-	       draw-square
-	       draw-cube
-	       translate
-	       rotate
-	       to-origin
-	       add-light
-	       set-camera
-	       camera-look
-	       render-text
-	       get-frame-time
-	       key?
-	       key-pressed?
-	       key-released?
+  #:re-export (get-frame-time
 	       3d-mode?))
 
 
-;;; Resources Cache
-
-(define resources-cache (make-weak-value-hash-table))
-
-(define (from-cache key)
-  (hash-ref resources-cache key))
-
-(define (into-cache key res)
-  (hash-set! resources-cache key res))
-
-(define-macro (use-cache-with module proc)
-  (let ((pwc (string->symbol (string-concatenate (list (symbol->string proc) "-without-cache")))))
-    `(begin
-       (define ,pwc (@ ,module ,proc))
-       (define (,proc . param)
-	 (let* ((key param)
-		(res (from-cache key)))
-	   (cond (res
-		  res)
-		 (else
-		  (set! res (apply ,pwc param))
-		  (into-cache key res)
-		  res)))))))
-
-(use-cache-with (gacela video) load-texture)
-(use-cache-with (gacela video) load-font)
-
-
 ;;; Main Loop
 
 (define loop-flag #f)
-(define game-code #f)
 (define game-loop-thread #f)
 
 (define-macro (run-in-game-loop proc)
@@ -140,49 +86,43 @@
 (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)))))
+  (if (null? code)
+      #f
+      `(call-with-new-thread (lambda () ,@code))))
 
 (define (init-gacela)
   (hide-all-mobs)
-  (set-game-code (lambda () #f))
   (cond ((not game-loop-thread)
-	 (set! game-loop-thread (call-with-new-thread (lambda () (game))))))
+	 (set! game-loop-thread (call-with-new-thread (lambda () (cond ((not (game-running?)) (game-loop))))))))
   (while (not loop-flag))
   #t)
 
 (define (quit-gacela)
   (hide-all-mobs)
-  (set-game-code (lambda () #f))
   (set! game-loop-thread #f)
-  (set! loop-flag #f))
+  (set! loop-flag #f)
+  (quit-video))
 
 (define (game-loop)
   (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)
+  (let loop ()
+    (cond (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))
+	   (process-events)
+	   (cond ((quit-signal?)
+		  (quit-gacela))
+		 (else
+		  (clear-screen)
+		  (to-origin)
+		  (refresh-active-mobs)
+		  (run-mobs)
+		  (run-extensions)
+		  (flip-screen)
+		  (delay-frame)
+		  (loop)))))))
 
 (define (gacela-script args)
   (while loop-flag (sleep 1)))
@@ -190,8 +130,25 @@
 (define (game-running?)
   loop-flag)
 
-(define (set-game-code game-function)
-  (set! game-code game-function))
+
+;;; 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
@@ -202,8 +159,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
@@ -217,10 +175,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
@@ -397,3 +357,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))