X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=main.cpp;h=0b7cb229dd745e09d405234bfe89b5f107eab389;hp=a82fc962f53e57ccf5a461348b245aa3887c9564;hb=d381f617bef400fc157edf782008cafb018ed594;hpb=c0811ee866ca2b6d002c15394ea5d4b7a1067a80

diff --git a/main.cpp b/main.cpp
index a82fc96..0b7cb22 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,7 +5,6 @@
 #include <vector>
 #ifdef __APPLE__
 #include <GL/glew.h>
-#include "cocoa.h"
 #else
 #include <OpenGL/glew.h>
 #endif
@@ -187,7 +186,7 @@ void init() {
 
 	pbrProg = new Program("pbrvert.glsl", "pbrfrag.glsl");
 	glUseProgram(pbrProg->progId);
-	pbr = new Model("models/newtonsCradle.gltf", *pbrProg);
+	pbr = new Model("models/newtonsCradle.glb", *pbrProg);
 
 	glEnable(GL_DEPTH_TEST); 
 	glEnable(GL_CULL_FACE); 
@@ -287,7 +286,6 @@ int main(int argc, char** argv) {
 	glutInitDisplayMode(GLUT_DEPTH|GLUT_DOUBLE|GLUT_RGB|GLUT_3_2_CORE_PROFILE);
 	glutInitWindowSize(windowWidth, windowHeight);
 	int win = glutCreateWindow("Physically Based Rendering");
-	makeRetina();
 	glutDisplayFunc(display);
 	glutReshapeFunc(reshape);