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

Adding namespacing.

Browse Source
This commit is contained in:
Faerbit 2014-11-14 23:11:35 +01:00
parent 229ff9c4f8
commit 3916e58efc
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main.cc
View File

@ -18,11 +18,6 @@
#include "model.hh" #include "model.hh"
using namespace std;
using namespace ACGL::OpenGL;
using namespace ACGL::Base;
using namespace ACGL::Utils;
Application::Application() { Application::Application() {
graphics = Graphics(glm::uvec2(1024, 786), 0.1f, 100.0f); graphics = Graphics(glm::uvec2(1024, 786), 0.1f, 100.0f);
} }
@ -91,7 +86,7 @@ int main( int argc, char *argv[] )
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
// Set window title to binary name (without the path): // Set window title to binary name (without the path):
// //
std::vector<std::string> tmp = StringHelpers::split( std::string( argv[0] ), '/' ); std::vector<std::string> tmp = ACGL::Utils::StringHelpers::split( std::string( argv[0] ), '/' );
glfwSetWindowTitle(app.getGraphics()->getWindow(), tmp[tmp.size()-1].c_str() ); glfwSetWindowTitle(app.getGraphics()->getWindow(), tmp[tmp.size()-1].c_str() );
// Ensure we can capture the escape key being pressed below // Ensure we can capture the escape key being pressed below
glfwSetInputMode(app.getGraphics()->getWindow(), GLFW_STICKY_KEYS, 1); glfwSetInputMode(app.getGraphics()->getWindow(), GLFW_STICKY_KEYS, 1);
@ -120,8 +115,8 @@ int main( int argc, char *argv[] )
double now = glfwGetTime(); double now = glfwGetTime();
if (showNextFPS <= now) { if (showNextFPS <= now) {
stringstream sstream (stringstream::in | stringstream::out); std::stringstream sstream (std::stringstream::in | std::stringstream::out);
sstream << setprecision(1) << std::fixed sstream << std::setprecision(1) << std::fixed
<< tmp[tmp.size()-1] << " - FPS: " << frameCount / (now-showNextFPS + FPSdelay) << " " << 1000 * (now-showNextFPS + FPSdelay)/frameCount << " msec"; << tmp[tmp.size()-1] << " - FPS: " << frameCount / (now-showNextFPS + FPSdelay) << " " << 1000 * (now-showNextFPS + FPSdelay)/frameCount << " msec";
glfwSetWindowTitle(app.getGraphics()->getWindow(), sstream.str().c_str() ); glfwSetWindowTitle(app.getGraphics()->getWindow(), sstream.str().c_str() );
showNextFPS = now + FPSdelay; showNextFPS = now + FPSdelay;