fix: camera initialization

developer239 · Dec 3, 2023 · 0ca826c · 0ca826c
1 parent d8c4c28
commit 0ca826c
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/src/apps/day3/src/strategies/ECSStrategy.h b/src/apps/day3/src/strategies/ECSStrategy.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <optional>
+
 #include "core/AssetStore.h"
 #include "core/IStrategy.h"
 #include "core/Window.h"
@@ -19,7 +21,7 @@
 
 class MinimalLoopStrategy : public Core::IStrategy {
  public:
-  ECS::Entity cameraEntity = ECS::Registry::Instance().CreateEntity();
+  std::optional<ECS::Entity> cameraEntity;
 
   void Init(Core::Window& window, Core::Renderer& renderer) override {
     Core::AssetStore::Instance().AddFont("pico8", "assets/fonts/arial.ttf", 24);
@@ -45,14 +47,6 @@ class MinimalLoopStrategy : public Core::IStrategy {
 
     // Entities & Components
 
-    // Camera
-    ECS::Registry::Instance().AddComponent<CameraComponent>(
-        cameraEntity,
-        Vec2(0, 0),
-        window.GetWidth() + 100,
-        window.GetHeight() + 100
-    );
-
     // Puzzle related entities
     auto inputData = ParseInput("assets/input-example-1.txt");
     auto partsAndSymbols = FindPartsAndSymbols(inputData);
@@ -142,6 +136,15 @@ class MinimalLoopStrategy : public Core::IStrategy {
           Vec2(bboxOffset, bboxOffset)
       );
     }
+
+    // Camera
+    cameraEntity = ECS::Registry::Instance().CreateEntity();
+    ECS::Registry::Instance().AddComponent<CameraComponent>(
+        cameraEntity.value(),
+        Vec2(0, 0),
+        window.GetWidth() + 100,
+        window.GetHeight() + 100
+    );
   }
 
   void HandleEvent(SDL_Event& event) override {
@@ -170,10 +173,10 @@ class MinimalLoopStrategy : public Core::IStrategy {
     );
     ECS::Registry::Instance().GetSystem<RenderRigidBodiesSystem>().Render(
         renderer,
-        cameraEntity
+        cameraEntity.value()
     );
-    ECS::Registry::Instance().GetSystem<RenderTextSystem>().Render(renderer, cameraEntity);
+    ECS::Registry::Instance().GetSystem<RenderTextSystem>().Render(renderer, cameraEntity.value());
 
-    ECS::Registry::Instance().GetSystem<RenderCollidersSystem>().Render(renderer, cameraEntity);
+    ECS::Registry::Instance().GetSystem<RenderCollidersSystem>().Render(renderer, cameraEntity.value());
   }
 };