(no commit message)

[gacela.git] / gacela_draw.lisp

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 5e93e77b18b55906213707ec73101c4817a60dc4..364163b65186240d29cf593d86d14652aacc9725 100644 (file)
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -17,6 +17,8 @@
 
 (in-package :gacela)
 
+(defmacro set-dimension (&key 2d 3d))
+
 (defun draw (&rest vertexes)
   (begin-draw (length vertexes))
   (draw-vertexes vertexes)
@@ -32,7 +34,7 @@
           (draw-vertexes (cdr vertexes)))))
 
 (defun draw-vertex (vertex &key texture-coord)
-  (cond ((consp (car vertex)) (apply #'glColor3f (car vertex)) (apply #'glVertex3f (cadr vertex)))
+  (cond ((consp (car vertex)) (draw-color (car vertex)) (apply #'glVertex3f (cadr vertex)))
        (t (cond (texture-coord (apply #'glTexCoord2f texture-coord)))
           (apply #'glVertex3f vertex))))
 
@@ -57,7 +59,7 @@
   (multiple-value-bind
    (texture width height) (load-texture filename)
         (cond (texture
-              (lambda (&optional (f 0.0172))
+              (lambda (&optional (f 1))
                 (draw-rectangle (* f width) (* f height) :texture texture))))))
 
 (defun draw-quad (v1 v2 v3 v4 &key texture color)