Rename bitmap -> image and stretch -> scale

diff --git a/examples/01-hello-world/01-hello-world.scm b/examples/01-hello-world/01-hello-world.scm
index 61263f13ed08f72a263e2a54b8a66181c602e3c8..2a18040b2790ea0d8230b222b8eeaa46186096a0 100644 (file)
--- a/examples/01-hello-world/01-hello-world.scm
+++ b/examples/01-hello-world/01-hello-world.scm
@@ -21,4 +21,4 @@
 
 (display-scene
  (window ((resolution '(640 480)))
-   (bitmap "hello-world.bmp")))
+   (image "hello-world.bmp")))

diff --git a/examples/02-event-driven-programming/02-event-driven-programming.scm b/examples/02-event-driven-programming/02-event-driven-programming.scm
index b15123368cbafcdf90ae2a4f47761976a673db88..a75eddfd5770e99d9f75e3592c82275a06c7b796 100644 (file)
--- a/examples/02-event-driven-programming/02-event-driven-programming.scm
+++ b/examples/02-event-driven-programming/02-event-driven-programming.scm
@@ -31,4 +31,4 @@
 (display-scene
  (window ((resolution '(640 480))
          (when-quit counter-quit))
-   (bitmap "x.bmp")))
+   (image "x.bmp")))

diff --git a/examples/03-key-presses/03-key-presses.scm b/examples/03-key-presses/03-key-presses.scm
index 06fa1868ab8c1e8271646eb30e6de8b36293f399..ed8a65d8ea24d210f780a7702a591035c71c077d 100644 (file)
--- a/examples/03-key-presses/03-key-presses.scm
+++ b/examples/03-key-presses/03-key-presses.scm
@@ -23,11 +23,11 @@
 (define get-pressed-scene #f)
 
 (set! get-pressed-scene
-  (let* ((up (bitmap "up.bmp"))
-        (down (bitmap "down.bmp"))
-        (left (bitmap "left.bmp"))
-        (right (bitmap "right.bmp"))
-        (press (bitmap "press.bmp"))
+  (let* ((up (image "up.bmp"))
+        (down (image "down.bmp"))
+        (left (image "left.bmp"))
+        (right (image "right.bmp"))
+        (press (image "press.bmp"))
         (actived press))
     (lambda ()
       (if (any-key-down?)
@@ -43,8 +43,6 @@
                 (set! actived press))))
       actived)))
 
-(define press (bitmap "press.bmp"))
-
 (display-scene
  (window ((resolution '(640 480)))
    (lambda ()

diff --git a/examples/04-stretch-images/04-stretch-images.scm b/examples/04-stretch-images/04-stretch-images.scm
index e23daef7eb29dbb4985a9f14ddf9f6865e2f6843..6676e1da324d7115547991d37082e562a8a393c6 100644 (file)
--- a/examples/04-stretch-images/04-stretch-images.scm
+++ b/examples/04-stretch-images/04-stretch-images.scm
@@ -21,6 +21,6 @@
 
 (display-scene
  (window ((resolution '(640 480)))
-   (stretch
-    (bitmap "stretch.bmp")
+   (scale
+    (image "stretch.bmp")
     2)))

diff --git a/gacela/image.scm b/gacela/image.scm
index 1fa861f09b440746c45c3a11d82dfa3d4352f3a1..278a7d767846db11e4a92af2d6fe3f7769593cfb 100644 (file)
--- a/gacela/image.scm
+++ b/gacela/image.scm
@@ -23,13 +23,13 @@
   #:use-module ((sdl2 render) #:prefix sdl2:)
   #:use-module ((sdl2 surface) #:prefix sdl2:)
   #:use-module (gl)
-  #:export (bitmap
+  #:export (image
             move-xy
-            stretch))
+            scale))
 
-(define (bitmap filename)
+(define (image filename)
   (make-scene
-   "bitmap"
+   "image"
    (let ((image (sdl2:load-image filename))
          (texture #f)
          (w/2 0)
@@ -62,9 +62,9 @@
                      (to-integer (if (procedure? y) (y) y)))))
        (display-scene scene #:xy xy)))))
 
-(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))))