X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_draw.lisp;h=d992ba5d57cbcca68a40f7d3f1f44e32368e3b74;hb=b63a5e5672e858e7a3689ebc4d66853d5151dfb6;hp=fd2a7174d8ed7eabf7c5fd591565251e9cd25381;hpb=ee0ee8aa7b6140f964ef3b04828f4144f831fcd4;p=gacela.git

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index fd2a717..d992ba5 100644
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -17,10 +17,14 @@
 (in-package :gacela)
 
 (defmacro with-color (color &body code)
-  `(let ((original-color (get-current-color)))
-     (apply #'set-current-color ,color)
-     ,@code
-     (apply #'set-current-color original-color)))
+  (cond (color
+	 `(let ((original-color (get-current-color)))
+	    (apply #'set-current-color ,color)
+	    ,@code
+	    (apply #'set-current-color original-color)))
+	(t
+	 `(progn
+	    ,@code))))
 
 (defmacro progn-textures (&body code)
   `(let (values)
@@ -105,7 +109,8 @@
 	       (draw-rectangle (* f width) (* f height) :texture texture)))))))
 
 (defun draw-quad (v1 v2 v3 v4 &key texture)
-  (cond (texture
+  (cond ((consp texture) (with-color texture (draw v1 v2 v3 v4)))
+	(texture
 	 (progn-textures
 	  (glBindTexture GL_TEXTURE_2D (getf (get-resource texture) :id-texture))
 	  (begin-draw 4)
@@ -123,7 +128,7 @@
 (defun draw-square (&key (size 1) texture)
   (draw-rectangle size size :texture texture))
 
-(defun draw-cube (&key size texture texture-1 texture-2 texture-3 texture-4 texture-5 texture-6)
+(defun draw-cube (&key (size 1) texture texture-1 texture-2 texture-3 texture-4 texture-5 texture-6)
   (let ((-size (neg size)))
     (progn-textures
      (glNormal3f 0 0 1)