X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_draw.lisp;h=c984948fbbfa351a9aab7bd0cfc4dba3390d85d7;hb=4fe9bd9e78b0e3cee1133da2abcb05bc98322b31;hp=31790dabbb8c2de7d0e512ca4e2af42405403511;hpb=18b7b395aeba9aabdd47c52a0ae6bcd7d0f78f00;p=gacela.git

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 31790da..c984948 100644
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -34,6 +34,14 @@
      ,@code
      (apply #'set-current-color original-color)))
 
+(defmacro progn-textures (&body code)
+  `(let (values)
+     (init-video-mode)
+     (glEnable GL_TEXTURE_2D)
+     (setq values (multiple-value-list (progn ,@code)))
+     (glDisable GL_TEXTURE_2D)
+     (apply #'values values)))
+
 (defun draw (&rest vertexes)
   (begin-draw (length vertexes))
   (draw-vertexes vertexes)
@@ -101,15 +109,17 @@
 	       key)))))))
 
 (defun draw-image-function (filename)
-  (multiple-value-bind
-   (texture width height) (load-texture filename)
-   (lambda (&optional (f 1))
-     (cond (texture
-	    (draw-rectangle (* f width) (* f height) :texture texture))))))
+  (let ((texture (load-texture filename)))
+    (lambda (&optional (f 1))
+      (cond (texture
+	     (let ((width (getf (get-resource texture) :width))
+		   (height (getf (get-resource texture) :height)))
+(print texture)
+	       (draw-rectangle (* f width) (* f height) :texture texture)))))))
 
 (defun draw-quad (v1 v2 v3 v4 &key texture)
   (cond (texture (progn-textures
-		  (glBindTexture GL_TEXTURE_2D (getf texture :id-texture))
+		  (glBindTexture GL_TEXTURE_2D (getf (get-resource texture) :id-texture))
 		  (begin-draw 4)
 		  (draw-vertex v1 :texture-coord '(0 0))
 		  (draw-vertex v2 :texture-coord '(1 0))