Changeset 617Tweet

Timestamp:

Feb 9, 2011, 12:23:54 AM (12 years ago)

Author:

sam

Message:

Store the requested FPS in the Ticker class.

Location:

trunk

Files:

• deushax/deushax.cpp (modified) (2 diffs)
• deushax/gtk/glmapview.cpp (modified) (2 diffs)
• monsterz/monsterz.cpp (modified) (2 diffs)
• src/ticker.cpp (modified) (2 diffs)
• src/ticker.h (modified) (1 diff)

trunk/deushax/deushax.cpp

@@ -50 +50 @@
     //SDL_WM_GrabInput(SDL_GRAB_ON);
 
+    Ticker::Setup(FPS);
+
     /* Initialise OpenGL */
     Video::Setup(video->w, video->h);
@@ -76 +78 @@
         Ticker::TickDraw();
         SDL_GL_SwapBuffers();
-        Ticker::ClampFps(1000.0f / FPS);
+        Ticker::ClampFps();
     }
 

trunk/deushax/gtk/glmapview.cpp

@@ -122 +122 @@
     gtk_widget_grab_focus(glarea);
     if (gtk_gl_area_make_current(GTK_GL_AREA(glarea)))
+    {
+        Ticker::Setup(FPS);
         Video::Setup(glarea->allocation.width, glarea->allocation.height);
+    }
 
     UpdateAdjustments();
@@ -156 +159 @@
 
         // FIXME: do some GTK stuff in here
-        Ticker::ClampFps(1000.0f / FPS);
+        Ticker::ClampFps();
     }
 

trunk/monsterz/monsterz.cpp

@@ -52 +52 @@
     SDL_ShowCursor(0);
 
-    /* Initialise OpenGL */
+    /* Initialise everything */
+    Ticker::Setup(FPS);
     Video::Setup(video->w, video->h);
     Audio::Setup(2);
@@ -75 +76 @@
         Ticker::TickDraw();
         SDL_GL_SwapBuffers();
-        Ticker::ClampFps(1000.0f / FPS);
+        Ticker::ClampFps();
     }
 

trunk/src/ticker.cpp

@@ -140 +140 @@
 }
 
+void Ticker::Setup(float fps)
+{
+    data->fps = fps;
+}
+
 void Ticker::TickGame()
 {
@@ -309 +314 @@
 }
 
-void Ticker::ClampFps(float deltams)
+void Ticker::ClampFps()
 {
     Profiler::Stop(Profiler::STAT_TICK_BLIT);
+
+    float deltams = data->fps ? 1000.0f / data->fps : 0.0f;
 
     if (deltams > data->bias + 200.0f)

trunk/src/ticker.h

@@ -29 +29 @@
     static int Unref(Entity *entity);
 
+    static void Setup(float fps);
     static void TickGame();
     static void TickDraw();
-    static void ClampFps(float deltams);
+    static void ClampFps();
     static int GetFrameNum();