Gacela as Guile modules.

[gacela.git] / src / gacela_draw.scm

diff --git a/src/gacela_draw.scm b/src/gacela_draw.scm
index c30d25e9ded0d36fe41ad50c3ed2f9410a4901af..595efe9ae92f1074927dc7f15bfa45c59d229a18 100644 (file)
--- a/src/gacela_draw.scm
+++ b/src/gacela_draw.scm
@@ -26,12 +26,12 @@
        (else `(begin ,@code))))
 
 (define-macro (progn-textures . code)
-  `(let (values)
+  `(let ((result #f))
      (init-video-mode)
      (glEnable GL_TEXTURE_2D)
-     (set! values (multiple-value-list (begin ,@code)))
+     (set! result (begin ,@code))
      (glDisable GL_TEXTURE_2D)
-     (apply values values)))
+     result))
 
 (define (draw . vertexes)
   (begin-draw (length vertexes))
@@ -39,7 +39,8 @@
   (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)
@@ -59,16 +60,24 @@
   (cond ((3d-mode?) (glVertex3f x y z))
        (else (glVertex2f x y))))
 
-(define (load-image-for-texture filename)
-  (init-video-mode)
+(define (load-image filename)
+  (init-sdl)
   (let ((image (IMG_Load filename)))
+    (cond (image
+          (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 ((and (= width power-2) (= height power-2)) (values image width height))
                   (else (set! resized-image (resize-surface image power-2 power-2))
-                        (if resized-image (values resized-image width height)))))))))
+                        (if resized-image (values resized-image width height))))))
+         (else
+          (values #f 0 0)))))
 
 (define (resize-surface surface width height)
   (let ((old-width (surface-w surface)) (old-height (surface-h surface)))
@@ -77,21 +86,27 @@
               (zoomSurface surface zoomx zoomy 0))))))
 
 (define* (load-texture filename #:key (min-filter GL_LINEAR) (mag-filter GL_LINEAR))
-  (progn-textures
-   (receive
-    (image real-w real-h) (load-image-for-texture filename)
-    (cond (image
-          (let ((width (get-surface-width image)) (height (get-surface-height 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)
-            texture))))))
+  (let* ((key (list filename min-filter mag-filter))
+        (res (get-resource-from-cache key)))
+    (cond (res res)
+         (else
+          (progn-textures
+           (receive
+            (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 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)
+                     (insert-resource-into-cache key texture)
+                     texture)))))))))
 
 (define* (draw-image filename #:optional (zoom 1))
   (let ((texture (load-texture filename)))
@@ -103,6 +118,13 @@
               (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
@@ -119,12 +141,13 @@
         (draw v1 v2 v3 v4))))
 
 (define* (draw-rectangle width height #:key texture color)
-  (draw-quad (list (- width) height 0)
-            (list width height 0)
-            (list width (- height) 0)
-            (list (- width) (- height) 0)
-            #:texture texture
-            #:color color))
+  (let ((w (/ width 2)) (h (/ height 2)))
+    (draw-quad (list (- w) h 0)
+              (list w h 0)
+              (list w (- h) 0)
+              (list (- w) (- h) 0)
+              #:texture texture
+              #:color color)))
 
 (define* (draw-square #:key (size 1) texture color)
   (draw-rectangle size size #:texture texture #:color color))