,@code
(apply #'set-current-color original-color)))
+(defmacro progn-textures (&body code)
+ `(let (values)
+ (init-video-mode)
+ (glEnable GL_TEXTURE_2D)
+ (setq values (multiple-value-list (progn ,@code)))
+ (glDisable GL_TEXTURE_2D)
+ (apply #'values values)))
+
(defun draw (&rest vertexes)
(begin-draw (length vertexes))
(draw-vertexes vertexes)
(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)))
+ (if (= (surface-format-BytesPerPixel image) 3) GL_RGB GL_RGBA)
+ (if (= (surface-format-BytesPerPixel image) 3) GL_BGR GL_BGRA)))
(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))
key)))))))
(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))))))
+ (let ((texture (load-texture filename)))
+ (lambda (&optional (f 1))
+ (cond (texture
+ (let ((width (getf (get-resource texture) :width))
+ (height (getf (get-resource texture) :height)))
+ (draw-rectangle (* f width) (* f height) :texture texture)))))))
(defun draw-quad (v1 v2 v3 v4 &key texture)
(cond (texture (progn-textures
- (glBindTexture GL_TEXTURE_2D (getf texture :id-texture))
+ (glBindTexture GL_TEXTURE_2D (getf (get-resource texture) :id-texture))
(begin-draw 4)
(draw-vertex v1 :texture-coord '(0 0))
(draw-vertex v2 :texture-coord '(1 0))