diff options
Diffstat (limited to 'matchblox/engine/C_Block.cpp')
-rw-r--r-- | matchblox/engine/C_Block.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/matchblox/engine/C_Block.cpp b/matchblox/engine/C_Block.cpp index 81d3b66..50432ac 100644 --- a/matchblox/engine/C_Block.cpp +++ b/matchblox/engine/C_Block.cpp @@ -24,7 +24,7 @@ C_Block::~C_Block() }
-void C_Block::Render(unsigned int f_iElapsedTime)
+void C_Block::Render(unsigned int f_iElapsedTime, GLint f_iTexLocation)
{
unsigned int l_uiDeltaTime = f_iElapsedTime - m_uiAnimStart;
double l_Scale, l_Scalexz, l_Frac;
@@ -46,7 +46,7 @@ void C_Block::Render(unsigned int f_iElapsedTime) //glScaled(l_Scale, l_Scale, l_Scale);
SetScale(l_Scale, l_Scale, l_Scale);
TransRotateScale();
- C_3DObject::Render();
+ C_3DObject::Render(f_iTexLocation);
break;
case BS_FADE_OUT:
@@ -54,7 +54,7 @@ void C_Block::Render(unsigned int f_iElapsedTime) // glScaled(l_Scale, l_Scale, l_Scale);
SetScale(l_Scale, l_Scale, l_Scale);
TransRotateScale();
- C_3DObject::Render();
+ C_3DObject::Render(f_iTexLocation);
break;
case BS_COLLIDE: //wobble
@@ -64,14 +64,14 @@ void C_Block::Render(unsigned int f_iElapsedTime) l_Scalexz = 1.0 - sin(l_Frac)*0.2;
SetScale(l_Scalexz, l_Scale, l_Scalexz);
TransRotateScale();
- C_3DObject::Render();
+ C_3DObject::Render(f_iTexLocation);
break;
case BS_IDLE:
default:
SetScale(1.0, 1.0, 1.0);
TransRotateScale();
- C_3DObject::Render();
+ C_3DObject::Render(f_iTexLocation);
break;
}
|