(no commit message)

diff --git a/gacela_SDL.lisp b/gacela_SDL.lisp
index 810908045b5c24503f72c314fd82068513446973..ebc98b18c76db6420b9697fabaf1d3e4bea79f0c 100644 (file)
--- a/gacela_SDL.lisp
+++ b/gacela_SDL.lisp
@@ -21,6 +21,7 @@
 (clines "#include <SDL/SDL_image.h>")
 (clines "#include <SDL/SDL_ttf.h>")
 (clines "#include <SDL/SDL_mixer.h>")
 (clines "#include <SDL/SDL_image.h>")
 (clines "#include <SDL/SDL_ttf.h>")
 (clines "#include <SDL/SDL_mixer.h>")

+(clines "#include <SDL/rotozoom.h>")

 
 ;;; These are the flags which may be passed to SDL_Init()
 (defconstant SDL_INIT_TIMER            #x00000001)
 
 ;;; These are the flags which may be passed to SDL_Init()
 (defconstant SDL_INIT_TIMER            #x00000001)

diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 1629847508487b7a8e8140d0411445fff6fd1ecb..2e9ddbaf005ff06972684fb8eab94f70864b37e2 100644 (file)
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -74,10 +74,13 @@
    (image real-w real-h) (load-image-for-texture filename)
         (cond (image
               (let ((width (surface-w image)) (height (surface-h image))
    (image real-w real-h) (load-image-for-texture filename)
         (cond (image
               (let ((width (surface-w image)) (height (surface-h image))

-                    (byteorder (cond 
+                    (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)
                     (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))
+                (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)
                 (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MIN_FILTER min-filter)
                 (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MAG_FILTER mag-filter)
                 (SDL_FreeSurface image)


@@ -142,19 +145,3 @@
 
 (defun enable (&key textures)
   (cond (textures (glEnable GL_TEXTURE_2D))))
 
 (defun enable (&key textures)
   (cond (textures (glEnable GL_TEXTURE_2D))))

-
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-    if (surface -> format -> BytesPerPixel == 3){
-        mode = GL_BGR ;
-    }
-    else if (surface -> format -> BytesPerPixel == 4){
-        mode = GL_BGRA ;
-    }
-#else
-    if (surface -> format -> BytesPerPixel == 3){
-        mode = GL_RGB ;
-    }
-    else if (surface -> format -> BytesPerPixel == 4){
-        mode = GL_RGBA ;
-    }
-#endif