diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-01-10 21:03:33 -0500 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-01-10 21:03:33 -0500 |
| commit | 75a5569ed0d44494da379822aa5de519e4a4025b (patch) | |
| tree | 1100ae214ad3a9eceac969d4796ef1ae825e8fb7 /src/inventory.cpp | |
| parent | 5c7c99ac5fe1158adbdf0469fb36ddd153511f5d (diff) | |
| parent | a0597ff41fb4be979f9dfd70ace8be98a737affb (diff) | |
Work on player texture
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){ |