X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_draw.lisp;h=521093b5e6c1d65ee83d5979f5eeedef5f9677c0;hb=27b9bb922e43e418305b28d8139408634d4be1a3;hp=364163b65186240d29cf593d86d14652aacc9725;hpb=5293bb782051f9bfea3802151acb0c8644c98104;p=gacela.git

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 364163b..521093b 100644
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -14,10 +14,19 @@
 ;;; 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)
 
-(defmacro set-dimension (&key 2d 3d))
+(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))
@@ -34,26 +43,45 @@
 	   (draw-vertexes (cdr vertexes)))))
 
 (defun draw-vertex (vertex &key texture-coord)
-  (cond ((consp (car vertex)) (draw-color (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))
 
-(defun load-texture (filename &optional (min-filter GL_LINEAR) (mag-filter GL_LINEAR))
-  (init-textures)
+(defun load-image-for-texture (filename)
   (init-video-mode)
   (let ((image (IMG_Load filename)))
     (cond ((/= image 0)
-	   (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))))))
+	   (let* ((width (surface-w image)) (height (surface-h image))
+		  (power-2 (nearest-power-of-two (min width height)))
+		  (zoomx (/ power-2 width)) (zoomy (/ power-2 height))
+		  zoomed-image)
+	     (cond ((and (= zoomx 1) (= zoomy 1)) (values image width height))
+		   (t (setq zoomed-image (zoomSurface image zoomx zoomy 0))
+		      (SDL_FreeSurface image)
+		      (cond ((/= zoomed-image 0) (values zoomed-image width height))))))))))
+
+(defun load-texture (filename &optional (min-filter GL_LINEAR) (mag-filter GL_LINEAR))
+  (init-textures)
+  (init-video-mode)
+  (multiple-value-bind
+   (image real-w real-h) (load-image-for-texture filename)
+        (cond (image
+	       (let ((width (surface-w image)) (height (surface-h image))
+		     (byteorder (cond 
+		     (texture (car (glGenTextures 1))))
+		 (glBindTexture GL_TEXTURE_2D texture)
+		 (glTexImage2D GL_TEXTURE_2D 0 3 width height 0 GL_RGBA 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 real-w real-h))))))
 
 (defun draw-image-function (filename)
   (multiple-value-bind