aboutsummaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2016-03-23 08:24:55 -0400
committerdrumsetmonkey <abelleisle@roadrunner.com>2016-03-23 08:24:55 -0400
commit4e60d3e2d3f66471dff75732626451690a5bc8b5 (patch)
tree11d8be239c4c09ce6e3c91ccd6032cadfc97d964 /main.cpp
parentafdbe5de31c9ae1009d36710eb2b1c31ec44a9f5 (diff)
Flickering lights and light that follows player
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/main.cpp b/main.cpp
index 0b3984e..f9968b6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -343,7 +343,7 @@ int main(int argc, char *argv[]){
std::cout << "Initializing shaders!" << std::endl;
- const GLchar *shaderSource = readFile("test.frag");
+ const GLchar *shaderSource = readFile("frig.frag");
GLint bufferln = GL_FALSE;
int logLength;
@@ -672,7 +672,7 @@ void render(){
ui::putText(offset.x-SCREEN_WIDTH/2,
(offset.y+SCREEN_HEIGHT/2)-ui::fontSize,
- "FPS: %d\nG:%d\nRes: %ux%u\nE: %d\nPOS: (x)%+.2f\n (y)%+.2f\nTc: %u\nHA: %+.2f\nPl: %d\n Vol: %f",
+ "FPS: %d\nG:%d\nRes: %ux%u\nE: %d\nPOS: (x)%+.2f\n (y)%+.2f\nTc: %u\nHA: %+.2f\nVol: %f",
fps,
player->ground,
SCREEN_WIDTH, // Window dimensions
@@ -682,7 +682,6 @@ void render(){
debugY, // The player's y coordinate
tickCount,
handAngle,
- player->light,
VOLUME_MASTER
);