Handle opengl internal format + format in image.cpp

[opengl.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index a82fc962f53e57ccf5a461348b245aa3887c9564..e972167424e11636c9e8e2ae5b08ff09f0bf8a9a 100644 (file)
--- 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); 
@@ -197,7 +196,7 @@ void init() {
        glViewport(0, 0, windowWidth, windowHeight);
 }
 
-bool* keyStates = new bool[256];
+bool keyStates[256] = {false};
 
 void keyboard(unsigned char key, int x, int y) {
        keyStates[key] = true;
@@ -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);