X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela%2Fgame.scm;h=dd7886cc150e5f230bf3ed5c3c97318c0aa8f4da;hb=475d22be2375535402165d3373fae03a028886f2;hp=0b0981dec6ed25eff1565991e78c6e4727644392;hpb=e07174ebbc0c612e7b88ae75e261e14a52b686fd;p=gacela.git

diff --git a/gacela/game.scm b/gacela/game.scm
index 0b0981d..dd7886c 100644
--- a/gacela/game.scm
+++ b/gacela/game.scm
@@ -17,13 +17,15 @@
 
 (define-module (gacela game)
   #:use-module (gacela math)
+  #:use-module (gacela event)
   #:use-module ((sdl2) #:prefix sdl2:)
   #:use-module ((sdl2 render) #:prefix sdl2:)
   #:use-module ((sdl2 surface) #:prefix sdl2:)
   #:use-module ((sdl2 video) #:prefix sdl2:)
   #:use-module (gl)
   #:use-module (srfi srfi-11)
-  #:export (run-game-loop))
+  #:export (play-game
+	    %sdl-renderer))
 
 
 ;;; Based on Sly code. Thank you so much!!
@@ -71,7 +73,7 @@ unused accumulator time."
 	(cond ((>= ticks max-ticks-per-frame)
 	       lag)
 	      ((>= lag tick-interval)
-					;(process-events)
+	       (process-events)
 					;(agenda-tick!)
 	       (iter (- lag tick-interval) (1+ ticks)))
 	      (else
@@ -117,8 +119,6 @@ milliseconds of the last iteration of the game loop."
 	  (lambda (signum)
 	    (stop-game-loop)))
 	(set! %root-scene scene)
-	(init-window)
-	(open-window)
 	(game-loop (sdl2:sdl-ticks) 0))
       (lambda (cont callback)
 	(when (procedure? callback)
@@ -129,11 +129,13 @@ milliseconds of the last iteration of the game loop."
   (abort-to-prompt 'game-loop-prompt #f))
 
 (define %sdl-window #f)
+(define %sdl-renderer #f)
 (define %gl-context #f)
 
 (define (init-window)
   (sdl2:sdl-init)
   (set! %sdl-window (sdl2:make-window #:opengl? #t #:show? #t))
+  (set! %sdl-renderer (sdl2:make-renderer %sdl-window))
   (sdl2:set-gl-attribute! 'context-major-version 3)
   (sdl2:set-gl-attribute! 'context-minor-version 2)
   (sdl2:set-gl-attribute! 'double-buffer 1)
@@ -146,3 +148,13 @@ milliseconds of the last iteration of the game loop."
   (sdl2:set-window-size! %sdl-window resolution)
   (sdl2:set-window-fullscreen! %sdl-window fullscreen?)
   (sdl2:show-window! %sdl-window))
+
+(define (close-window)
+  (sdl2:hide-window! %sdl-window)
+  (sdl2:sdl-quit))
+
+(define (play-game scene)
+  (init-window)
+  (open-window)
+  (run-game-loop scene)
+  (close-window))