(in-package :gacela)
+(defmacro set-dimension (&key 2d 3d))
+
(defun draw (&rest vertexes)
(begin-draw (length vertexes))
(draw-vertexes vertexes)
(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))))
(defun draw-image-function (filename)
(multiple-value-bind
(texture width height) (load-texture filename)
- (cond (texture))))
+ (cond (texture
+ (lambda (&optional (f 1))
+ (draw-rectangle (* f width) (* f height) :texture texture))))))
(defun draw-quad (v1 v2 v3 v4 &key texture color)
(cond (texture (glBindTexture GL_TEXTURE_2D texture)
(t (cond (color (draw-color color)))
(draw v1 v2 v3 v4))))
-(defun draw-square (&key size texture color)
- (let ((-size (neg size)))
- (draw-quad (list -size size 0) (list size size 0) (list size -size 0) (list -size -size 0) :texture texture :color color)))
+(defun draw-rectangle (width height &key texture color)
+ (let* ((w (/ width 2)) (-w (neg w)) (h (/ height 2)) (-h (neg h)))
+ (draw-quad (list -w h 0) (list w h 0) (list w -h 0) (list -w -h 0) :texture texture :color color)))
+
+(defun draw-square (&key (size 1) texture color)
+ (draw-rectangle size size :texture texture :color color))
(defun draw-cube (&key size texture color)
(let ((-size (neg size)))