diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/common.hpp | 1 | ||||
-rw-r--r-- | include/entities.hpp | 2 |
2 files changed, 2 insertions, 1 deletions
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); |