X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgacela.scm;h=9bea00ec2506d0487d83dc93734aac7f97ef4a68;hb=91e03880066280940b29a89eae28510e124e58cb;hp=26a1e9cf93bd1935d17d289c78e090f0f461b308;hpb=4ae3375d30bc921cb397feef4024c84ef29f9b74;p=gacela.git

diff --git a/src/gacela.scm b/src/gacela.scm
index 26a1e9c..9bea00e 100644
--- a/src/gacela.scm
+++ b/src/gacela.scm
@@ -17,15 +17,18 @@
 
 ;;; Default values for Gacela
 
+(define *title* "Gacela")
 (define *width-screen* 640)
 (define *height-screen* 480)
 (define *bpp-screen* 32)
 (define *frames-per-second* 20)
+(define *mode* '2d)
 
 
 ;;; SDL Initialization Subsystem
 
 (define init-sdl #f)
+(define sdl-on? #f)
 (define quit-sdl #f)
 
 (let ((initialized #f))
@@ -34,6 +37,10 @@
 	  (cond ((not initialized) (SDL_Init SDL_INIT_EVERYTHING) (set! initialized #t))
 		(else initialized))))
 
+  (set! sdl-on?
+	(lambda ()
+	  (if initialized #t #f)))
+
   (set! quit-sdl
 	(lambda ()
 	  (SDL_Quit)
@@ -76,7 +83,9 @@
 			(resize-screen-GL width height)))))
 
   (set! quit-video-mode
-	(lambda () (set! screen #f))))
+	(lambda ()
+	  (SDL_FreeSurface screen)
+	  (set! screen #f))))
 
 (define (set-2d-mode)
   (cond ((not (3d-mode?))
@@ -105,8 +114,9 @@
   (glClearColor 0 0 0 0)
 ;  (glClearDepth 1)
 ;  (glDepthFunc GL_LEQUAL)
-;  (glEnable GL_BLEND)
+  (glEnable GL_BLEND)
 ;  (glBlendFunc GL_SRC_ALPHA GL_ONE)
+  (glBlendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA)
   (glHint GL_PERSPECTIVE_CORRECTION_HINT GL_NICEST)
   #t)
 
@@ -139,22 +149,6 @@
 	  (set! current-color (list red green blue alpha))
 	  (glColor4f red green blue alpha))))
 
-(define* (load-image image-file #:key transparent-color)
-  (init-video-mode)
-  (let ((loaded-image (IMG_Load image-file)))
-    (cond ((= loaded-image 0) #f)
-	  (else (let ((optimized-image (SDL_DisplayFormat loaded-image)))
-		  (SDL_FreeSurface loaded-image)
-		  (cond ((= optimized-image 0) #f)
-			((not transparent-color) optimized-image)
-			(else (SDL_SetColorKey optimized-image
-					       SDL_SRCCOLORKEY
-					       (SDL_MapRGB (surface-format optimized-image)
-							   (car transparent-color)
-							   (cadr transparent-color)
-							   (caddr transparent-color)))
-			      optimized-image)))))))
-
 
 ;;; Audio Subsystem
 
@@ -175,11 +169,6 @@
 
 ;;; GaCeLa Functions
 
-(define (init-gacela)
-  (init-sdl)
-  (init-gl))
-
-
 (define set-frames-per-second #f)
 (define init-frame-time #f)
 (define delay-frame #f)
@@ -203,7 +192,7 @@
 (define set-game-properties #f)
 (define get-game-properties #f)
 
-(let ((ptitle "") (pwidth *width-screen*) (pheight *height-screen*) (pbpp *bpp-screen*) (pfps *frames-per-second*) (pmode '2d))
+(let ((ptitle *title*) (pwidth *width-screen*) (pheight *height-screen*) (pbpp *bpp-screen*) (pfps *frames-per-second*) (pmode *mode*))
   (set! set-game-properties
 	(lambda* (#:key title width height bpp fps mode)
 ;	  (init-video-mode)
@@ -251,19 +240,25 @@
 	(lambda ()
 	  (set! mobs (get-active-mobs))
 	  (set! running #t)
-	  (quit? #f)
+	  (quit! #f)
 	  (do () ((quit?))
 	    (init-frame-time)
-;	    (check-connections)
-;	    (eval-from-clients)
+	    (check-connections)
+	    (eval-from-clients)
 	    (process-events)
 	    (cond ((not (quit?))
-		   (glClear (+ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT))
-		   (to-origin)
+		   (cond ((video-mode-on?)
+			  (glClear (+ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT))
+			  (to-origin)))
 		   (cond ((mobs-changed?) (set! mobs (get-active-mobs))))
-		   (if (procedure? game-code) (game-code))
-		   (process-mobs mobs)
-		   (SDL_GL_SwapBuffers)
+		   (if (procedure? game-code)
+		       (catch #t
+			      (lambda () (game-code))
+			      (lambda (key . args) #f)))
+		   (run-mob-actions mobs)
+		   (cond ((video-mode-on?)
+			  (render-mobs mobs)
+			  (SDL_GL_SwapBuffers)))
 		   (delay-frame))))
 	  (set! running #f)))
 
@@ -274,12 +269,3 @@
   (set! set-game-code
 	(lambda (game-function)
 	  (set! game-code game-function))))
-
-(define (quit-game)
-   (quit-audio)
-   (quit-video-mode)
-;  (quit-all-mobs)
-;   (kill-all-objects)
-;   (clear-events)
-   (quit-events)
-   (quit-sdl))