Changeset 617 for trunk/deushaxTweet

Timestamp:

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

Author:

sam

Message:

Store the requested FPS in the Ticker class.

Location:

trunk/deushax

Files:

• deushax.cpp (modified) (2 diffs)
• gtk/glmapview.cpp (modified) (2 diffs)

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();
     }