From 85c298d73e871daadf91671cdae9db83e30f9029 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 25 Oct 2014 21:54:00 +0100 Subject: Cleaned up simulators --- src/Simulator/Simulator.h | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/Simulator/Simulator.h') diff --git a/src/Simulator/Simulator.h b/src/Simulator/Simulator.h index 7cc2f1344..f28a07e35 100644 --- a/src/Simulator/Simulator.h +++ b/src/Simulator/Simulator.h @@ -3,24 +3,28 @@ #include "../Vector3.h" +class cWorld; +class cChunk; -template class cSimulator { public: - cSimulator(WorldType & a_World); - virtual ~cSimulator(); + cSimulator(cWorld & a_World) + : m_World(a_World) + { + } + + virtual ~cSimulator() {} /// Called in each tick, a_Dt is the time passed since the last tick, in msec virtual void Simulate(float a_Dt) = 0; /// Called in each tick for each chunk, a_Dt is the time passed since the last tick, in msec; direct access to chunk data available - virtual void SimulateChunk(float a_Dt, int a_ChunkX, - int a_ChunkZ, ChunkType * a_Chunk) + virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) { UNUSED(a_Dt); UNUSED(a_ChunkX); @@ -29,7 +33,7 @@ public: } /// Called when a block changes - virtual void WakeUp(int a_BlockX, int a_BlockY, int a_BlockZ, ChunkType * a_Chunk); + virtual void WakeUp(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk); virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) = 0; @@ -37,9 +41,9 @@ protected: friend class cChunk; // Calls AddBlock() in its WakeUpSimulators() function, to speed things up /// Called to simulate a new block - virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, ChunkType * a_Chunk) = 0; + virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) = 0; - WorldType & m_World; + cWorld & m_World; } ; -- cgit v1.2.3