(no commit message)

[gacela.git] / gacela_draw.lisp

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 85540b68a5e74347d277e5d004498821af2f99cd..93575a36b578178f578e4ab5ab6d425d7f875ed1 100644 (file)
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -15,17 +15,19 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(when (not (find-package 'gacela))
-  (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+(eval-when (compile load eval)
+          (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+          (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
-(eval-when (eval) (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
 (defmacro with-color (color &body code)
   (cond (color
-        `(let ((original-color (get-current-color)))
+        `(let ((original-color (get-current-color))
+               result)
            (apply #'set-current-color ,color)
-           ,@code
-           (apply #'set-current-color original-color)))
+           (setq result ,@code)
+           (apply #'set-current-color original-color)
+           result))
        (t
         `(progn
            ,@code))))
@@ -69,13 +71,25 @@
     (cond ((/= image 0)
           (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))
+            (cond ((and (= width power-2) (= height power-2)) (values image width height))
+                  (t (setq zoomed-image (resize-image image power-2 power-2))
                      (SDL_FreeSurface image)
                      (cond ((/= zoomed-image 0) (values zoomed-image width height))))))))))
 
+(defun resize-image (image width height)
+  (let ((old-width (surface-w image)) (old-height (surface-h image)))
+    (cond ((and (= width old-width) (= height old-height)) image)
+         (t (let ((zoomx (/ width old-width)) (zoomy (/ height old-height)) zoomed-image)
+              (setq zoomed-image (zoomSurface image zoomx zoomy 0))
+              (let ((new-width (surface-w zoomed-image)) (new-height (surface-h zoomed-image)))
+                (cond ((or (and (= width new-width) (= height new-height))
+                           (and (= old-width new-width) (= old-height new-height))) zoomed-image)
+                      (t (let (rezoomed)
+                           (setq rezoomed (resize-image zoomed-image width height))
+                           (SDL_FreeSurface zoomed-image)
+                           rezoomed)))))))))
+
 (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)
@@ -89,9 +103,10 @@
       (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)))
+                               (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)
@@ -113,17 +128,18 @@
               (draw-rectangle (* f width) (* f height) :texture texture)))))))
 
 (defun draw-quad (v1 v2 v3 v4 &key texture)
-  (cond ((consp texture) (with-color texture (draw v1 v2 v3 v4)))
-       (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))))
+  (let ((id-texture (getf (get-resource texture) :id-texture)))
+    (cond (id-texture
+          (progn-textures
+           (glBindTexture GL_TEXTURE_2D 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)))
+         ((consp texture) (with-color texture (draw v1 v2 v3 v4)))
+         (t (draw v1 v2 v3 v4)))))
 
 (defun draw-rectangle (width height &key texture)
   (let* ((w (/ width 2)) (-w (neg w)) (h (/ height 2)) (-h (neg h)))