diff options
Diffstat (limited to 'main.cpp')
| -rw-r--r-- | main.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
@@ -320,19 +320,18 @@ int main(int argc, char *argv[]){ /* * TODO - Initialize shaders n' stuff */ - - /* + /* GLuint fragShader; - GLuint shaderProgram; + GLuint shaderProgram;6da const GLchar *shaderSource = "shader.frag"; GLint bufferln = GL_FALSE; shaderProgram = glCreateProgram(); fragShader = glCreateShader(GL_FRAGMENT_SHADER); - - glShaderSource(fragShader, 1, &shaderSource, NULL); + + glShaderSource(fragShader, 1, shaderSource, NULL); glCompileShader(fragShader); glGetShaderiv(fragShader, GL_COMPILE_STATUS, &bufferln); @@ -343,11 +342,9 @@ int main(int argc, char *argv[]){ glAttachShader(shaderProgram, fragShader); glLinkProgram(shaderProgram); glValidateProgram(shaderProgram); - + */ //glEnable(GL_DEPTH_TEST); //glEnable(GL_MULTISAMPLE); - - */ /* * Open the names file containing potential names for NPCs and store it in the names file @@ -595,7 +592,7 @@ void render(){ ui::putText(player->loc.x-SCREEN_WIDTH/2, SCREEN_HEIGHT-ui::fontSize, - "FPS: %d\nG:%d\nRes: %ux%u\nE: %d\nPOS: (x)%+.2f\n (y)%+.2f\nQc: %u", + "FPS: %d\nG:%d\nRes: %ux%u\nE: %d\nPOS: (x)%+.2f\n (y)%+.2f\nQc: %u\nTS:%d\n", fps, player->ground, SCREEN_WIDTH, // Window dimensions @@ -603,7 +600,8 @@ void render(){ entity.size(), // Size of entity array player->loc.x, // The player's x coordinate debugY, // The player's y coordinate - player->qh.current.size() // Active quest count + player->qh.current.size(), // Active quest count + player->tex->texState ); } |