faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Removing debug stuff from release build. Fixes #8.

Browse Source
This commit is contained in:
Faerbit 2015-03-15 14:55:12 +01:00
parent e2ed7cac88
commit dd9997dc82
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
game/main.cc
View File

@ -23,6 +23,7 @@ static void keyCallback(GLFWwindow* _window, int _key, int, int _action, int)
glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_NORMAL); glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
app.setCameraLock(false); app.setCameraLock(false);
} }
#ifdef CMAKE_CXX_FLAGS_DEBUG
if (_key == GLFW_KEY_F5 && _action == GLFW_PRESS) { if (_key == GLFW_KEY_F5 && _action == GLFW_PRESS) {
app.getGraphics()->setRenderShadows(!app.getGraphics()->getRenderShadows()); app.getGraphics()->setRenderShadows(!app.getGraphics()->getRenderShadows());
} }
@ -35,6 +36,7 @@ static void keyCallback(GLFWwindow* _window, int _key, int, int _action, int)
if (_key == GLFW_KEY_F8 && _action == GLFW_PRESS) { if (_key == GLFW_KEY_F8 && _action == GLFW_PRESS) {
app.getGraphics()->setRenderWorld(!app.getGraphics()->getRenderWorld()); app.getGraphics()->setRenderWorld(!app.getGraphics()->getRenderWorld());
} }
#endif
} }
static void mouseCallback(GLFWwindow* window, int button, int action, int) { static void mouseCallback(GLFWwindow* window, int button, int action, int) {
@ -101,9 +103,11 @@ bool createWindow()
// activate multisampling (second parameter is the number of samples): // activate multisampling (second parameter is the number of samples):
glfwWindowHint( GLFW_SAMPLES, 4); glfwWindowHint( GLFW_SAMPLES, 4);
// request an OpenGL debug context: #ifdef CMAKE_CXX_FLAGS_DEBUG
glfwWindowHint( GLFW_OPENGL_DEBUG_CONTEXT, true ); // request an OpenGL debug context:
glfwWindowHint( GLFW_OPENGL_DEBUG_CONTEXT, true );
#endif
// define whether the window can get resized: // define whether the window can get resized:
glfwWindowHint(GLFW_RESIZABLE, true); glfwWindowHint(GLFW_RESIZABLE, true);
@ -116,7 +120,11 @@ bool createWindow()
return false; return false;
} }
glfwMakeContextCurrent(window); glfwMakeContextCurrent(window);
ACGL::init(); #ifdef CMAKE_CXX_FLAGS_DEBUG
ACGL::init(true);
#else
ACGL::init(false); // do not request debug context
#endif
return true; return true;
} }
@ -179,12 +187,22 @@ int main( int argc, char *argv[] )
keyboardState.aPressed = glfwGetKey(window, GLFW_KEY_A) == GLFW_PRESS; keyboardState.aPressed = glfwGetKey(window, GLFW_KEY_A) == GLFW_PRESS;
keyboardState.sPressed = glfwGetKey(window, GLFW_KEY_S) == GLFW_PRESS; keyboardState.sPressed = glfwGetKey(window, GLFW_KEY_S) == GLFW_PRESS;
keyboardState.dPressed = glfwGetKey(window, GLFW_KEY_D) == GLFW_PRESS; keyboardState.dPressed = glfwGetKey(window, GLFW_KEY_D) == GLFW_PRESS;
keyboardState.lPressed = glfwGetKey(window, GLFW_KEY_L) == GLFW_PRESS; #ifdef CMAKE_CXX_FLAGS_DEBUG
keyboardState.kPressed = glfwGetKey(window, GLFW_KEY_K) == GLFW_PRESS; keyboardState.lPressed = glfwGetKey(window, GLFW_KEY_L) == GLFW_PRESS;
keyboardState.f1Pressed = glfwGetKey(window, GLFW_KEY_F1) == GLFW_PRESS; keyboardState.kPressed = glfwGetKey(window, GLFW_KEY_K) == GLFW_PRESS;
keyboardState.f2Pressed = glfwGetKey(window, GLFW_KEY_F2) == GLFW_PRESS; keyboardState.f1Pressed = glfwGetKey(window, GLFW_KEY_F1) == GLFW_PRESS;
keyboardState.f3Pressed = glfwGetKey(window, GLFW_KEY_F3) == GLFW_PRESS; keyboardState.f2Pressed = glfwGetKey(window, GLFW_KEY_F2) == GLFW_PRESS;
keyboardState.f4Pressed = glfwGetKey(window, GLFW_KEY_F4) == GLFW_PRESS; keyboardState.f3Pressed = glfwGetKey(window, GLFW_KEY_F3) == GLFW_PRESS;
keyboardState.f4Pressed = glfwGetKey(window, GLFW_KEY_F4) == GLFW_PRESS;
#else
keyboardState.lPressed = false;
keyboardState.kPressed = false;
keyboardState.f1Pressed = false;
keyboardState.f2Pressed = false;
keyboardState.f3Pressed = false;
keyboardState.f4Pressed = false;
#endif
double xpos, ypos; double xpos, ypos;
glfwGetCursorPos(window, &xpos, &ypos); glfwGetCursorPos(window, &xpos, &ypos);

4
game/model.cc
View File

@ -1,7 +1,9 @@
#include "model.hh" #include "model.hh"
Model::Model(std::string filePath, float scale) { Model::Model(std::string filePath, float scale) {
printf("Loading %s\n", filePath.c_str()); #ifdef CMAKE_CXX_FLAGS_DEBUG
printf("Loading %s\n", filePath.c_str());
#endif
reference = ACGL::OpenGL::VertexArrayObjectCreator(filePath).create(); reference = ACGL::OpenGL::VertexArrayObjectCreator(filePath).create();
this->scale = scale; this->scale = scale;
} }