From a85accc62dab6d3edc4fb4ffb991ce4c537394f6 Mon Sep 17 00:00:00 2001 From: drumsetmonkey Date: Thu, 7 Jan 2016 08:47:59 -0500 Subject: Player has a light --- src/ui.cpp | 2 +- src/world.cpp | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/ui.cpp b/src/ui.cpp index 7979138..cf5e31e 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -815,7 +815,7 @@ DONE: player->inv->sel++; break; case SDLK_f: - + player->light^=true; break; default: break; diff --git a/src/world.cpp b/src/world.cpp index c6ab6e1..6fc84f8 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -617,7 +617,10 @@ LOOP2: glUseProgram(shaderProgram); glUniform1i(glGetUniformLocation(shaderProgram, "sampler"), 0); glUniform1f(glGetUniformLocation(shaderProgram, "amb"), float(shade+50.0f)/100.0f); - if(light.size() == 0){ + if(p->light){ + glUniform2f(glGetUniformLocation(shaderProgram, "lightLocation"), p->loc.x - offset.x+SCREEN_WIDTH/2,p->loc.y); + glUniform3f(glGetUniformLocation(shaderProgram, "lightColor"), 1.0f,1.0f,1.0f); + }else if(light.size() == 0){ glUniform2f(glGetUniformLocation(shaderProgram, "lightLocation"), 0,-1000); glUniform3f(glGetUniformLocation(shaderProgram, "lightColor"), 0.0f,0.0f,0.0f); }else{ @@ -1211,7 +1214,10 @@ void IndoorWorld::draw(Player *p){ glUseProgram(shaderProgram); glUniform1i(glGetUniformLocation(shaderProgram, "sampler"), 0); glUniform1f(glGetUniformLocation(shaderProgram, "amb"), 0.0f); - if(light.size() == 0){ + if(p->light){ + glUniform2f(glGetUniformLocation(shaderProgram, "lightLocation"), p->loc.x - offset.x+SCREEN_WIDTH/2,p->loc.y); + glUniform3f(glGetUniformLocation(shaderProgram, "lightColor"), 1.0f,1.0f,1.0f); + }else if(light.size() == 0){ glUniform2f(glGetUniformLocation(shaderProgram, "lightLocation"), 0,-1000); glUniform3f(glGetUniformLocation(shaderProgram, "lightColor"), 0.0f,0.0f,0.0f); }else{ -- cgit v1.2.3