Save font size into font smob.

[gacela.git] / src / video.scm

diff --git a/src/video.scm b/src/video.scm
index f9e37f15e8b730736bfe8938b25909e123b0e461..5a5ef2b135a904d98c74414b6238401857378a86 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
@@ -59,7 +60,11 @@
            set-camera
            camera-look
            load-font
-           render-text))
+           render-text)
+  #:export-syntax (glmatrix-block)
+  #:re-export (glPushMatrix
+              glPopMatrix))
+
 
 
 ;;; Screen
@@ -67,18 +72,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 +92,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 +168,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)
@@ -355,6 +365,13 @@
   (glLoadIdentity)
   (cond ((3d-mode?) (camera-look))))
 
+(define-macro (glmatrix-block . code)
+  `(let ((result #f))
+     (glPushMatrix)
+     (set! result (begin ,@code))
+     (glPopMatrix)
+     result))
+
 
 ;;; Lights
 
@@ -385,7 +402,7 @@
 ;;; 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))