(no commit message)

[gacela.git] / gacela_draw.lisp

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 4c96b580808241293ca9850554bdf83885877f7a..31790dabbb8c2de7d0e512ca4e2af42405403511 100644 (file)
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -75,27 +75,30 @@
 (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 () (load-texture filename :min-filter min-filter :mag-filter mag-filter :static static))
-                                   (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_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 () (true-load-texture filename min-filter mag-filter static))
+                            (lambda () (glDeleteTextures 1 `(,texture)))
+                            :static static)
+              key)))))))
 
 (defun draw-image-function (filename)
   (multiple-value-bind