Moved sprite rendering into AnimatingSystem

Refactored how systems work slightly. Now, rendering can be done by a number of systems working together. Since the AnimatingSystem handles the animation of sprites, it should also handle the rendering of them. Because of this, the RenderingSystem has been removed.

4 files changed, 33 insertions, 59 deletions

@@ -1,6 +1,7 @@
 #include "animating.h"
 #include "game.h"
 #include "components/animatable.h"
+#include "components/transformable.h"
 
 void AnimatingSystem::tick(double)
 {
@@ -28,6 +29,35 @@ void AnimatingSystem::tick(double)
   }
 }
 
+void AnimatingSystem::render(Texture& texture)
+{
+  std::set<id_type> spriteEntities =
+    game_.getEntityManager().getEntitiesWithComponents<
+      AnimatableComponent,
+      TransformableComponent>();
+
+  for (id_type entity : spriteEntities)
+  {
+    auto& sprite = game_.getEntityManager().
+      getComponent<AnimatableComponent>(entity);
+
+    auto& transform = game_.getEntityManager().
+      getComponent<TransformableComponent>(entity);
+
+    Rectangle dstrect {
+      static_cast<int>(transform.getX()),
+      static_cast<int>(transform.getY()),
+      transform.getW(),
+      transform.getH()};
+
+    const AnimationSet& aset = sprite.getAnimationSet();
+    texture.blit(
+      aset.getTexture(),
+      aset.getFrameRect(sprite.getFrame()),
+      dstrect);
+  }
+}
+
 void AnimatingSystem::startAnimation(id_type entity, std::string animation)
 {
   auto& sprite = game_.getEntityManager().
@@ -3,6 +3,7 @@
 
 #include "system.h"
 #include <string>
+#include "renderer.h"
 
 class AnimatingSystem : public System {
 public:
@@ -13,6 +14,8 @@ public:
 
   void tick(double dt);
 
+  void render(Texture& texture);
+
   void startAnimation(id_type entity, std::string animation);
 
 };
@@ -1,37 +0,0 @@
-#include "rendering.h"
-#include "game.h"
-#include "components/animatable.h"
-#include "components/transformable.h"
-
-void RenderingSystem::tick(double)
-{
-  texture_.fill(texture_.entirety(), 0, 0, 0);
-
-  std::set<id_type> spriteEntities =
-    game_.getEntityManager().getEntitiesWithComponents<
-      AnimatableComponent,
-      TransformableComponent>();
-
-  for (id_type entity : spriteEntities)
-  {
-    auto& sprite = game_.getEntityManager().
-      getComponent<AnimatableComponent>(entity);
-
-    auto& transform = game_.getEntityManager().
-      getComponent<TransformableComponent>(entity);
-
-    Rectangle dstrect {
-      static_cast<int>(transform.getX()),
-      static_cast<int>(transform.getY()),
-      transform.getW(),
-      transform.getH()};
-
-    const AnimationSet& aset = sprite.getAnimationSet();
-    texture_.blit(
-      aset.getTexture(),
-      aset.getFrameRect(sprite.getFrame()),
-      dstrect);
-  }
-
-  texture_.renderScreen();
-}
@@ -1,22 +0,0 @@
-#ifndef RENDERING_H_76ABC02A
-#define RENDERING_H_76ABC02A
-
-#include "system.h"
-#include "renderer.h"
-#include "consts.h"
-
-class RenderingSystem : public System {
-public:
-
-  RenderingSystem(Game& game) : System(game)
-  {
-  }
-
-  void tick(double dt);
-
-private:
-
-  Texture texture_ {GAME_WIDTH, GAME_HEIGHT};
-};
-
-#endif /* end of include guard: RENDERING_H_76ABC02A */