BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Restructured solution. "Escape-The-Dawn" now links into a .lib, which is used in "Executable" to facilitate easier unit testing.

Browse Source
This commit is contained in:
sippeangelo
2014-03-06 18:57:12 +01:00
parent 5a15491573
commit b87b1f5704
10 changed files with 271 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/main.cpp
+62 -62
View File
@@ -1,62 +1,62 @@
#include <string>
#include <sstream>
#include <GL/glew.h>
#define GLFW_INCLUDE_GLU
#include <GLFW/glfw3.h>
#include <glext.h>
#include "logging.h"
#include "glerror.h"
#include "World.h"
GLFWwindow* window;
GLint glVersion[2];
GLchar* glVendor;
int main(int argc, char* argv[])
{
// Initialize GLFW
if (!glfwInit())
{
LOG_ERROR("GLFW: Initialization failed");
return 1;
}
// Create a window
window = glfwCreateWindow(1280, 720, "OpenGL", nullptr, nullptr);
if (!window)
{
LOG_ERROR("GLFW: Failed to create window");
return 1;
}
glfwMakeContextCurrent(window);
// GL version info
glGetIntegerv(GL_MAJOR_VERSION, &glVersion[0]);
glGetIntegerv(GL_MINOR_VERSION, &glVersion[1]);
glVendor = (GLchar*)glGetString(GL_VENDOR);
std::stringstream ss;
ss << glVendor << " OpenGL " << glVersion[0] << "." << glVersion[1];
#ifdef DEBUG
ss << " DEBUG";
#endif
LOG_INFO(ss.str().c_str());
glfwSetWindowTitle(window, ss.str().c_str());
// Initialize GLEW
if (glewInit() != GLEW_OK)
{
LOG_ERROR("GLEW: Initialization failed");
return 1;
}
// Main loop
while (!glfwWindowShouldClose(window))
{
glfwPollEvents();
}
return 0;
}
//#include <string>
//#include <sstream>
//
//#include <GL/glew.h>
//#define GLFW_INCLUDE_GLU
//#include <GLFW/glfw3.h>
//#include <glext.h>
//
//#include "logging.h"
//#include "glerror.h"
//
//#include "World.h"
//
//GLFWwindow* window;
//GLint glVersion[2];
//GLchar* glVendor;
//
//int main(int argc, char* argv[])
//{
// // Initialize GLFW
// if (!glfwInit())
// {
// LOG_ERROR("GLFW: Initialization failed");
// return 1;
// }
//
// // Create a window
// window = glfwCreateWindow(1280, 720, "OpenGL", nullptr, nullptr);
// if (!window)
// {
// LOG_ERROR("GLFW: Failed to create window");
// return 1;
// }
// glfwMakeContextCurrent(window);
//
// // GL version info
// glGetIntegerv(GL_MAJOR_VERSION, &glVersion[0]);
// glGetIntegerv(GL_MINOR_VERSION, &glVersion[1]);
// glVendor = (GLchar*)glGetString(GL_VENDOR);
// std::stringstream ss;
// ss << glVendor << " OpenGL " << glVersion[0] << "." << glVersion[1];
//#ifdef DEBUG
// ss << " DEBUG";
//#endif
// LOG_INFO(ss.str().c_str());
// glfwSetWindowTitle(window, ss.str().c_str());
//
// // Initialize GLEW
// if (glewInit() != GLEW_OK)
// {
// LOG_ERROR("GLEW: Initialization failed");
// return 1;
// }
//
// // Main loop
// while (!glfwWindowShouldClose(window))
// {
// glfwPollEvents();
// }
//
// return 0;
//}