From dfda3f2a5e555d3173359134f4994bcd12d129f8 Mon Sep 17 00:00:00 2001
From: majortom6 <tombarrett@siu.edu>
Date: Fri, 3 Mar 2017 15:18:22 -0600
Subject: -removed the Graphics Data class -replaced with already implemented
 Rectangle, and put color and side variables in dna (can potentially remove
 the side variable if it does nothing important)

---
 inc/opengl/spritebatch.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'inc/opengl/spritebatch.hpp')

diff --git a/inc/opengl/spritebatch.hpp b/inc/opengl/spritebatch.hpp
index 63e45eb..d1c4d7a 100644
--- a/inc/opengl/spritebatch.hpp
+++ b/inc/opengl/spritebatch.hpp
@@ -5,8 +5,8 @@
 #include <vector>
 #include <GL/glew.h>
 
-#include "graphicsdata.hpp"
 #include "geoshader.hpp"
+#include "dna.hpp"
 
 class RenderBatch {
         public:
@@ -24,7 +24,7 @@ class SpriteBatch
                 void init();
                 void begin();
                 void end();
-                void draw(const GraphicsData& gfxData);
+                void draw(Rectangle r, DNA::Visuals v);
                 void renderBatch();
 
         private:
@@ -34,9 +34,9 @@ class SpriteBatch
                 GLuint _vbo;
                 GLuint _vao;
 
-                std::vector<GraphicsData*> _gfxPtr; 
-                std::vector<GraphicsData> _gfx; 
-                std::vector<RenderBatch> _renderBatches;
+                std::vector<std::pair<Rectangle,DNA::Visuals>*> _gfxPtr; 
+                std::vector<std::pair<Rectangle,DNA::Visuals>>  _gfx; 
+                std::vector<RenderBatch>                        _renderBatches;
 
                 GeoShader shader;
 };
-- 
cgit v1.2.3