Replaced Context+Battle combo with State and arbitrary Systems

5 files changed, 7 insertions, 38 deletions

diff --git a/sim/include/kurator/sim/Battle.h b/sim/include/kurator/sim/Battle.h
deleted file mode 100644
index 1692c0c..0000000
--- a/sim/include/kurator/sim/Battle.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include <memory>
-
-#include <kurator/engine/Context.h>
-#include <kurator/campaign/Scenario.h>
-
-
-namespace kurator
-{
-namespace sim
-{
-
-
-class Battle
-{
-public:
-	virtual ~Battle() = default;
-	virtual engine::Context context() = 0;
-	virtual engine::ConstContext const_context() const = 0;
-	virtual void update(engine::Context& ctx) = 0;
-};
-
-
-auto prepare(const campaign::Scenario& scenario) -> std::unique_ptr<Battle>;
-
-
-}  // namespace sim
-}  // namespace kurator
diff --git a/sim/include/kurator/sim/FloatingMovement.h b/sim/include/kurator/sim/FloatingMovement.h
index 4239d99..ff40e23 100644
--- a/sim/include/kurator/sim/FloatingMovement.h
+++ b/sim/include/kurator/sim/FloatingMovement.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include <kurator/engine/Context.h>
 #include <kurator/engine/Point.h>
 
+#include "State.h"
+
 
 namespace kurator
 {
@@ -17,7 +18,7 @@ struct FloatingMovement
 	double deceleration;
 	double destination_boundary = 100.0;
 	engine::Point speed = {0.0, 0.0};
-	static void update(engine::Context& ctx);
+	static void update(State& ctx);
 };
 
 
diff --git a/sim/include/kurator/sim/State.h b/sim/include/kurator/sim/State.h
index 8449ad2..fc7c54a 100644
--- a/sim/include/kurator/sim/State.h
+++ b/sim/include/kurator/sim/State.h
@@ -5,7 +5,6 @@
 
 #include <kurator/engine/Camera.h>
 #include <kurator/engine/Clock.h>
-#include <kurator/engine/Context.h>
 
 
 namespace kurator
@@ -20,8 +19,6 @@ struct State
 	entt::dispatcher dispatcher;
 	engine::Clock clock;
 	engine::Camera camera;  // does not fit in here really
-	operator engine::Context();
-	operator engine::ConstContext() const;
 };
 
 
diff --git a/sim/include/kurator/sim/System.h b/sim/include/kurator/sim/System.h
index 101812a..d4b744c 100644
--- a/sim/include/kurator/sim/System.h
+++ b/sim/include/kurator/sim/System.h
@@ -2,7 +2,7 @@
 
 #include <functional>
 
-#include <kurator/engine/Context.h>
+#include "State.h"
 
 
 namespace kurator
@@ -11,7 +11,7 @@ namespace sim
 {
 
 
-using System = std::function<void(engine::Context&)>;
+using System = std::function<void(State&)>;
 
 
 }  // namespace sim
diff --git a/sim/include/kurator/sim/TurretControl.h b/sim/include/kurator/sim/TurretControl.h
index 323b54b..731f30e 100644
--- a/sim/include/kurator/sim/TurretControl.h
+++ b/sim/include/kurator/sim/TurretControl.h
@@ -2,7 +2,7 @@
 
 #include <entt/entity/entity.hpp>
 
-#include <kurator/engine/Context.h>
+#include "State.h"
 
 
 namespace kurator
@@ -17,7 +17,7 @@ struct TurretControl
 	double reload;
 	int rounds;
 	entt::entity owner;
-	static void update(engine::Context& ctx);
+	static void update(State& ctx);
 };