X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_draw.lisp;h=00eb5516208f950a952201b59a9f3a8dc06959a9;hb=15dc6f156f90086f1f82655b43183f0d8647fa0e;hp=c984948fbbfa351a9aab7bd0cfc4dba3390d85d7;hpb=8caa865a3194eb573382a411df7636ebb472ca1f;p=gacela.git

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index c984948..00eb551 100644
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -16,18 +16,6 @@
 
 (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)
@@ -93,8 +81,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))
@@ -114,7 +102,6 @@
       (cond (texture
 	     (let ((width (getf (get-resource texture) :width))
 		   (height (getf (get-resource texture) :height)))
-(print texture)
 	       (draw-rectangle (* f width) (* f height) :texture texture)))))))
 
 (defun draw-quad (v1 v2 v3 v4 &key texture)
@@ -162,7 +149,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