minor cleanup

This commit is contained in:
Glenn Maynard
2005-09-03 23:07:28 +00:00
parent 1f43aa0a17
commit 90f4a5a1d8
2 changed files with 7 additions and 10 deletions
+2 -2
View File
@@ -15,11 +15,11 @@ void LuaExpressionTransform::SetFromExpression( const CString &sExpression, int
m_iNumSubdivisions = iNumSubdivisions;
}
const Actor::TweenState &LuaExpressionTransform::GetPosition( float fPositionOffsetFromCenter, int iItemIndex, int iNumItems )
const Actor::TweenState &LuaExpressionTransform::GetPosition( float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ) const
{
PositionOffsetAndItemIndex key = { fPositionOffsetFromCenter, iItemIndex };
map<PositionOffsetAndItemIndex,Actor::TweenState>::iterator iter = m_mapPositionToTweenStateCache.find( key );
map<PositionOffsetAndItemIndex,Actor::TweenState>::const_iterator iter = m_mapPositionToTweenStateCache.find( key );
if( iter != m_mapPositionToTweenStateCache.end() )
return iter->second;
+5 -8
View File
@@ -15,7 +15,7 @@ public:
void SetFromExpression( const CString &sExpression, int iNumSubdivisions );
void PositionItem( Actor *pActor, float fPositionOffsetFromCenter, int iItemIndex, int iNumItems );
const Actor::TweenState &GetPosition( float fPositionOffsetFromCenter, int iItemIndex, int iNumItems );
const Actor::TweenState &GetPosition( float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ) const;
protected:
@@ -28,15 +28,12 @@ protected:
bool operator<( const PositionOffsetAndItemIndex &other ) const
{
if( fPositionOffsetFromCenter < other.fPositionOffsetFromCenter )
return true;
else if( fPositionOffsetFromCenter > other.fPositionOffsetFromCenter )
return false;
else
return iItemIndex < other.iItemIndex;
if( fPositionOffsetFromCenter != other.fPositionOffsetFromCenter )
return fPositionOffsetFromCenter < other.fPositionOffsetFromCenter;
return iItemIndex < other.iItemIndex;
}
};
map<PositionOffsetAndItemIndex,Actor::TweenState> m_mapPositionToTweenStateCache;
mutable map<PositionOffsetAndItemIndex,Actor::TweenState> m_mapPositionToTweenStateCache;
};
#endif