aboutsummaryrefslogtreecommitdiffstats
path: root/main.cpp
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-03-24 09:23:53 -0400
committerClyne Sullivan <tullivan99@gmail.com>2016-03-24 09:23:53 -0400
commitcff9c47a543d68f9f661ffcd373bf888ae8671ca (patch)
treeed7338df3351b22cd7fa24f4a0bed8279db920d4 /main.cpp
parent75a3ceb61ad4816ce03e6b615de2ce9331452aaa (diff)
parentc9bce16570160af24ae7f1f04249aa0e8313fb06 (diff)
npc world walking
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 210f36c..7b8f2d9 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
);