- (cond ((/= zoomed-image 0) (values zoomed-image width height))))))))))
-
-(defun load-texture (filename &optional (min-filter GL_LINEAR) (mag-filter GL_LINEAR))
-; (init-textures)
-; (init-video-mode)
- (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)
- (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))))))
-
-(defun draw-quad (v1 v2 v3 v4 &key texture color)
- (cond (texture (progn-textures
- (glBindTexture GL_TEXTURE_2D texture)
- (begin-draw 4)
- (draw-vertex v1 :texture-coord '(0 0))
- (draw-vertex v2 :texture-coord '(1 0))
- (draw-vertex v3 :texture-coord '(1 1))
- (draw-vertex v4 :texture-coord '(0 1))
- (glEnd)))
- (t (cond (color (draw-color color)))
- (draw v1 v2 v3 v4))))
-
-(defun draw-rectangle (width height &key texture color)
+ (cond ((/= resized-image 0) (values resized-image width height))))))))))
+
+(defun resize-surface (surface width height)
+ (let ((old-width (surface-w surface)) (old-height (surface-h surface)))
+ (cond ((and (= width old-width) (= height old-height)) surface)
+ (t (let ((zoomx (/ (+ width 0.5) old-width)) (zoomy (/ (+ height 0.5) old-height)))
+ (zoomSurface surface zoomx zoomy 0))))))
+
+(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)
+ (t (true-load-texture filename min-filter mag-filter static)))))
+
+(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)))))
+
+(defun draw-quad (v1 v2 v3 v4 &key texture)
+ (let ((id-texture (getf (get-resource texture) :id-texture)))
+ (cond (id-texture
+ (progn-textures
+ (glBindTexture GL_TEXTURE_2D id-texture)
+ (begin-draw 4)
+ (draw-vertex v1 :texture-coord '(0 0))
+ (draw-vertex v2 :texture-coord '(1 0))
+ (draw-vertex v3 :texture-coord '(1 1))
+ (draw-vertex v4 :texture-coord '(0 1))
+ (glEnd)))
+ ((consp texture) (with-color texture (draw v1 v2 v3 v4)))
+ (t (draw v1 v2 v3 v4)))))
+
+(defun draw-rectangle (width height &key texture)