X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_draw.lisp;h=2e9ddbaf005ff06972684fb8eab94f70864b37e2;hb=66161b212a87260a997193821426f06bca51da7b;hp=6689e673e448aa1b99ac264295ec11b22fcacd85;hpb=a85d5966b658580f9d82254ef7f88d80b8312cb0;p=gacela.git diff --git a/gacela_draw.lisp b/gacela_draw.lisp index 6689e67..2e9ddba 100644 --- a/gacela_draw.lisp +++ b/gacela_draw.lisp @@ -74,9 +74,13 @@ (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 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) @@ -140,4 +144,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))))