X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_draw.lisp;h=40a6c4ccf0a5e7bbab41da7f4a01f587f000b267;hb=b56cc2e7d421a067fbdcd3a542908fe0617352b8;hp=3149f4d89cb1ae5013a650fa296b293cbf4f519f;hpb=0e67e98bfd1eedf78f3e9c27a6d9726f225deac1;p=gacela.git

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 3149f4d..40a6c4c 100644
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -14,9 +14,20 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
 (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)))
+
 (defun draw (&rest vertexes)
   (begin-draw (length vertexes))
   (draw-vertexes vertexes)
@@ -32,9 +43,13 @@
 	   (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 #'simple-draw-vertex (cadr vertex)))
 	(t (cond (texture-coord (apply #'glTexCoord2f texture-coord)))
-	   (apply #'glVertex3f vertex))))
+	   (apply #'simple-draw-vertex vertex))))
+
+(defun simple-draw-vertex (x y &optional (z 0))
+  (cond ((3d-mode?) (glVertex3f x y z))
+	(t (glVertex2f x y))))
 
 (defun draw-color (color)
   (apply #'glColor3f color))
@@ -42,15 +57,23 @@
 (defun load-texture (filename &optional (min-filter GL_LINEAR) (mag-filter GL_LINEAR))
   (init-textures)
   (init-video-mode)
-  (let ((image (IMG_Load filename))
-	(texture (car (glGenTextures 1))))
+  (let ((image (IMG_Load filename)))
     (cond ((/= image 0)
-	   (glBindTexture GL_TEXTURE_2D texture)
-	   (glTexImage2D GL_TEXTURE_2D 0 3 (surface-w image) (surface-h image) 0 GL_BGR GL_UNSIGNED_BYTE (surface-pixels image))
-	   (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MIN_FILTER min-filter)
-	   (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MAG_FILTER mag-filter)
-	   (SDL_FreeSurface image)))
-    texture))
+	   (let ((width (surface-w image)) (height (surface-h image))
+		 (texture (car (glGenTextures 1))))
+	     (glBindTexture GL_TEXTURE_2D texture)
+	     (glTexImage2D GL_TEXTURE_2D 0 3 width height 0 GL_RGB GL_UNSIGNED_BYTE (surface-pixels image))
+	     (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MIN_FILTER min-filter)
+	     (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MAG_FILTER mag-filter)
+	     (SDL_FreeSurface image)
+	     (values texture width height))))))
+
+(defun draw-image-function (filename)
+  (multiple-value-bind
+   (texture width height) (load-texture filename)
+        (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)
@@ -63,9 +86,12 @@
 	(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)))