diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-01-07 08:25:49 -0500 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-01-07 08:25:49 -0500 |
| commit | c7e3d72f0ef08cb9463cd8960bc29dad40e3bdcb (patch) | |
| tree | d6bfde57916863ca9fd6fa2fbfae42338ae8e630 /src/inventory.cpp | |
| parent | 0f379ae55e07d4e1e7904a3eb33b1c29c2177ec1 (diff) | |
| parent | 1b2510a427cea42e6381d60f434b5fdec2b181b0 (diff) | |
Hey, that's pretty good lighting!
Diffstat (limited to 'src/inventory.cpp')
| -rw-r--r-- | src/inventory.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index c0f4163..b6819d1 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -291,7 +291,8 @@ void itemDraw(Player *p,ITEM_ID id,ITEM_TYPE type){ default: hangle = 0.0f; } - + glUseProgram(shaderProgram); + glUniform1i(glGetUniformLocation(shaderProgram, "sampler"), 0); glTranslatef(itemLoc.x,itemLoc.y,0); glRotatef(hangle, 0.0f, 0.0f, 1.0f); glTranslatef(-itemLoc.x,-itemLoc.y,0); @@ -307,6 +308,7 @@ void itemDraw(Player *p,ITEM_ID id,ITEM_TYPE type){ glDisable(GL_TEXTURE_2D); glTranslatef(player->loc.x*2,0,0); glPopMatrix(); + glUseProgram(0); } int Inventory::useItem(void){ |