X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_draw.lisp;h=fd2a7174d8ed7eabf7c5fd591565251e9cd25381;hb=ee0ee8aa7b6140f964ef3b04828f4144f831fcd4;hp=79c3edbaf22e3785d16379588ef10003bb63316d;hpb=90f83164ea36dae4c0f3370f8ebbf7e30fe83297;p=gacela.git

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 79c3edb..fd2a717 100644
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -16,24 +16,20 @@
 
 (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)))
 
+(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))
   (draw-vertexes vertexes)
@@ -75,43 +71,49 @@
 (defun load-texture (filename &key (min-filter GL_LINEAR) (mag-filter GL_LINEAR) static)
   (let ((key (make-resource-texture :filename filename :min-filter min-filter :mag-filter mag-filter)))
     (cond ((get-resource key) key)
-	  (t
-	   (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)
-		      (set-resource key
-				    `(:id-texture ,texture :width ,real-w :height ,real-h)
-				    (lambda () (glDeleteTextures 1 `(,texture)))
-				    :static static)
-		      key)))))))))
+	  (t (true-load-texture filename min-filter mag-filter static)))))
+
+(defun true-load-texture (filename min-filter mag-filter static)
+  (let ((key (make-resource-texture :filename filename :min-filter min-filter :mag-filter mag-filter)))
+    (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_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))
+	       (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MIN_FILTER min-filter)
+	       (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MAG_FILTER mag-filter)
+	       (SDL_FreeSurface image)
+	       (set-resource key
+			     `(:id-texture ,texture :width ,real-w :height ,real-h)
+			     (lambda () (true-load-texture filename min-filter mag-filter static))
+			     (lambda () (glDeleteTextures 1 `(,texture)))
+			     :static static)
+	       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 (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)
@@ -121,21 +123,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 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)
@@ -148,7 +150,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