diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-04-06 07:38:59 -0400 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-04-06 07:38:59 -0400 |
| commit | 3ca4cca09ed9a2b1028928dea98f19bd26ab3b2c (patch) | |
| tree | f8444f987be86181786859c2aabdd2d7eb2a5539 /include | |
| parent | b2ea70a36ba2249383c9b5cb3c2c784c28311938 (diff) | |
First world and style
Diffstat (limited to 'include')
| -rw-r--r-- | include/entities.hpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/entities.hpp b/include/entities.hpp index e7864d0..f53f8e6 100644 --- a/include/entities.hpp +++ b/include/entities.hpp @@ -102,11 +102,7 @@ public: } void draw(){ - glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_2D, colorIndex); - glUseProgram(shaderProgram); - glUniform1i(glGetUniformLocation(shaderProgram, "sampler"), 0); - glEnable(GL_TEXTURE_2D); + //glEnable(GL_TEXTURE_2D); glColor3ub(255,255,255); glBegin(GL_QUADS); glTexCoord2f(.25*index.x, .125*index.y); glVertex2i(loc.x, loc.y); @@ -114,8 +110,8 @@ public: glTexCoord2f(.25*index.x, .125*index.y); glVertex2i(loc.x + width, loc.y + height); glTexCoord2f(.25*index.x, .125*index.y); glVertex2i(loc.x, loc.y + width); glEnd(); - glDisable(GL_TEXTURE_2D); - glUseProgram(0); + //glDisable(GL_TEXTURE_2D); + //glUseProgram(0); } bool kill(float delta){ duration -= delta; |