1 files changed, 28 insertions, 12 deletions

@@ -3,19 +3,35 @@
 #include "components/animatable.h"
 #include "components/transformable.h"
 
-void RenderingSystem::tick(double dt)
+void RenderingSystem::tick(double)
 {
-  texture.fill(texture.entirety(), 0, 0, 0);
-  
-  std::set<int> spriteEntities = game.getEntityManager().getEntitiesWithComponents<AnimatableComponent, TransformableComponent>();
-  for (int entity : spriteEntities)
+  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 {(int) transform.getX(), (int) transform.getY(), transform.getW(), transform.getH()};
-    
-    texture.blit(sprite.getTexture(), sprite.getFrameRect(), dstrect);
+    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();
+
+  texture_.renderScreen();
 }