X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_draw.lisp;h=15b61e0ca96f0ba03d2b7d70e6d7bb21d603c435;hb=3c076309ea8727753bf689c3524d20116f45a0a3;hp=947da6b5381173c4729911690b09d55ec7cd27d9;hpb=fdfb434956fca60457a18b4ab5cb0df067ec9a8b;p=gacela.git

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 947da6b..15b61e0 100644
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -16,23 +16,15 @@
 
 (in-package :gacela)
 
-(let ((mode '2d))
-  (defun 2d-mode ()
-    (glDisable GL_DEPTH_TEST)
-    (setq mode '2d))
-
-  (defun 3d-mode ()
-    (glEnable GL_DEPTH_TEST)
-    (setq mode '3d))
-
-  (defun 3d-mode? ()
-    (eq mode '3d)))
-
 (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)
@@ -117,14 +109,16 @@
 	       (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 (get-resource texture) :id-texture))
-		  (begin-draw 4)
-		  (draw-vertex v1 :texture-coord '(0 0))
-		  (draw-vertex v2 :texture-coord '(1 0))
-		  (draw-vertex v3 :texture-coord '(1 1))
-		  (draw-vertex v4 :texture-coord '(0 1))
-		  (glEnd)))
+  (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)
+	  (draw-vertex v1 :texture-coord '(0 0))
+	  (draw-vertex v2 :texture-coord '(1 0))
+	  (draw-vertex v3 :texture-coord '(1 1))
+	  (draw-vertex v4 :texture-coord '(0 1))
+	  (glEnd)))
 	(t (draw v1 v2 v3 v4))))
 
 (defun draw-rectangle (width height &key texture)
@@ -134,21 +128,21 @@
 (defun draw-square (&key (size 1) texture)
   (draw-rectangle size size :texture texture))
 
-(defun draw-cube (&key size texture)
+(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)
-     (draw-quad (list -size size size) (list size size size) (list size -size size) (list -size -size size) :texture texture)
+     (draw-quad (list -size size size) (list size size size) (list size -size size) (list -size -size size) :texture (or texture-1 texture))
      (glNormal3f 0 0 -1)
-     (draw-quad (list -size -size -size) (list size -size -size) (list size size -size) (list -size size -size) :texture texture)
+     (draw-quad (list -size -size -size) (list size -size -size) (list size size -size) (list -size size -size) :texture (or texture-2 texture))
      (glNormal3f 0 1 0)
-     (draw-quad (list size size size) (list -size size size) (list -size size -size) (list size size -size) :texture texture)
+     (draw-quad (list size size size) (list -size size size) (list -size size -size) (list size size -size) :texture (or texture-3 texture))
      (glNormal3f 0 -1 0)
-     (draw-quad (list -size -size size) (list size -size size) (list size -size -size) (list -size -size -size) :texture texture)
+     (draw-quad (list -size -size size) (list size -size size) (list size -size -size) (list -size -size -size) :texture (or texture-4 texture))
      (glNormal3f 1 0 0)
-     (draw-quad (list size -size -size) (list size -size size) (list size size size) (list size size -size) :texture texture)
+     (draw-quad (list size -size -size) (list size -size size) (list size size size) (list size size -size) :texture (or texture-5 texture))
      (glNormal3f -1 0 0)
-     (draw-quad (list -size -size size) (list -size -size -size) (list -size size -size) (list -size size size) :texture texture))))
+     (draw-quad (list -size -size size) (list -size -size -size) (list -size size -size) (list -size size size) :texture (or texture-6 texture)))))
 
 (defun add-light (&key light position ambient (id GL_LIGHT1) (turn-on t))
   (init-lighting)
@@ -161,7 +155,27 @@
 (defun translate (x y &optional (z 0))
   (glTranslatef x y z))
 
-(defun rotate (xrot yrot &optional 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)
-  (cond (zrot (glRotatef zrot 0 0 1))))
+  (glRotatef zrot 0 0 1))
+
+(defun 2d-rotate (rot)
+  (glRotatef rot 0 0 1))
+
+(defun to-origin ()
+  (glLoadIdentity)
+  (cond ((3d-mode?) (camera-look))))
+
+(let ((camera-eye '(0 0 0)) (camera-center '(0 0 -100)) (camera-up '(0 1 0)))
+  (defun set-camera (&key eye center up)
+    (cond (eye (setq camera-eye eye)))
+    (cond (center (setq camera-center center)))
+    (cond (up (setq camera-up up))))
+
+  (defun camera-look ()
+    (apply #'gluLookAt (concatenate 'list camera-eye camera-center camera-up))))