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

don't bother trying to hide LuaReference. It's used everywhere, and

Browse Source 
allocating it like this make copy ctors a pain.
This commit is contained in:
Glenn Maynard
2006-09-24 19:22:30 +00:00
parent f58a589b5f
commit 1b13c0bc7e
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LuaExpressionTransform.cpp
+2 -5
View File
@@ -1,23 +1,20 @@
#include "global.h" #include "global.h"
#include "LuaExpressionTransform.h" #include "LuaExpressionTransform.h"
#include "LuaReference.h"
#include "LuaManager.h" #include "LuaManager.h"
#include "RageUtil.h" #include "RageUtil.h"
LuaExpressionTransform::LuaExpressionTransform() LuaExpressionTransform::LuaExpressionTransform()
{ {
m_pexprTransformFunction = new LuaReference;
m_iNumSubdivisions = 1; m_iNumSubdivisions = 1;
} }
LuaExpressionTransform::~LuaExpressionTransform() LuaExpressionTransform::~LuaExpressionTransform()
{ {
delete m_pexprTransformFunction;
} }
void LuaExpressionTransform::SetFromReference( const LuaReference &ref ) void LuaExpressionTransform::SetFromReference( const LuaReference &ref )
{ {
*m_pexprTransformFunction = ref; m_exprTransformFunction = ref;
} }
const Actor::TweenState &LuaExpressionTransform::GetPosition( float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ) const const Actor::TweenState &LuaExpressionTransform::GetPosition( float fPositionOffsetFromCenter, int iItemIndex, int iNumItems ) const
@@ -31,7 +28,7 @@ const Actor::TweenState &LuaExpressionTransform::GetPosition( float fPositionOff
Actor a; Actor a;
Lua *L = LUA->Get(); Lua *L = LUA->Get();
m_pexprTransformFunction->PushSelf( L ); m_exprTransformFunction.PushSelf( L );
ASSERT( !lua_isnil(L, -1) ); ASSERT( !lua_isnil(L, -1) );
a.PushSelf( L ); a.PushSelf( L );
LuaHelpers::Push( fPositionOffsetFromCenter, L ); LuaHelpers::Push( fPositionOffsetFromCenter, L );
stepmania/src/LuaExpressionTransform.h
+2 -2
View File
@@ -4,7 +4,7 @@
#define LuaExpressionTransform_H #define LuaExpressionTransform_H
#include "Actor.h" #include "Actor.h"
class LuaReference; #include "LuaReference.h"
#include <map> #include <map>
class LuaExpressionTransform class LuaExpressionTransform
@@ -22,7 +22,7 @@ public:
protected: protected:
LuaReference *m_pexprTransformFunction; // params: self,offset,itemIndex,numItems LuaReference m_exprTransformFunction; // params: self,offset,itemIndex,numItems
int m_iNumSubdivisions; // 1 == one evaluation per position int m_iNumSubdivisions; // 1 == one evaluation per position
struct PositionOffsetAndItemIndex struct PositionOffsetAndItemIndex
{ {