actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rewrite DynamicThemeMetric. Only eval the expression every time if a

Browse Source 
metric contains a function.  This makes DynamicThemeMetric an eventual
candidate to replace ThemeMetric.
This commit is contained in:
Glenn Maynard
2005-07-14 06:59:57 +00:00
parent 9a388945b0
commit c5a1b97da8
1 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ThemeMetric.h
+39 -15
View File
@@ -226,8 +226,17 @@ public:
bool operator ==( T other ) const { return GetValue() == other; } bool operator ==( T other ) const { return GetValue() == other; }
}; };
/* Like ThemeMetric, but evaluates Lua expressions each time. This is fast, /*
* since we only compile the expression once, but not as fast as ThemeMetric. */ * Like ThemeMetric, but allows evaluating Lua expressions each time. This is
* fast, since we only compile the expression once. To evaluate every time,
* return a function instead of a value.
*
* This is just as fast as ThemeMetric when the value is not a function.
*
* This differs from ThemeMetric: the value of the metric must be a valid Lua
* expression; strings must be enclosed in quotes. (This is probably how
* all metrics will eventually behave.)
*/
template <class T> template <class T>
class DynamicThemeMetric : public IThemeMetric class DynamicThemeMetric : public IThemeMetric
{ {
@@ -236,7 +245,7 @@ private:
CString m_sName; CString m_sName;
mutable T m_currentValue; mutable T m_currentValue;
bool m_bIsLoaded; bool m_bIsLoaded;
LuaExpression m_Expr; LuaReference m_Value;
public: public:
/* Initializing with no group and name is allowed; if you do this, you must /* Initializing with no group and name is allowed; if you do this, you must
@@ -258,7 +267,7 @@ public:
m_sName( cpy.m_sName ), m_sName( cpy.m_sName ),
m_currentValue( cpy.m_currentValue ), m_currentValue( cpy.m_currentValue ),
m_bIsLoaded( cpy.m_bIsLoaded ), m_bIsLoaded( cpy.m_bIsLoaded ),
m_Expr( cpy.m_Expr ) m_Value( cpy.m_Value )
{ {
ThemeManager::Subscribe( this ); ThemeManager::Subscribe( this );
} }
@@ -287,7 +296,21 @@ public:
{ {
CString sExpression; CString sExpression;
THEME->GetMetric( m_sGroup, m_sName, sExpression ); THEME->GetMetric( m_sGroup, m_sName, sExpression );
m_Expr.SetFromExpression( "function() return " + sExpression + " end" );
Lua *L = LUA->Get();
LuaHelpers::RunScript( L, "return " + sExpression, ssprintf("%s:%s", m_sGroup.c_str(), m_sName.c_str()), 1 );
if( lua_type(L, -1) == LUA_TFUNCTION )
{
m_Value.SetFromStack( L );
}
else
{
m_Value.Unset();
LuaHelpers::PopStack( m_currentValue, L );
}
LUA->Release(L);
m_bIsLoaded = true; m_bIsLoaded = true;
} }
@@ -298,18 +321,19 @@ public:
ASSERT( m_sName != "" ); ASSERT( m_sName != "" );
ASSERT( m_bIsLoaded ); ASSERT( m_bIsLoaded );
Lua *L = LUA->Get(); /* If the value is a function, evaluate it every time. */
if( m_Value.IsSet() )
{
Lua *L = LUA->Get();
// function // call function with 0 arguments and 1 result
m_Expr.PushSelf( L ); m_Value.PushSelf( L );
ASSERT( !lua_isnil(L, -1) ); lua_call(L, 0, 1);
ASSERT( !lua_isnil(L, -1) );
LuaHelpers::PopStack( m_currentValue, L );
LUA->Release(L);
}
// call function with 0 arguments and 1 result
lua_call(L, 0, 1);
LuaHelpers::PopStack( m_currentValue, L );
LUA->Release(L);
return m_currentValue; return m_currentValue;
} }