(glEnd))
(define (begin-draw number-of-points)
- (cond ((= number-of-points 3) (glBegin GL_TRIANGLES))
+ (cond ((= number-of-points 2) (glBegin GL_LINES))
+ ((= number-of-points 3) (glBegin GL_TRIANGLES))
((= number-of-points 4) (glBegin GL_QUADS))))
(define (draw-vertexes vertexes)
(cond ((3d-mode?) (glVertex3f x y z))
(else (glVertex2f x y))))
-(define (load-image-for-texture filename)
+(define (load-image filename)
(init-sdl)
(let ((image (IMG_Load filename)))
(cond (image
- (SDL_SetAlpha image 0 0)
+ (SDL_DisplayFormatAlpha image)))))
+
+(define (load-image-for-texture filename)
+ (init-sdl)
+ (let ((image (load-image filename)))
+ (cond (image
(let* ((width (surface-w image)) (height (surface-h image))
(power-2 (nearest-power-of-two (min width height)))
(resized-image #f))
(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))
+ (glTexImage2D GL_TEXTURE_2D 0 4 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)
(set-texture-size! texture real-w real-h)
(height (texture-h texture)))
(draw-rectangle (* zoom width) (* zoom height) #:texture texture)))))
+(define* (draw-line length #:optional color)
+ (let ((l (/ length 2)))
+ (cond (color
+ (with-color color (draw (list 0 l) (list 0 (- l)))))
+ (else
+ (draw (list 0 l) (list 0 (- l)))))))
+
(define* (draw-quad v1 v2 v3 v4 #:key texture color)
(cond (texture
(progn-textures