From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 11 Feb 2023 13:19:00 +0000 (+0200)
Subject: Make Presenter store pointers to systems, not just renderers
X-Git-Url: https://git.tdb.fi/?a=commitdiff_plain;h=6934a052d5ab0c3af866b0d3fd98cb120bfe785b;p=libs%2Fgame.git

Make Presenter store pointers to systems, not just renderers
---

diff --git a/source/gameview/presenter.cpp b/source/gameview/presenter.cpp
index c65e2a9..194ac80 100644
--- a/source/gameview/presenter.cpp
+++ b/source/gameview/presenter.cpp
@@ -22,14 +22,14 @@ Presenter::Presenter(Game::Director &d, GL::View &v):
 
 Presenter::~Presenter()
 {
-	for(Renderer *r: renderers)
-		r->get_stage().remove_system(*r);
+	for(Game::System *s: systems)
+		s->get_stage().remove_system(*s);
 }
 
 void Presenter::stage_activated(const Game::Events::StageActivated &event)
 {
 	if(!event.stage.get_system<Renderer>())
-		renderers.push_back(&event.stage.add_system<Renderer>(ref(gl_view)));
+		systems.push_back(&event.stage.add_system<Renderer>(ref(gl_view)));
 }
 
 } // namespace Msp::GameView
diff --git a/source/gameview/presenter.h b/source/gameview/presenter.h
index 62f422c..f227d28 100644
--- a/source/gameview/presenter.h
+++ b/source/gameview/presenter.h
@@ -4,13 +4,12 @@
 #include <msp/datafile/collection.h>
 #include <msp/game/director.h>
 #include <msp/game/eventobserver.h>
+#include <msp/game/system.h>
 #include <msp/gl/view.h>
 #include "mspgameview_api.h"
 
 namespace Msp::GameView {
 
-class Renderer;
-
 class MSPGAMEVIEW_API Presenter
 {
 private:
@@ -18,7 +17,7 @@ private:
 	GL::View &gl_view;
 	DataFile::Collection &resources;
 	Game::EventObserver event_observer;
-	std::vector<Renderer *> renderers;
+	std::vector<Game::System *> systems;
 
 public:
 	Presenter(Game::Director &, GL::View &);