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

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 31790da..d992ba5 100644
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -16,23 +16,23 @@
 
 (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)
+     (init-video-mode)
+     (glEnable GL_TEXTURE_2D)
+     (setq values (multiple-value-list (progn ,@code)))
+     (glDisable GL_TEXTURE_2D)
+     (apply #'values values)))
 
 (defun draw (&rest vertexes)
   (begin-draw (length vertexes))
@@ -85,8 +85,8 @@
       (cond (image
 	     (let ((width (surface-w image)) (height (surface-h image))
 		   (byteorder (if (= (SDL_ByteOrder) SDL_LIL_ENDIAN)
-				(if (= (surface-format-BytesPerPixel image) 3) GL_BGR GL_BGRA)
-				(if (= (surface-format-BytesPerPixel image) 3) GL_RGB GL_RGBA)))
+				(if (= (surface-format-BytesPerPixel image) 3) GL_RGB GL_RGBA)
+				(if (= (surface-format-BytesPerPixel image) 3) GL_BGR GL_BGRA)))
 		   (texture (car (glGenTextures 1))))
 	       (glBindTexture GL_TEXTURE_2D texture)
 	       (glTexImage2D GL_TEXTURE_2D 0 3 width height 0 byteorder GL_UNSIGNED_BYTE (surface-pixels image))
@@ -101,21 +101,24 @@
 	       key)))))))
 
 (defun draw-image-function (filename)
-  (multiple-value-bind
-   (texture width height) (load-texture filename)
-   (lambda (&optional (f 1))
-     (cond (texture
-	    (draw-rectangle (* f width) (* f height) :texture texture))))))
+  (let ((texture (load-texture filename)))
+    (lambda (&optional (f 1))
+      (cond (texture
+	     (let ((width (getf (get-resource texture) :width))
+		   (height (getf (get-resource texture) :height)))
+	       (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 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)
@@ -125,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)
@@ -152,7 +155,10 @@
 (defun translate (x y &optional (z 0))
   (glTranslatef x y z))
 
-(defun rotate (xrot yrot &optional zrot)
+(defun 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)
+  (rotate 0 0 rot))
\ No newline at end of file