From 24918837c3ff9026d228657d14852c9cf39a5644 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Wed, 3 Feb 2021 01:11:31 -0500
Subject: Added camera system

---
 src/main.cpp | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index d182290..a092114 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,9 +6,14 @@
 #include "timer.h"
 #include "map.h"
 #include "mixer.h"
+#include "transform_system.h"
+#include "camera_system.h"
 
 void loop(Renderer& renderer, Mixer& mixer) {
   Game game;
+  game.emplaceSystem<TransformSystem>();
+  game.emplaceSystem<CameraSystem>();
+
   Input keystate;
 
   auto map = std::make_unique<Map>("../res/map1.tmx", renderer);
@@ -19,10 +24,10 @@ void loop(Renderer& renderer, Mixer& mixer) {
   int dusterSprite = game.addSprite(Sprite("../res/duster_anim.txt", renderer));
   int boneySprite = game.addSprite(Sprite("../res/boney_anim.txt", renderer));
 
-  game.getTransformSystem().initSprite(lucasSprite, {32, 32});
-  game.getTransformSystem().initSprite(kumaSprite, {32, 32});
-  game.getTransformSystem().initSprite(dusterSprite, {32, 32});
-  game.getTransformSystem().initSprite(boneySprite, {32, 32});
+  game.getSystem<TransformSystem>().initSprite(lucasSprite, {32, 32});
+  game.getSystem<TransformSystem>().initSprite(kumaSprite, {32, 32});
+  game.getSystem<TransformSystem>().initSprite(dusterSprite, {32, 32});
+  game.getSystem<TransformSystem>().initSprite(boneySprite, {32, 32});
 
   Party party;
   party.addMember(game, lucasSprite);
@@ -30,9 +35,8 @@ void loop(Renderer& renderer, Mixer& mixer) {
   party.addMember(game, dusterSprite);
   party.addMember(game, boneySprite);
 
-  game.setFollowingSprite(lucasSprite);
-  game.unlockCamera();
-  game.tick();
+  game.getSystem<CameraSystem>().setFollowingSprite(lucasSprite);
+  game.getSystem<CameraSystem>().unlockCamera();
 
   renderer.render(game);
 
@@ -73,7 +77,9 @@ void loop(Renderer& renderer, Mixer& mixer) {
       game.tickSpriteAnim();
     }
 
-    game.tick();
+    for (System& system : game.systems()) {
+      system.tick(frameTime);
+    }
 
     renderer.render(game);
   }
-- 
cgit 1.4.1