X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela%2Fimage.scm;h=6acff1dbe0e0d5717f7ae040f6d0de54e4d244f0;hb=7fb1ff434787d12f8e4111a44dfc684a0b94eac3;hp=1fa861f09b440746c45c3a11d82dfa3d4352f3a1;hpb=58fd4b161304ba4fe37581a4bb9e83547a35f40b;p=gacela.git

diff --git a/gacela/image.scm b/gacela/image.scm
index 1fa861f..6acff1d 100644
--- a/gacela/image.scm
+++ b/gacela/image.scm
@@ -23,13 +23,19 @@
   #:use-module ((sdl2 render) #:prefix sdl2:)
   #:use-module ((sdl2 surface) #:prefix sdl2:)
   #:use-module (gl)
-  #:export (bitmap
-            move-xy
-            stretch))
+  #:export (image
+            move
+            scale
+            over))
 
-(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)
@@ -41,6 +47,9 @@
          (set! h/2 (/ (sdl2:surface-height image) 2)))
        (gl-enable (oes-framebuffer-object texture-2d))
        (sdl2:bind-texture texture)
+       (gl-enable (oes-framebuffer-object blend))
+       (set-gl-blend-function (blending-factor-src src-alpha)
+                              (blending-factor-dest one-minus-src-alpha))
        (gl-begin (begin-mode quads)
          (gl-texture-coordinates 0 0)
          (gl-vertex (- w/2) h/2 0)
@@ -50,21 +59,31 @@
          (gl-vertex w/2 (- h/2) 0)
          (gl-texture-coordinates 0 1)
          (gl-vertex (- w/2) (- h/2) 0))
+       (gl-disable (oes-framebuffer-object blend))
        (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))))
+
+(define (over . scenes)
+  (make-scene
+   "over"
+   (lambda ()
+     (let display ((sc scenes))
+       (cond ((not (null? sc))
+              (with-gl-push-matrix
+               (display-scene (car sc)))
+              (display (cdr sc))))))))