X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_draw.lisp;h=88e773848334c5fc9d974ef718d8178812440f24;hb=31db8863bd1281f94f426aac5936fb897351362f;hp=5e93e77b18b55906213707ec73101c4817a60dc4;hpb=485e401435dd0c9d443299cb04b1576e0f15f43f;p=gacela.git

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 5e93e77..88e7738 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,42 +43,65 @@
 	   (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))
 
-(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)
+  (progn-textures
+   (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 (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)))
+		     (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))
+		 (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
    (texture width height) (load-texture filename)
-        (cond (texture
-	       (lambda (&optional (f 0.0172))
-		 (draw-rectangle (* f width) (* f height) :texture texture))))))
+   (lambda (&optional (f 1))
+     (cond (texture
+	    (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)
-		 (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 (texture (progn-textures
+		  (glBindTexture GL_TEXTURE_2D 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 (cond (color (draw-color color)))
 	   (draw v1 v2 v3 v4))))
 
@@ -111,4 +145,4 @@
   (cond (zrot (glRotatef zrot 0 0 1))))
 
 (defun enable (&key textures)
-  (cond (textures (glEnable GL_TEXTURE_2D))))
\ No newline at end of file
+  (cond (textures (glEnable GL_TEXTURE_2D))))