(no commit message)

diff --git a/gacela.lisp b/gacela.lisp
index 31fe8abada40e5140ebbe26211e557660dbe5995..f174a48a53179c1bada10dfab85a2b707a146332 100644 (file)
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -154,6 +154,9 @@
 (defun make-resource-font (&key filename encoding)
   `(:type font :filename ,filename :enconding ,encoding))
 
+(defun make-resource-sound (&key filename)
+  `(:type sound :filename ,filename))
+
 (defmacro get-rtime (key)
   `(resource-time (gethash ,key resources-table)))
 

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 559412b8b7f386712ecf4b55f1e38564ac5b84a3..8cff747d38ebc59bb222e10bd49b415d2ea3e1b4 100644 (file)
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -112,13 +112,15 @@
                             :static static)
               key)))))))
 
-(defun draw-image-function (filename)
+(defun draw-image (filename &ptional (zoom 1))
   (let ((texture (load-texture filename)))
-    (lambda (&optional (f 1))
-      (cond (texture
-            (let ((width (getf (get-resource texture) :width))
-                  (height (getf (get-resource texture) :height)))
-              (draw-rectangle (* f width) (* f height) :texture texture)))))))
+    (cond (texture (draw-texture texture zoom)))))
+
+(defun draw-texture (texture &optional (zoom 1))
+  (cond (texture
+        (let ((width (getf (get-resource texture) :width))
+              (height (getf (get-resource texture) :height)))
+          (draw-rectangle (* zoom width) (* zoom height) :texture texture)))))
 
 (defun draw-quad (v1 v2 v3 v4 &key texture)
   (let ((id-texture (getf (get-resource texture) :id-texture)))

diff --git a/gacela_sound.lisp b/gacela_sound.lisp
index ae9b72ba57c164dac08de9de1fc32200b91c4f72..e0cdf56137b1d216efd3640bac3ab60738a68b86 100644 (file)
--- a/gacela_sound.lisp
+++ b/gacela_sound.lisp
@@ -20,3 +20,20 @@
           (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
 
+(defun load-sound (filename &key static)
+  (let ((key (make-resource-sound :filename filename)))
+    (cond ((get-resource key) key)
+         (t (true-load-sound filename static)))))
+
+(defun true-load-sound (filename static)
+  (init-audio)
+  (let ((key (make-resource-sound :filename filename))
+       (sound (Mix_LoadWAV filename)))
+    (cond ((/= sound 0)
+          (set-resource key
+                        `(:id-sound ,sound)
+                        (lambda () (true-load-sound filename static))
+                        (lambda () (Mix_FreeChunk sound))
+                        :static static)
+          key))))
+

diff --git a/gacela_tetris.lisp b/gacela_tetris.lisp
index 9d67a1d986950ee5bb89f26fbb973612d2c1ace4..5435e96bfb8678bb6b651d52dcb6b3ee54a83eb3 100644 (file)
--- a/gacela_tetris.lisp
+++ b/gacela_tetris.lisp
@@ -119,8 +119,8 @@
       (next (random-tetramine))
       (timer (make-timer))
       (grid (make-list 20 :initial-element (make-list 14)))
-      (background (draw-image-function "fondo_tetris.png"))
-;      (background (draw-image-function "../../nehe/lesson06/data/nehe.bmp"))
+      (background (load-texture "fondo_tetris.png"))
+;      (background (load-texture "../../nehe/lesson06/data/nehe.bmp"))
       (font (load-font "lazy.ttf" :size 20))
       (game-over))
 
@@ -156,7 +156,7 @@
                  (cond ((collide-grids tetramine grid x y) (setq game-over t)))
                  (setq next (random-tetramine)))
                 (t (incf y) (start-timer timer)))))
-    (funcall background)
+    (draw-texture background)
     (translate -288 218)
     (draw-grid (join-grids tetramine grid x y))
     (translate 440 440)