X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_draw.lisp;h=8cff747d38ebc59bb222e10bd49b415d2ea3e1b4;hb=6a3d1ffb69036e6d4f1c239fd7d52f9bfc48d50c;hp=01181701575221b2b0dce1777b5e31bb32f99f56;hpb=3747c2cd2da9c0a618628fa649ece29830581464;p=gacela.git

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 0118170..8cff747 100644
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -77,6 +77,12 @@
 		      (SDL_FreeSurface image)
 		      (cond ((/= resized-image 0) (values resized-image width height))))))))))
 
+(defun resize-surface (surface width height)
+  (let ((old-width (surface-w surface)) (old-height (surface-h surface)))
+    (cond ((and (= width old-width) (= height old-height)) surface)
+	  (t (let ((zoomx (/ (+ width 0.5) old-width)) (zoomy (/ (+ height 0.5) old-height)))
+	       (zoomSurface surface zoomx zoomy 0))))))
+
 (defun load-texture (filename &key (min-filter GL_LINEAR) (mag-filter GL_LINEAR) static)
   (let ((key (make-resource-texture :filename filename :min-filter min-filter :mag-filter mag-filter)))
     (cond ((get-resource key) key)
@@ -106,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)))