- (let ((image (IMG_Load filename))
- (texture (car (glGenTextures 1))))
- (cond ((/= image 0)
- (glBindTexture GL_TEXTURE_2D texture)
- (glTexImage2D GL_TEXTURE_2D 0 3 (surface-w image) (surface-h image) 0 GL_BGR 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)))
- texture))
+ (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 (cond
+ (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))
+ (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MIN_FILTER min-filter)
+ (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MAG_FILTER mag-filter)
+ (SDL_FreeSurface image)
+ (values texture real-w real-h))))))
+
+(defun draw-image-function (filename)
+ (multiple-value-bind
+ (texture width height) (load-texture filename)
+ (cond (texture
+ (lambda (&optional (f 1))
+ (draw-rectangle (* f width) (* f height) :texture texture))))))