too many things

src/td/game/GameHistory.cpp

@@ -1,44 +0,0 @@
-#include <td/game/GameHistory.h>
-
-namespace td {
-namespace game {
-
-GameHistory::GameHistory() : m_History(std::numeric_limits<HistorySizeType>::max()), m_Cursor(0) {}
-
-void GameHistory::SetLockStep(HistorySizeType a_Index, protocol::LockStep&& a_LockStep) {
-	m_History[a_Index] = std::move(a_LockStep);
-}
-
-const protocol::LockStep& GameHistory::GetLockStep(HistorySizeType a_Index) const {
-	return *m_History[a_Index];
-}
-
-bool GameHistory::HasLockStep(HistorySizeType a_Index) const {
-	return m_History[a_Index].has_value();
-}
-
-const protocol::LockStep& GameHistory::GetNextStep() {
-	return GetLockStep(m_Cursor++);
-}
-
-bool GameHistory::HasNextStep() const {
-	return HasLockStep(m_Cursor);
-}
-
-void GameHistory::FromPacket(td::protocol::pdata::LockSteps&& a_Steps) {
-	for (int i = 0; i < LOCKSTEP_BUFFER_SIZE; i++) {
-		protocol::LockStep& step = a_Steps.m_LockSteps[i];
-		SetLockStep(i + a_Steps.m_FirstFrameNumber, std::move(step));
-	}
-}
-
-td::protocol::packets::LockStepsPacket GameHistory::ToPacket(HistorySizeType a_StartIndex) {
-	Array<protocol::LockStep, LOCKSTEP_BUFFER_SIZE> steps;
-	for (int i = 0; i < LOCKSTEP_BUFFER_SIZE; i++) {
-		steps[i] = GetLockStep(a_StartIndex + i);
-	}
-	return {a_StartIndex, std::move(steps)};
-}
-
-}  // namespace game
-}  // namespace td

src/td/game/World.cpp

@@ -1,9 +1,11 @@
 #include <td/game/World.h>
 
+#include <td/simulation/WorldTicker.h>
+
 namespace td {
 namespace game {
 
-World::World() : m_Teams{Team{TeamColor::Red}, Team{TeamColor::Blue}} {
+World::World() : m_CurrentState{.m_Teams{Team{TeamColor::Red}, Team{TeamColor::Blue}}} {
 	
 }
 
@@ -55,5 +57,9 @@ bool World::LoadMap(const protocol::pdata::WorldData& a_WorldData) {
 	return true;
 }
 
+void World::Tick(const protocol::LockStep& a_LockStep, FpFloat a_Delta) {
+	m_CurrentState = m_Ticker.NextStep(*this, m_CurrentState, a_LockStep, a_Delta);
+}
+
 }  // namespace game
 }  // namespace td

src/td/game/WorldTypes.cpp

@@ -0,0 +1,44 @@
+#include <td/game/WorldTypes.h>
+
+#include <sp/common/DataBuffer.h>
+
+namespace td {
+namespace game {
+
+sp::DataBuffer& operator>>(sp::DataBuffer& buffer, TileType& tile) {
+	std::uint8_t raw;
+	buffer >> raw;
+	tile = TileType(raw);
+	return buffer;
+}
+
+sp::DataBuffer& operator>>(sp::DataBuffer& buffer, TilePtr& tile) {
+	game::TileType tileType;
+	buffer >> tileType;
+	switch (tileType) {
+		case game::TileType::Tower: {
+			auto tilePtr = std::make_shared<game::TowerTile>();
+			buffer >> tilePtr->color_palette_ref >> tilePtr->team_owner;
+			tile = tilePtr;
+			break;
+		}
+		case game::TileType::Walk: {
+			auto tilePtr = std::make_shared<game::WalkableTile>();
+			buffer >> tilePtr->direction;
+			tile = tilePtr;
+			break;
+		}
+		case game::TileType::Decoration: {
+			auto tilePtr = std::make_shared<game::DecorationTile>();
+			buffer >> tilePtr->color_palette_ref;
+			tile = tilePtr;
+			break;
+		}
+		default:
+			break;
+	}
+	return buffer;
+}
+
+}  // namespace game
+}  // namespace td