X-Git-Url: https://git.lukelau.me/?p=opengl.git;a=blobdiff_plain;f=main.cpp;h=742c8983840eff62fbb68652ba0365fe2da0c72b;hp=31046454ca325d37a6815dff6c654639ac843900;hb=85f8f7278f24fe73fef1a19174376b155319072f;hpb=1043b5b05e00f830da26624eee8b25fb4dc4e4fc diff --git a/main.cpp b/main.cpp index 3104645..742c898 100644 --- a/main.cpp +++ b/main.cpp @@ -157,7 +157,6 @@ void display() { float d = (float)glutGet(GLUT_ELAPSED_TIME) * 0.001f; /* glm::vec3 lightPos = glm::vec3(sin(d / 10.f) * 10, 0, cos(d / 10.f) * 10); */ - glm::vec3 lightPos = lightPos; glm::vec4 lightColor(1, 1, 1, 1); drawLight(d, lightPos, lightColor); @@ -486,7 +485,7 @@ void init() { validateProgram(textureProgId); monkeyHead = new Model("monkeyhead_smooth.dae", solidProgId); - chest = new Model("chest.dae", textureProgId); + chest = new Model("models/chest.dae", textureProgId); glEnable(GL_DEPTH_TEST); glEnable(GL_CULL_FACE);