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

minor cleanup

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LuaExpressionTransform.cpp
+2 -2
View File
@@ -15,11 +15,11 @@ void LuaExpressionTransform::SetFromExpression( const CString &sExpression, int
m_iNumSubdivisions = iNumSubdivisions; 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 }; 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() ) if( iter != m_mapPositionToTweenStateCache.end() )
return iter->second; return iter->second;
stepmania/src/LuaExpressionTransform.h
+4 -7
View File
@@ -15,7 +15,7 @@ public:
void SetFromExpression( const CString &sExpression, int iNumSubdivisions ); void SetFromExpression( const CString &sExpression, int iNumSubdivisions );
void PositionItem( Actor *pActor, float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ); 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: protected:
@@ -28,15 +28,12 @@ protected:
bool operator<( const PositionOffsetAndItemIndex &other ) const bool operator<( const PositionOffsetAndItemIndex &other ) const
{ {
if( fPositionOffsetFromCenter < other.fPositionOffsetFromCenter ) if( fPositionOffsetFromCenter != other.fPositionOffsetFromCenter )
return true; return fPositionOffsetFromCenter < other.fPositionOffsetFromCenter;
else if( fPositionOffsetFromCenter > other.fPositionOffsetFromCenter )
return false;
else
return iItemIndex < other.iItemIndex; return iItemIndex < other.iItemIndex;
} }
}; };
map<PositionOffsetAndItemIndex,Actor::TweenState> m_mapPositionToTweenStateCache; mutable map<PositionOffsetAndItemIndex,Actor::TweenState> m_mapPositionToTweenStateCache;
}; };
#endif #endif