Merge branch 'developer' into feature/Menu

# Conflicts:
#	CrystalPoint.vcxproj.filters
#	Main.cpp
#	Skybox.cpp
#	Skybox.h
This commit is contained in:
Remco
2016-06-20 15:23:55 +02:00
63 changed files with 31853 additions and 76 deletions
+3 -2
View File
@@ -80,10 +80,11 @@ void configureOpenGL()
//Init window and glut display mode
glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
glutInitWindowSize(800, 600);
//glutInitWindowPosition(1000,800);
glutCreateWindow("Crystal Point");
//glutInitWindowPosition(glutGet(GLUT_WINDOW_WIDTH) / 2 - 800/2, glutGet(GLUT_WINDOW_HEIGHT) / 2 - 600/2);
glutCreateWindow("Crystal Point");
glutFullScreen();
//Depth testing
glEnable(GL_DEPTH_TEST);