From 5432b278f8ed8c9aaeccf1ee7a4da540787f965d Mon Sep 17 00:00:00 2001
From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Thu, 12 May 2016 08:03:57 -0400
Subject: RENDERING

---
 include/common.hpp   | 1 +
 include/entities.hpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/common.hpp b/include/common.hpp
index eb8a290..24c5204 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -218,6 +218,7 @@ extern GLuint textShader;
 extern GLint textShader_attribute_coord;
 extern GLint textShader_attribute_tex;
 extern GLint textShader_uniform_texture;
+extern GLint textShader_uniform_color;
 
 extern GLuint worldShader;
 extern GLint worldShader_attribute_coord;
diff --git a/include/entities.hpp b/include/entities.hpp
index 3e78687..5159d24 100644
--- a/include/entities.hpp
+++ b/include/entities.hpp
@@ -149,7 +149,7 @@ public:
 	~Particles(void){}
 
 	// draws the particle
-	std::vector<std::pair<vec2, vec3>> draw(void) const;
+	void draw(std::vector<GLfloat> &verts, std::vector<GLfloat> &tex) const;
 
 	// updates a particle
 	void update(float _gravity, float ground_y);
-- 
cgit v1.2.3