(no commit message)

[gacela.git] / gacela.lisp

diff --git a/gacela.lisp b/gacela.lisp
index 617ad3ccd76185f18473dd2bc489962601917fe4..b7ad4e3d04214f56fc2ae62a51d70de5cb1adf4a 100644 (file)
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -22,10 +22,9 @@
 (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))
-(defvar *zoom* -10)
 
 ;;; SDL Initialization Subsystem
 (let (initialized)
@@ -89,10 +88,10 @@
 
 
 (defun init-GL ()
+  (2d-mode)
   (glShadeModel GL_SMOOTH)
   (glClearColor 0 0 0 0)
   (glClearDepth 1)
-  (glEnable GL_DEPTH_TEST)
   (glDepthFunc GL_LEQUAL)
 ;  (glEnable GL_BLEND)
 ;  (glBlendFunc GL_SRC_ALPHA GL_ONE)
@@ -109,12 +108,12 @@
 
 (defun resize-screen-GL (width height)
   (let ((ratio (if (= height 0) width (/ width height))))
-    (glViewPort 0 0 width height)
+;    (glViewPort 0 0 width height)
     (glMatrixMode GL_PROJECTION)
     (glLoadIdentity)
     (let* ((w (/ width 2)) (-w (neg w)) (h (/ height 2)) (-h (neg h)))
       (glOrtho -w w -h h 0 1))
-    (gluPerspective 45 ratio 0.1 100)
+;    (gluPerspective 45 ratio 0.1 100)
     (glMatrixMode GL_MODELVIEW)
     (glLoadIdentity)
     t))
@@ -349,18 +348,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)
-        (translate 0 0 *zoom*)
         ,@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))))