From cb3f530e232d5f72e971df88613daf17ccbac445 Mon Sep 17 00:00:00 2001
From: Javier Sancho <jsf@jsancho.org>
Date: Tue, 18 Apr 2017 20:08:55 +0200
Subject: [PATCH] Stretch scene

---
 .../04-stretch-images/04-stretch-images.scm   |  26 ++++++++++++++++++
 examples/04-stretch-images/stretch.bmp        | Bin 0 -> 230456 bytes
 gacela/image.scm                              |  12 ++++++--
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 examples/04-stretch-images/04-stretch-images.scm
 create mode 100755 examples/04-stretch-images/stretch.bmp

diff --git a/examples/04-stretch-images/04-stretch-images.scm b/examples/04-stretch-images/04-stretch-images.scm
new file mode 100644
index 0000000..e23daef
--- /dev/null
+++ b/examples/04-stretch-images/04-stretch-images.scm
@@ -0,0 +1,26 @@
+#!/usr/bin/env guile
+!#
+
+;;; Gacela, a GNU Guile extension for fast games development
+;;; Copyright (C) 2017 by Javier Sancho Fernandez <jsf at jsancho dot org>
+;;;
+;;; This program is free software: you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation, either version 3 of the License, or
+;;; (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(use-modules (gacela))
+
+(display-scene
+ (window ((resolution '(640 480)))
+   (stretch
+    (bitmap "stretch.bmp")
+    2)))
diff --git a/examples/04-stretch-images/stretch.bmp b/examples/04-stretch-images/stretch.bmp
new file mode 100755
index 0000000000000000000000000000000000000000..8457f1917ab795c4566000b8d72bfacc0e61cc40
GIT binary patch
literal 230456
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
DEL%I{

literal 0
HcmV?d00001

diff --git a/gacela/image.scm b/gacela/image.scm
index 40d4075..1fa861f 100644
--- a/gacela/image.scm
+++ b/gacela/image.scm
@@ -24,7 +24,8 @@
   #:use-module ((sdl2 surface) #:prefix sdl2:)
   #:use-module (gl)
   #:export (bitmap
-            move-xy))
+            move-xy
+            stretch))
 
 (define (bitmap filename)
   (make-scene
@@ -33,7 +34,7 @@
          (texture #f)
          (w/2 0)
          (h/2 0))
-     (lambda* ()
+     (lambda ()
        (when (not texture)
          (set! texture (sdl2:surface->texture %sdl-renderer image))
          (set! w/2 (/ (sdl2:surface-width image) 2))
@@ -60,3 +61,10 @@
      (let ((xy (list (to-integer (if (procedure? x) (x) x))
                      (to-integer (if (procedure? y) (y) y)))))
        (display-scene scene #:xy xy)))))
+
+(define* (stretch scene x #:optional (y x) (z y))
+  (make-scene
+   "stretch"
+   (lambda ()
+     (gl-scale x y z)
+     (display-scene scene))))
-- 
2.39.5