Simplify 'scene' interface

feresr · Aug 22, 2020 · 56f5c81 · 56f5c81
1 parent 9acef5d
commit 56f5c81
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 37 deletions.
diff --git a/include/ecs/ecs.h b/include/ecs/ecs.h
@@ -200,7 +200,4 @@ class World {
 private:
     std::vector<Entity*> entities;
     std::vector<System*> systems;
-    // TODO: use std::vector<std::unique_ptr<System>> systems; to
-    // make the fact that World owns the systems more explicit
-    // https://stackoverflow.com/questions/45087944/how-to-indicate-c-ownership-of-pointer
 };
diff --git a/include/scenes/EditorScene.h b/include/scenes/EditorScene.h
@@ -3,11 +3,7 @@
 class EditorScene : public Scene {
 
 public:
-    EditorScene(SDL_Window* window);
+    explicit EditorScene(SDL_Window* window);
 
-private:
-    void update() override;
-
-public:
     bool isFinished() override;
 };
diff --git a/include/scenes/GameScene.h b/include/scenes/GameScene.h
@@ -5,11 +5,9 @@ class GameScene : public Scene {
 public:
     explicit GameScene(SDL_Window* window);
 
+    bool isFinished() override;
+
 private:
     bool gameOver = false;
-    void update() override;
-
-public:
-    bool isFinished() override;
 
 };
diff --git a/include/scenes/IntroScene.h b/include/scenes/IntroScene.h
@@ -3,13 +3,12 @@
 class IntroScene : public Scene {
 
 public:
-    IntroScene(SDL_Window* window);
+    explicit IntroScene(SDL_Window* window);
 
-private:
-    int timer = 0;
-    void update() override;
-
-public:
     bool isFinished() override;
 
+    void update() override;
+
+private:
+    int timer = 0;
 };
diff --git a/include/scenes/Scene.h b/include/scenes/Scene.h
@@ -17,11 +17,13 @@
 
 class Scene {
 protected:
-    World* world;
+    World* world = new World();
 
 public:
 
-    virtual void update() {};
+    virtual void update() {
+        world->tick();
+    };
 
     virtual bool isFinished() { return true; }
     virtual void handleEvents(SDL_Event& event) {

diff --git a/src/scenes/EditorScene.cpp b/src/scenes/EditorScene.cpp
@@ -1,13 +1,11 @@
 #include "scenes/EditorScene.h"
 
 EditorScene::EditorScene(SDL_Window* window) {
-    world = new World();
     world->registerSystem<RenderSystem>(window, SNES_RESOLUTION_WIDTH, SNES_RESOLUTION_HEIGHT);
     world->registerSystem<EditorSystem>();
     world->registerSystem<TileSystem>();
     world->registerSystem<PhysicsSystem>();
 
-
     auto title = world->create();
     title->assign<TextComponent>("MAP EDITOR MODE");
     title->assign<TransformComponent>(10, 10, 60, 8);
@@ -33,11 +31,6 @@ EditorScene::EditorScene(SDL_Window* window) {
     instructions5->assign<TransformComponent>(10, 44, 80, 5);
 }
 
-void EditorScene::update() {
-    Scene::update();
-    world->tick();
-}
-
 bool EditorScene::isFinished() {
     return false;
 }

diff --git a/src/scenes/GameScene.cpp b/src/scenes/GameScene.cpp
@@ -1,7 +1,6 @@
 #include "scenes/GameScene.h"
 
 GameScene::GameScene(SDL_Window* window) {
-    world = new World();
     world->registerSystem<SoundSystem>();
     world->registerSystem<RenderSystem>(window, SNES_RESOLUTION_WIDTH, SNES_RESOLUTION_HEIGHT);
     world->registerSystem<PlayerSystem>([&](){ this->gameOver = true; });
@@ -15,10 +14,6 @@ GameScene::GameScene(SDL_Window* window) {
     world->registerSystem<PhysicsSystem>();
 }
 
-void GameScene::update() {
-    world->tick();
-}
-
 bool GameScene::isFinished() {
     return gameOver;
 }

diff --git a/src/scenes/IntroScene.cpp b/src/scenes/IntroScene.cpp
@@ -1,8 +1,6 @@
 #include "scenes/IntroScene.h"
 
-
 IntroScene::IntroScene(SDL_Window* window) {
-    world = new World();
     world->registerSystem<RenderSystem>(window, SNES_RESOLUTION_WIDTH, SNES_RESOLUTION_HEIGHT)
             ->setBackgroundColor(0, 0, 0);
     world->registerSystem<ScoreSystem>();
@@ -37,11 +35,8 @@ IntroScene::IntroScene(SDL_Window* window) {
 void IntroScene::update() {
     timer++;
     Scene::update();
-    world->tick();
 }
 
 bool IntroScene::isFinished() {
     return timer >= INTRO_SCREEN_TIME;
 }
-
-