X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgame%2Fstage.h;h=03a8adebc2531e605e5e7e3a58f8ca1dfb573c36;hb=12c863fc1bc5456a4b3aceacc88904d76bd1d8bb;hp=19e70f416f54b512087f4560c5c06c9527f185c8;hpb=f298027c2042b63cec903c98dfc97e792a4f923f;p=libs%2Fgame.git

diff --git a/source/game/stage.h b/source/game/stage.h
index 19e70f4..03a8ade 100644
--- a/source/game/stage.h
+++ b/source/game/stage.h
@@ -8,6 +8,9 @@
 #include "events.h"
 #include "eventsource.h"
 #include "handle.h"
+#include "mspgame_api.h"
+#include "reflection.h"
+#include "systemscheduler.h"
 
 namespace Msp::Game {
 
@@ -15,13 +18,14 @@ class Camera;
 class Root;
 class System;
 
-class Stage
+class MSPGAME_API Stage
 {
 public:
 	using EventSource = Game::EventSource<Events::EntityCreated, Events::EntityDestroyed,
 		Events::ComponentCreated, Events::ComponentDestroyed, Events::CameraChanged>;
 
 private:
+	Reflection::Reflector &reflector;
 	DataFile::Collection &resources;
 	PoolPool pools;
 	EventBus event_bus;
@@ -31,12 +35,15 @@ private:
 	to put it in a pool. */
 	std::unique_ptr<Root> root;
 	std::vector<std::unique_ptr<System>> systems;
+	SystemScheduler scheduler;
 	Handle<Camera> active_camera;
+	bool pending_reschedule = false;
 
 public:
-	Stage(DataFile::Collection &);
+	Stage(Reflection::Reflector &, DataFile::Collection &);
 	~Stage();
 
+	Reflection::Reflector &get_reflector() const { return reflector; }
 	DataFile::Collection &get_resources() const { return resources; }
 	PoolPool &get_pools() { return pools; }
 	EventBus &get_event_bus() { return event_bus; }
@@ -58,6 +65,11 @@ public:
 	void set_active_camera(Handle<Camera>);
 	Handle<Camera> get_active_camera() const { return active_camera; }
 
+	void synthesize_initial_events(EventObserver &);
+private:
+	void synthesize_initial_events(Handle<Entity>, EventObserver &);
+
+public:
 	void tick(Time::TimeDelta);
 };
 
@@ -70,8 +82,13 @@ inline void Stage::iterate_objects(const F &func)
 template<typename T, typename... Args>
 inline T &Stage::add_system(Args &&... args)
 {
-	systems.emplace_back(std::make_unique<T>(*this, std::forward<Args>(args)...));
-	return static_cast<T &>(*systems.back());
+	// Ensure that a reflected class exists for scheduling
+	reflector.get_or_create_class<T>();
+
+	auto &sys = systems.emplace_back(std::make_unique<T>(*this, std::forward<Args>(args)...));
+	scheduler.add_system(*sys);
+	pending_reschedule = true;
+	return static_cast<T &>(*sys);
 }
 
 template<typename T>