From ed08b673c50b076042d8f0c49501372168142764 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Fri, 16 Feb 2018 16:04:32 -0500
Subject: Refactored renderer

Renderer is basically now more C++'y, as it makes more use of classes (a lot of GL types have been wrapped), and the renderer itself is now a class. The monitor mesh is also now indexed.

Tweaked the NTSC artifacting after inadvertently fixing a bug with the way the image was loaded.
---
 src/systems/animating.cpp |  3 ++-
 src/systems/animating.h   |  2 +-
 src/systems/mapping.cpp   | 12 ++++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'src/systems')

diff --git a/src/systems/animating.cpp b/src/systems/animating.cpp
index 91fe925..22224c9 100644
--- a/src/systems/animating.cpp
+++ b/src/systems/animating.cpp
@@ -51,8 +51,9 @@ void AnimatingSystem::render(Texture& texture)
       transform.getH()};
 
     const AnimationSet& aset = sprite.getAnimationSet();
-    texture.blit(
+    game_.getRenderer().blit(
       aset.getTexture(),
+      texture,
       aset.getFrameRect(sprite.getFrame()),
       dstrect);
   }
diff --git a/src/systems/animating.h b/src/systems/animating.h
index d6a89a5..548bff1 100644
--- a/src/systems/animating.h
+++ b/src/systems/animating.h
@@ -3,7 +3,7 @@
 
 #include "system.h"
 #include <string>
-#include "renderer.h"
+#include "renderer/texture.h"
 
 class AnimatingSystem : public System {
 public:
diff --git a/src/systems/mapping.cpp b/src/systems/mapping.cpp
index 5b63ded..120a27a 100644
--- a/src/systems/mapping.cpp
+++ b/src/systems/mapping.cpp
@@ -48,7 +48,11 @@ void MappingSystem::render(Texture& texture)
           TILE_WIDTH,
           TILE_HEIGHT};
 
-        texture.blit(mappable.getTileset(), std::move(src), std::move(dst));
+        game_.getRenderer().blit(
+          mappable.getTileset(),
+          texture,
+          std::move(src),
+          std::move(dst));
       }
     }
 
@@ -67,7 +71,11 @@ void MappingSystem::render(Texture& texture)
         TILE_WIDTH,
         TILE_HEIGHT};
 
-      texture.blit(mappable.getFont(), std::move(src), std::move(dst));
+      game_.getRenderer().blit(
+        mappable.getFont(),
+        texture,
+        std::move(src),
+        std::move(dst));
     }
   }
 }
-- 
cgit 1.4.1