X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela%2Fimage.scm;h=e6c8f4ef74a38fbf24a59213656ec51d8645facf;hb=a586780bf88efb2a54df1e2af26600a549f7113d;hp=1fa861f09b440746c45c3a11d82dfa3d4352f3a1;hpb=cb3f530e232d5f72e971df88613daf17ccbac445;p=gacela.git

diff --git a/gacela/image.scm b/gacela/image.scm
index 1fa861f..e6c8f4e 100644
--- a/gacela/image.scm
+++ b/gacela/image.scm
@@ -23,13 +23,18 @@
   #:use-module ((sdl2 render) #:prefix sdl2:)
   #:use-module ((sdl2 surface) #:prefix sdl2:)
   #:use-module (gl)
-  #:export (bitmap
-            move-xy
-            stretch))
+  #:export (image
+            move
+            scale))
 
-(define (bitmap filename)
+(define (calculate proc-or-value)
+  (if (procedure? proc-or-value)
+      (proc-or-value)
+      proc-or-value))
+
+(define (image filename)
   (make-scene
-   "bitmap"
+   "image"
    (let ((image (sdl2:load-image filename))
          (texture #f)
          (w/2 0)
@@ -52,19 +57,18 @@
          (gl-vertex (- w/2) (- h/2) 0))
        (gl-disable (oes-framebuffer-object texture-2d))))))
 
-(define (move-xy x y scene)
-  (define (to-integer n)
-    (inexact->exact (round n)))
+(define* (move scene x y #:optional (z 0))
   (make-scene
-   "move-xy"
+   "move"
    (lambda ()
-     (let ((xy (list (to-integer (if (procedure? x) (x) x))
-                     (to-integer (if (procedure? y) (y) y)))))
-       (display-scene scene #:xy xy)))))
+     (gl-translate (calculate x)
+                   (calculate y)
+                   (calculate z))
+     (display-scene scene))))
 
-(define* (stretch scene x #:optional (y x) (z y))
+(define* (scale scene x #:optional (y x) (z y))
   (make-scene
-   "stretch"
+   "scale"
    (lambda ()
      (gl-scale x y z)
      (display-scene scene))))