-(defun draw-image-function (filename)
- (multiple-value-bind
- (texture width height) (load-texture filename)
- (lambda (&optional (f 1))
- (cond (texture
- (draw-rectangle (* f width) (* f height) :texture texture))))))
+(defun true-load-texture (filename min-filter mag-filter static)
+ (let ((key (make-resource-texture :filename filename :min-filter min-filter :mag-filter mag-filter)))
+ (progn-textures
+ (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 (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 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)
+ (set-resource key
+ `(:id-texture ,texture :width ,real-w :height ,real-h)
+ (lambda () (true-load-texture filename min-filter mag-filter static))
+ (lambda () (glDeleteTextures 1 `(,texture)))
+ :static static)
+ key)))))))
+
+(defun draw-image (filename &ptional (zoom 1))
+ (let ((texture (load-texture filename)))
+ (cond (texture (draw-texture texture zoom)))))
+
+(defun draw-texture (texture &optional (zoom 1))
+ (cond (texture
+ (let ((width (getf (get-resource texture) :width))
+ (height (getf (get-resource texture) :height)))
+ (draw-rectangle (* zoom width) (* zoom height) :texture texture)))))