(no commit message)

[gacela.git] / gacela.lisp

diff --git a/gacela.lisp b/gacela.lisp
index aea2df64dba8740354591c7a2f061ebf239f969c..9a7e89b309a770da2f8bf0d4eaa6fb410d2b2462 100644 (file)
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -22,7 +22,7 @@
 (defvar *height-screen* 480)
 (defvar *bpp-screen* 32)
 (defvar *title-screen* "Happy Hacking!!")
-(defvar *gacela-freq* 30)
+(defvar *frames-per-second* 20)
 (defvar *transparent-color* '(:red 0 :green 0 :blue 0))
 (defvar *background-color* '(:red 0 :green 0 :blue 0))
 
@@ -184,32 +184,6 @@
   (flip))
 
 
-(defun filled-circle (radius &optional (color '(:red 255 :green 255 :blue 255)))
-  (init-video-mode)
-  (let ((new-surface (create-surface (1+ (* radius 2)) (1+ (* radius 2)))))
-    (sge_FilledCircle (surface-address new-surface)
-                     radius radius radius
-                     (getf color :red)
-                     (getf color :green)
-                     (getf color :blue))
-    (setf (surface-shape new-surface)
-         `((,radius ,radius) ,radius))
-    new-surface))
-
-
-(defun filled-rect (width height &optional (color '(:red 255 :green 255 :blue 255)))
-  (init-video-mode)
-  (let ((new-surface (create-surface width height)))
-    (sge_FilledRect (surface-address new-surface)
-                   0 0 width height
-                   (getf color :red)
-                   (getf color :green)
-                   (getf color :blue))
-    (setf (surface-shape new-surface)
-         (make-rectangle 0 0 width height))
-    new-surface))
-
-
 ;;; TTF Subsystem
 (defstruct font address)
 
@@ -348,17 +322,24 @@
                                             (eval (read-from-string (concatenate 'string "(progn " (car comlst) ")")))))))
                     (run-com running)))))))
 
+(let ((gacela-timer (make-timer)))
+  (defun start-gacela-timer () (start-timer gacela-timer))
+  (defun get-gacela-time () (get-time gacela-timer)))
+
 (defmacro run-game (title &body code)
   `(progn
      (init-video-mode)
      (SDL_WM_SetCaption ,title "")
      (process-events)
      (do () ((quit?))
+        (start-gacela-timer)
         (glClear (+ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT))
         (glLoadIdentity)
         ,@code
         (SDL_GL_SwapBuffers)
-        (SDL_Delay (- *gacela-freq* (rem (SDL_GetTicks) *gacela-freq*)))
+        (let ((frame-time (get-gacela-time)) (time-per-frame (/ 1000.0 *frames-per-second*)))
+          (cond ((< frame-time time-per-frame)
+                 (SDL_Delay (- time-per-frame frame-time)))))
         (process-events)
         (setq running nil))))