summaryrefslogtreecommitdiffstats
path: root/MatchBloxEngine/MatchBloxEngine/C_Block.h
diff options
context:
space:
mode:
Diffstat (limited to 'MatchBloxEngine/MatchBloxEngine/C_Block.h')
-rw-r--r--MatchBloxEngine/MatchBloxEngine/C_Block.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/MatchBloxEngine/MatchBloxEngine/C_Block.h b/MatchBloxEngine/MatchBloxEngine/C_Block.h
index e76a676..f0e03b7 100644
--- a/MatchBloxEngine/MatchBloxEngine/C_Block.h
+++ b/MatchBloxEngine/MatchBloxEngine/C_Block.h
@@ -6,21 +6,22 @@
typedef enum BlockAnimState
{
- IDLE = 0,
- FADE_IN = 1,
- FADE_OUT = 2,
- COLLIDE = 3
+ BS_IDLE = 0,
+ BS_FADE_IN = 1,
+ BS_FADE_OUT = 2,
+ BS_COLLIDE = 3
};
-unsigned int g_BlockAnimDurations[4] = {0, 500, 500, 500};
class C_Block : public C_3DObject
{
public:
- C_Block(char* f_strFileName);
+ C_Block(const char* f_strFileName,
+ GLuint f_uiColorTex ,
+ MatProps_t f_Mat);
~C_Block();
- void Draw(unsigned int f_iElapsedTime);
+ void Render(unsigned int f_iElapsedTime);
inline void SetState(BlockAnimState f_State, unsigned int f_uiElapsedTime) { m_CurrState = f_State; m_uiAnimStart = f_uiElapsedTime; }
private:
@@ -28,4 +29,5 @@ private:
unsigned int m_uiAnimStart;
};
-#endif //C_BLOCK_HEADER_FILE \ No newline at end of file
+#endif //C_BLOCK_HEADER_FILE
+