(cond ((/= image 0)
(let* ((width (surface-w image)) (height (surface-h image))
(power-2 (nearest-power-of-two (min width height)))
- (zoomx (/ power-2 width)) (zoomy (/ power-2 height))
zoomed-image)
- (cond ((and (= zoomx 1) (= zoomy 1)) (values image width height))
- (t (setq zoomed-image (zoomSurface image zoomx zoomy 0))
+ (cond ((and (= width power-2) (= height power-2)) (values image width height))
+ (t (setq zoomed-image (resize-image image power-2 power-2))
(SDL_FreeSurface image)
(cond ((/= zoomed-image 0) (values zoomed-image width height))))))))))
+(defun resize-image (image width height)
+ (let ((old-width (surface-w image)) (old-height (surface-h image)))
+ (cond ((and (= width old-width) (= height old-height)) image)
+ (t (let ((zoomx (/ width old-width)) (zoomy (/ height old-height)) zoomed-image)
+ (setq zoomed-image (zoomSurface image zoomx zoomy 0))
+ (let ((new-width (surface-w zoomed-image)) (new-height (surface-h zoomed-image)))
+ (cond ((or (and (= width new-width) (= height new-height))
+ (and (= old-width new-width) (= old-height new-height))) zoomed-image)
+ (t (let (rezoomed)
+ (setq rezoomed (resize-image zoomed-image width height))
+ (SDL_FreeSurface zoomed-image)
+ rezoomed)))))))))
+
(defun load-texture (filename &key (min-filter GL_LINEAR) (mag-filter GL_LINEAR) static)
(let ((key (make-resource-texture :filename filename :min-filter min-filter :mag-filter mag-filter)))
(cond ((get-resource key) key)
(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_RGB GL_RGBA)
- (if (= (surface-format-BytesPerPixel image) 3) GL_BGR GL_BGRA)))
+ (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)