New function to get properties of a texture.

[gacela.git] / src / video.scm

diff --git a/src/video.scm b/src/video.scm
index f9e37f15e8b730736bfe8938b25909e123b0e461..4b211e92cecc16b3b571cf52a54d08992531a6b2 100644 (file)
--- a/src/video.scm
+++ b/src/video.scm
@@ -36,7 +36,8 @@
            set-2d-mode
            set-3d-mode
            3d-mode?
-           set-frames-per-second
+           get-frames-per-second
+           set-frames-per-second!
            init-frame-time
            get-frame-time
            delay-frame
@@ -46,6 +47,7 @@
            progn-textures
            draw
            load-texture
+           get-texture-properties
            draw-texture
            draw-line
            draw-quad
@@ -59,7 +61,11 @@
            set-camera
            camera-look
            load-font
-           render-text))
+           render-text)
+  #:export-syntax (glmatrix-block)
+  #:re-export (glPushMatrix
+              glPopMatrix))
+
 
 
 ;;; Screen
@@ -67,18 +73,18 @@
 (define screen #f)
 (define flags 0)
 
-(define* (init-video width height bpp #:key (mode '2d) (title ""))
-  (cond ((not screen)
-        (SDL_Init SDL_INIT_VIDEO)
-        (let ((info (SDL_GetVideoInfo)))
-          (SDL_GL_SetAttribute SDL_GL_DOUBLEBUFFER 1)
-          (set! flags (+ SDL_OPENGL SDL_GL_DOUBLEBUFFER SDL_HWPALETTE SDL_RESIZABLE
-                         (if (= (assoc-ref info 'hw_available) 0) SDL_SWSURFACE SDL_HWSURFACE)
-                         (if (= (assoc-ref info 'blit_hw) 0) 0 SDL_HWACCEL)))
-          (set! screen (SDL_SetVideoMode width height bpp flags))
-          (set-screen-title! title)
-          (init-gl)
-          (if (eq? mode '3d) (set-3d-mode) (set-2d-mode))))))
+(define* (init-video width height bpp #:key (mode '2d) (title "") (fps 20))
+  (SDL_Init SDL_INIT_VIDEO)
+  (let ((info (SDL_GetVideoInfo)))
+    (SDL_GL_SetAttribute SDL_GL_DOUBLEBUFFER 1)
+    (set! flags (+ SDL_OPENGL SDL_GL_DOUBLEBUFFER SDL_HWPALETTE SDL_RESIZABLE
+                  (if (= (assoc-ref info 'hw_available) 0) SDL_SWSURFACE SDL_HWSURFACE)
+                  (if (= (assoc-ref info 'blit_hw) 0) 0 SDL_HWACCEL)))
+    (set! screen (SDL_SetVideoMode width height bpp flags))
+    (set-screen-title! title)
+    (set-frames-per-second! fps)
+    (init-gl)
+    (if (eq? mode '3d) (set-3d-mode) (set-2d-mode))))
 
 (define (get-screen-height)
   (surface-h screen))
@@ -87,7 +93,7 @@
   (surface-w screen))
 
 (define (get-screen-bpp)
-  (surface-format-BytesPerPixel screen))
+  (* (surface-format-BytesPerPixel screen) 8))
 
 (define (set-screen-bpp! bpp)
   (cond (screen
@@ -163,9 +169,14 @@
 ;;; Frames per second
 
 (define time 0)
+(define frames-per-second 20)
 (define time-per-frame 50)   ;in ms
 
-(define (set-frames-per-second fps)
+(define (get-frames-per-second)
+  frames-per-second)
+
+(define (set-frames-per-second! fps)
+  (set! frames-per-second fps)
   (set! time-per-frame (/ 1000.0 fps)))
 
 (define (init-frame-time)
@@ -276,6 +287,9 @@
             (set-texture-size! texture real-w real-h)
             texture))))))
 
+(define (get-texture-properties texture)
+  `((width . ,(texture-w texture)) (height . ,(texture-h texture))))
+
 (define* (draw-texture texture #:optional (zoom 1))
   (cond (texture
         (let ((width (texture-w texture))
@@ -355,6 +369,13 @@
   (glLoadIdentity)
   (cond ((3d-mode?) (camera-look))))
 
+(define-macro (glmatrix-block . code)
+  `(let ((result #f))
+     (glPushMatrix)
+     (set! result (begin ,@code))
+     (glPopMatrix)
+     result))
+
 
 ;;; Lights
 
@@ -385,11 +406,15 @@
 ;;; Text and fonts
 
 (define* (load-font font-file #:key (size 40) (encoding ft_encoding_unicode))
-  (let ((font (ftglCreateTextureFont font-file)))
+  (let ((font (ftglCreateTextureFont font-file size)))
     (ftglSetFontFaceSize font size 72)
     (ftglSetFontCharMap font encoding)
     font))
 
 (define* (render-text text font #:key (size #f))
-  (cond (size (ftglSetFontFaceSize font size 72)))
+  (cond (size
+        (cond ((not (= (ftglGetFontFaceSize font) size))
+               (ftglSetFontFaceSize font size 72))))
+       ((not (= (ftglGetFontFaceSize font) (font-size font)))
+        (ftglSetFontFaceSize font (font-size font) 72)))
   (ftglRenderFont font text FTGL_RENDER_ALL))