Adding SDL_GetError.

[gacela.git] / src / video.scm

diff --git a/src/video.scm b/src/video.scm
index 3bb09478bd816fc03022f74a633b5be138b62650..466438f1db06b050740e6c0addb08d2228fba193 100644 (file)
--- a/src/video.scm
+++ b/src/video.scm
@@ -20,6 +20,7 @@
   #:use-module (gacela gl)
   #:use-module (gacela ftgl)
   #:use-module (gacela math)
+  #:use-module (gacela utils)
   #:use-module (ice-9 optargs)
   #:use-module (ice-9 receive)
   #:export (init-video
@@ -47,6 +48,7 @@
            progn-textures
            draw
            load-texture
+           load-texture-without-cache
            get-texture-properties
            draw-texture
            draw-line
@@ -61,6 +63,7 @@
            set-camera
            camera-look
            load-font
+           load-font-without-texture
            render-text)
   #:export-syntax (glmatrix-block))
 
@@ -267,7 +270,7 @@
          (else (let ((zoomx (/ (+ width 0.5) old-width)) (zoomy (/ (+ height 0.5) old-height)))
               (zoomSurface surface zoomx zoomy 0))))))
 
-(define* (load-texture filename #:key (min-filter GL_LINEAR) (mag-filter GL_LINEAR))
+(define* (load-texture-without-cache filename #:key (min-filter GL_LINEAR) (mag-filter GL_LINEAR))
   (progn-textures
    (receive
     (image real-w real-h) (load-image-for-texture filename)
@@ -285,14 +288,19 @@
             (set-texture-size! texture real-w real-h)
             texture))))))
 
+(define load-texture (use-cache-with load-texture-without-cache))
+
 (define (get-texture-properties texture)
   `((width . ,(texture-w texture)) (height . ,(texture-h texture))))
 
-(define* (draw-texture texture #:optional (zoom 1))
+(define* (draw-texture texture #:key (zoom 1) (sprite '((0 0) (1 1))))
   (cond (texture
         (let ((width (texture-w texture))
               (height (texture-h texture)))
-          (draw-rectangle (* zoom width) (* zoom height) #:texture texture)))))
+          (draw-rectangle (* zoom width (- (caadr sprite) (caar sprite)))
+                          (* zoom height (- (cadadr sprite) (cadar sprite)))
+                          #:texture texture
+                          #:texture-coord sprite)))))
 
 (define* (draw-line length #:optional color)
   (let ((l (/ length 2)))
@@ -301,28 +309,29 @@
          (else
           (draw (list 0 l) (list 0 (- l)))))))
 
-(define* (draw-quad v1 v2 v3 v4 #:key texture color)
+(define* (draw-quad v1 v2 v3 v4 #:key texture color (texture-coord '((0 0) (1 1))))
   (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))
+         (draw-vertex v1 #:texture-coord (car texture-coord))
+         (draw-vertex v2 #:texture-coord (list (caadr texture-coord) (cadar texture-coord)))
+         (draw-vertex v3 #:texture-coord (cadr texture-coord))
+         (draw-vertex v4 #:texture-coord (list (caar texture-coord) (cadadr texture-coord)))
          (glEnd)))
        (color
         (with-color color (draw v1 v2 v3 v4)))
        (else
         (draw v1 v2 v3 v4))))
 
-(define* (draw-rectangle width height #:key texture color)
+(define* (draw-rectangle width height #:key texture color texture-coord)
   (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
+              #:texture-coord texture-coord
               #:color color)))
 
 (define* (draw-square #:key (size 1) texture color)
@@ -403,12 +412,14 @@
 
 ;;; Text and fonts
 
-(define* (load-font font-file #:key (size 40) (encoding ft_encoding_unicode))
+(define* (load-font-without-cache font-file #:key (size 40) (encoding ft_encoding_unicode))
   (let ((font (ftglCreateTextureFont font-file size)))
     (ftglSetFontFaceSize font size 72)
     (ftglSetFontCharMap font encoding)
     font))
 
+(define load-font (use-cache-with load-font-without-cache))
+
 (define* (render-text text font #:key (size #f))
   (cond (size
         (cond ((not (= (ftglGetFontFaceSize font) size))