(no commit message)

[gacela.git] / gacela_draw.lisp

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index fd2a7174d8ed7eabf7c5fd591565251e9cd25381..dae68d4f8fced5924fb1f038327bd4d6d293158e 100644 (file)
--- 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)
@@ -150,10 +155,17 @@
 (defun translate (x y &optional (z 0))
   (glTranslatef x y z))
 
-(defun rotate (xrot yrot zrot)
+(defun rotate (&rest rot)
+  (cond ((3d-mode?) (apply #'3d-rotate rot))
+       (t (apply #'2d-rotate rot))))
+
+(defun 3d-rotate (xrot yrot zrot)
   (glRotatef xrot 1 0 0)
   (glRotatef yrot 0 1 0)
   (glRotatef zrot 0 0 1))
 
 (defun 2d-rotate (rot)
-  (rotate 0 0 rot))
\ No newline at end of file
+  (glRotatef rot 0 0 1))
+
+(defun to-origin ()
+  (glLoadIdentity))