(defun load-texture (filename &optional (min-filter GL_LINEAR) (mag-filter GL_LINEAR))
(init-textures)
(init-video-mode)
- (let ((image (IMG_Load filename))
- (texture (car (glGenTextures 1))))
+ (let ((image (IMG_Load filename)))
(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))
+ (let ((width (surface-w image)) (height (surface-h image))
+ (texture (car (glGenTextures 1))))
+ (glBindTexture GL_TEXTURE_2D texture)
+ (glTexImage2D GL_TEXTURE_2D 0 3 width height 0 GL_RGB 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 width height))))))
+
+(defun draw-image-function (filename)
+ (multiple-value-bind
+ (texture width height) (load-texture filename)
+ (cond (texture))))
(defun draw-quad (v1 v2 v3 v4 &key texture color)
(cond (texture (glBindTexture GL_TEXTURE_2D texture)