X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela%2Fimage.scm;h=b1ee674bbe501fe38e8b514277665d49c3c2485d;hb=dd1b9bdb7e499be3f8ed0192469ad3684f5ca22d;hp=6a9710101009f7014360f0ca2ab21c69f2fa3655;hpb=e07174ebbc0c612e7b88ae75e261e14a52b686fd;p=gacela.git

diff --git a/gacela/image.scm b/gacela/image.scm
index 6a97101..b1ee674 100644
--- a/gacela/image.scm
+++ b/gacela/image.scm
@@ -17,21 +17,33 @@
 
 (define-module (gacela image)
   #:use-module (gacela scene)
+  #:use-module (gacela game)
+  #:use-module ((sdl2) #:prefix sdl2:)
+  #:use-module ((sdl2 image) #:prefix sdl2:)
+  #:use-module ((sdl2 render) #:prefix sdl2:)
   #:use-module ((sdl2 surface) #:prefix sdl2:)
-  #:export (import-bitmap
+  #:export (bitmap
 	    move-xy))
 
-(define-syntax-rule (import-bitmap filename)
+(define (bitmap filename)
   (make-scene
    "bitmap"
-   (let ((surface (sdl2:load-bmp filename)))
+   (let ((image (sdl2:load-image filename))
+	 (texture #f))
      (let ((a 0))
-       (lambda ()
-	 (set! a (+ a 1))
-	 (format #t "Steps: ~a~%" a))))))
+       (lambda* (#:key (xy '(0 0)))
+	 (if (not texture)
+	     (set! texture (sdl2:surface->texture %sdl-renderer image)))
+	 (sdl2:clear-renderer %sdl-renderer)
+	 (sdl2:render-copy %sdl-renderer texture #:dest-rect (sdl2:make-rect (car xy) (cadr xy) (sdl2:surface-width image) (sdl2:surface-height image)))
+	 (sdl2:present-renderer %sdl-renderer))))))
 
-(define-syntax-rule (move-xy x y scene)
+(define (move-xy x y scene)
+  (define (to-integer n)
+    (inexact->exact (round n)))
   (make-scene
    "move-xy"
    (lambda ()
-     (display-scene scene))))
+     (let ((xy (list (to-integer (if (procedure? x) (x) x))
+		     (to-integer (if (procedure? y) (y) y)))))
+       (display-scene scene #:xy xy)))))