diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 91301ac33a..0da696f734 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -8,6 +8,10 @@ ________________________________________________________________________________
StepMania 5.0 $next | 2011xxxx
--------------------------------------------------------------------------------
+2011/10/07
+----------
+* [RageDisplay] Add the GetFPS, GetVPF, and GetCumFPS bindings. [Wolfman2000]
+
2011/10/06
----------
* Various scoring fixes sourced from http://www47.atwiki.jp/waiei/pages/21.html
diff --git a/Docs/Luadoc/Lua.xml b/Docs/Luadoc/Lua.xml
index 2956478b72..ce09d46c44 100644
--- a/Docs/Luadoc/Lua.xml
+++ b/Docs/Luadoc/Lua.xml
@@ -1134,6 +1134,9 @@
+
+
+
diff --git a/Docs/Luadoc/LuaDocumentation.xml b/Docs/Luadoc/LuaDocumentation.xml
index fdbfd37f93..4e868a5353 100644
--- a/Docs/Luadoc/LuaDocumentation.xml
+++ b/Docs/Luadoc/LuaDocumentation.xml
@@ -3035,6 +3035,15 @@
Return the width of the display.
+
+ Return the FPS.
+
+
+ Return the VPF.
+
+
+ Return the cumulative FPS.
+
diff --git a/src/RageDisplay.cpp b/src/RageDisplay.cpp
index b1c8c1b46f..02deceb34a 100644
--- a/src/RageDisplay.cpp
+++ b/src/RageDisplay.cpp
@@ -1012,11 +1012,32 @@ public:
LuaHelpers::Push( L, params.height );
return 1;
}
+
+ static int GetFPS( T* p, lua_State *L )
+ {
+ lua_pushnumber(L, p->GetFPS());
+ return 1;
+ }
+
+ static int GetVPF( T* p, lua_State *L )
+ {
+ lua_pushnumber(L, p->GetVPF());
+ return 1;
+ }
+
+ static int GetCumFPS( T* p, lua_State *L )
+ {
+ lua_pushnumber(L, p->GetCumFPS());
+ return 1;
+ }
LunaRageDisplay()
{
ADD_METHOD( GetDisplayWidth );
ADD_METHOD( GetDisplayHeight );
+ ADD_METHOD( GetFPS );
+ ADD_METHOD( GetVPF );
+ ADD_METHOD( GetCumFPS );
}
};