New skyboxes
[opengl.git] / main.cpp
index 1df11ec9417b9e7e94659686c276da0524ed9e71..fd6159dcd3cf665ff0a822f52137646ed6b8c275 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,8 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <iostream>
-#include <fstream>
-#include <sstream>
 #include <array>
 #include <vector>
 #ifdef __APPLE__
 #include <OpenGL/glew.h>
 #endif
 #include <GLUT/glut.h>
+#include "shapes.hpp"
 #include <glm/glm.hpp>
 #include <glm/ext.hpp>
 #include <glm/gtc/type_ptr.hpp>
+#include <assimp/Importer.hpp>
+#include <assimp/scene.h>
+#include <assimp/postprocess.h>
+#include "model.hpp"
+#include "program.hpp"
+#include "skybox.hpp"
+#include "image.hpp"
 
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 
 using namespace std;
 
-GLuint pyramidVao, lightVao;
-GLuint gradientProgId, solidProgId;
-glm::vec3 camPos   = glm::vec3(0.0f, 0.0f,  -5.0f);
-glm::vec3 camFront = glm::vec3(0.0f, 0.0f, 1.0f);
-glm::vec3 camUp    = glm::vec3(0.0f, 1.0f,  0.0f);
-float yaw = 1.57, pitch = 0;
-bool doScale, doRotate, doTranslate;
+GLuint lightVao;
 
-void setProjectionAndViewUniforms(GLuint progId) {
-       GLuint projId = glGetUniformLocation(progId, "projection");
-       glm::mat4 proj = glm::perspective(glm::radians(45.f), 1.33f, 0.01f, 10000.f);
-       glUniformMatrix4fv(projId, 1, GL_FALSE, glm::value_ptr(proj));
+Program *textureProg, *plainProg, *reflectProg, *pbrProg;
 
-       GLuint viewId = glGetUniformLocation(progId, "view");
-       glm::mat4 view = glm::lookAt(camPos, camPos + camFront, camUp);
-       glUniformMatrix4fv(viewId, 1, GL_FALSE, glm::value_ptr(view));
-}
+std::vector<Skybox> skyboxes;
+int activeSkybox = 0;
 
-void drawLight(float d, glm::vec3 lightPos) {
-       glUseProgram(solidProgId);
-       glBindVertexArray(lightVao);
-       setProjectionAndViewUniforms(solidProgId);
-       glm::mat4 model = glm::translate(glm::mat4(1.f), lightPos);
-       model = glm::scale(model, glm::vec3(0.2));
-       GLuint modelId = glGetUniformLocation(solidProgId, "model");
-       glUniformMatrix4fv(modelId, 1, GL_FALSE, glm::value_ptr(model));
+Assimp::Importer importer; // Need to keep this around, otherwise stuff disappears!
+Model *sceneModel;
 
-       GLuint colorLoc = glGetUniformLocation(solidProgId, "color");
-       glm::vec3 color = glm::vec3(1, 1, 1);
-       glUniform3fv(colorLoc, 1, glm::value_ptr(color));
+glm::vec3 camPos = {0, 0, -5}, camFront = {0, 0, 1}, camUp = {0, 1, 0};
+float fov = glm::radians(30.f), znear = 0.01f, zfar = 10000.f;
+float yaw = 1.57, pitch = 0;
 
-       glDrawArrays(GL_TRIANGLES, 0, 36);
+struct Light {
+       glm::vec3 pos;
+       glm::vec3 color;
 };
 
-void drawPyramids(float d, glm::vec3 lightPos) {
-       glUseProgram(gradientProgId);
-       glBindVertexArray(pyramidVao);
-       setProjectionAndViewUniforms(gradientProgId);
-
-       GLuint lightPosLoc = glGetUniformLocation(gradientProgId, "lightPos");
-       glUniform3fv(lightPosLoc, 1, glm::value_ptr(lightPos));
-       
-       GLuint viewPosLoc = glGetUniformLocation(gradientProgId, "viewPos");
-       glUniform3fv(viewPosLoc, 1, glm::value_ptr(camPos));
-
-       GLuint modelId = glGetUniformLocation(gradientProgId, "model");
-
-       for (int i = 0; i < 10; i++) {
-
-               glm::mat4 model = glm::mat4(1.f);
-
-               model = glm::translate(model, glm::vec3(sin(i * 30) * 10, 0, i * 2 - 10));
-               
-               if (doRotate) {
-                       model = glm::rotate(model, d * glm::radians(30.f), glm::vec3(0.f, 1.f, 0.f));
-                       model = glm::rotate(model, d * glm::radians(20.f), glm::vec3(1.f, 0.f, 0.f));
-               }
-               
-               if (doScale)
-                       model = glm::scale(model, glm::vec3(1.f, 0.7f + 0.7f * (1 + sin(d + (i + 3))), 1.f));
-
-               if (doTranslate)
-                       model = glm::translate(model, glm::vec3(sin(d + (i + 1)), cos(d + (i + -3)), sin(d + (i + 4))));
-       
-
-               glUniformMatrix4fv(modelId, 1, GL_FALSE, glm::value_ptr(model));
-               
-               glDrawArrays(GL_TRIANGLES, 0, 12);
-       }
-
+std::vector<Light> lights = {
+       { glm::vec3(5, 2, -5), glm::vec3(1) },
+       { glm::vec3(0, 2, -5), glm::vec3(1) },
+       { glm::vec3(-5, 2, -5), glm::vec3(1) },
 };
 
-void display() {
-       glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-       float d = (float)glutGet(GLUT_ELAPSED_TIME) * 0.001f;
+int activeLight = 0;
 
-       glm::vec3 lightPos = glm::vec3(sin(d) * 10, 0, cos(d) * 10);
+bool discoLights = false;
 
-       drawPyramids(d, lightPos);
-       drawLight(d, lightPos);
+int windowWidth = 800, windowHeight = 600;
 
-       glutSwapBuffers();
+float aspect() {
+       return (float)windowWidth / (float)windowHeight;
 }      
 
-void attachShader(GLuint progId, const char* filePath, GLenum type) {
-       GLuint shader = glCreateShader(type);
-
-       if (!shader) {
-               fprintf(stderr, "error creating shader\n");
-               exit(1);
+glm::mat4 projMat() {
+       return glm::perspective(fov, aspect(), znear, zfar);
 }
 
-       ifstream file(filePath);
-       stringstream buffer;
-       buffer << file.rdbuf();
-       string str = buffer.str();
-       const char* contents = str.c_str();
-
-       glShaderSource(shader, 1, (const GLchar**)&contents, NULL);
-       glCompileShader(shader);
-       GLint success;
-       glGetShaderiv(shader, GL_COMPILE_STATUS, &success);
-       if (!success) {
-               GLchar log[1024];
-               glGetShaderInfoLog(shader, 1024, NULL, log);
-               fprintf(stderr, "error: %s\n", log);
-               exit(1);
+glm::mat4 viewMat() {
+       return glm::lookAt(camPos, camPos + camFront, camUp);
 }
-       glAttachShader(progId, shader);
-}
-
-GLuint compileShaders(char* vertexShader, char* fragmentShader) {
-       GLuint progId = glCreateProgram();
 
-       attachShader(progId, vertexShader, GL_VERTEX_SHADER);
-       attachShader(progId, fragmentShader, GL_FRAGMENT_SHADER);
+void setProjectionAndViewUniforms(GLuint progId) {
+       GLuint projLoc = glGetUniformLocation(progId, "projection");
+       glm::mat4 proj = projMat();
+       glUniformMatrix4fv(projLoc, 1, GL_FALSE, glm::value_ptr(proj));
 
-       glLinkProgram(progId);
-       GLint success = 0;
-       glGetProgramiv(progId, GL_LINK_STATUS, &success);
-       if (!success) {
-               GLchar log[1024];
-               glGetProgramInfoLog(progId, sizeof(log), NULL, log);
-               fprintf(stderr, "error linking: %s\n", log);
-               exit(1);
-       }
+       GLuint viewLoc = glGetUniformLocation(progId, "view");
+       glm::mat4 view = viewMat();
+       glUniformMatrix4fv(viewLoc, 1, GL_FALSE, glm::value_ptr(view));
 
-       return progId;
+       GLuint camPosLoc = glGetUniformLocation(progId, "camPos");
+       glUniform3fv(camPosLoc, 1, glm::value_ptr(camPos));
 }
 
-#define BUFFER_OFFSET(i) ((char *)NULL + (i))
+void setLightColorAndPos(GLuint progId, glm::vec3 lightPos, glm::vec4 lightColor) {
+       GLuint lightColorLoc = glGetUniformLocation(progId, "lightColor");
+       glUniform4fv(lightColorLoc, 1, glm::value_ptr(lightColor));
 
-GLuint setupBuffers(glm::vec3* vertices, glm::vec3* normals, GLuint progId) {
-
-       GLfloat colors[] = {
-               0, 1, 0, 1,
-               1, 0, 0, 1,
-               0, 0, 1, 1,
-
-               0, 1, 0, 1,
-               1, 0, 0, 1,
-               0, 0, 1, 1,
+       GLuint lightPosLoc = glGetUniformLocation(progId, "vLightPos");
+       glUniform3fv(lightPosLoc, 1, glm::value_ptr(lightPos));
 
-               0, 1, 0, 1,
-               1, 0, 0, 1,
-               0, 0, 1, 1,
+       GLuint viewPosLoc = glGetUniformLocation(progId, "vViewPos");
+       glUniform3fv(viewPosLoc, 1, glm::value_ptr(camPos));
+}
 
-               0, 1, 0, 1,
-               1, 0, 0, 1,
-               0, 0, 1, 1
-       };
+void drawLight(Light &light) {
+       glUseProgram(plainProg->progId);
+       glBindVertexArray(lightVao);
+       setProjectionAndViewUniforms(plainProg->progId);
+       glm::mat4 model = glm::translate(glm::mat4(1.f), light.pos);
+       model = glm::scale(model, glm::vec3(0.2));
+       GLuint modelLoc = glGetUniformLocation(plainProg->progId, "model");
+       glUniformMatrix4fv(modelLoc, 1, GL_FALSE, glm::value_ptr(model));
 
-       GLuint numVerts = 12;
+       GLuint colorLoc = glGetUniformLocation(plainProg->progId, "color");
+       glUniform4fv(colorLoc, 1, glm::value_ptr(light.color));
                
-       GLuint vbo;
-       glGenBuffers(1, &vbo);
+       glDrawArrays(GL_TRIANGLES, 0, 36);
+}
 
-       GLuint vao;
-       glGenVertexArrays(1, &vao);
 
-       GLuint posId = glGetAttribLocation(progId, "vPosition");
-       GLuint colorId = glGetAttribLocation(progId, "vColor");
-       GLuint normalLoc = glGetAttribLocation(progId, "vNormal");
+void display() {
+       glClearColor(0.5, 0.5, 0.5, 1);
+       glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+       glViewport(0, 0, windowWidth * 2, windowHeight * 2);
 
-       GLuint vertsLen = numVerts * 3 * sizeof(GLfloat);
-       GLuint colorsLen = numVerts * 4 * sizeof(GLfloat);
-       GLuint normalLen = numVerts * 3 * sizeof(GLfloat);
+       float d = (float)glutGet(GLUT_ELAPSED_TIME) * 0.001f;
 
-       glBindBuffer(GL_ARRAY_BUFFER, vbo);
-       glBufferData(GL_ARRAY_BUFFER, vertsLen + colorsLen + normalLen, NULL, GL_STATIC_DRAW);
+       glUseProgram(pbrProg->progId);
+       setProjectionAndViewUniforms(pbrProg->progId);
 
-       glBufferSubData(GL_ARRAY_BUFFER, 0, vertsLen, glm::value_ptr(vertices[0]));
-       glBufferSubData(GL_ARRAY_BUFFER, vertsLen, colorsLen, colors);
-       glBufferSubData(GL_ARRAY_BUFFER, vertsLen + colorsLen, normalLen, glm::value_ptr(normals[0]));
+       glm::vec3 lightPositions[6], lightColors[6];
+       for (int i = 0; i < 3; i++) {
+               lightPositions[i] = lights[i].pos;
+               lightColors[i] = lights[i].color;
+       }
 
-       glBindVertexArray(vao);
+       for (int i = 3; i < 6; i++) {
+               if (discoLights) {
+                       auto m = glm::translate(glm::mat4(1.f), glm::vec3(-2.5, 0, 0));
+                       m = glm::rotate(m, glm::radians(d * 100 + i * 30), glm::vec3(1, 0, 0));
+                       m = glm::rotate(m, glm::radians(d * 100 + i * 30), glm::vec3(0, 1, 0));
+                       m = glm::rotate(m, glm::radians(d * 100 + i * 30), glm::vec3(0, 0, 1));
+                       lightPositions[i] = glm::vec3(m * glm::vec4(5, 0, 0, 1));
+                       lightColors[i] = glm::vec3(0.2);
+                       if (i == 3) lightColors[i].x = sin(d);
+                       if (i == 4) lightColors[i].y = cos(d * 3);
+                       if (i == 5) lightColors[i].z = cos(d);
+               } else {
+                       lightPositions[i] = glm::vec3(0);
+                       lightColors[i] = glm::vec3(0);
+               }
+       }
        
-       glEnableVertexAttribArray(posId);
-       glVertexAttribPointer(posId, 3, GL_FLOAT, GL_FALSE, 0, 0);
+       glUniform3fv(glGetUniformLocation(pbrProg->progId, "lightPositions"), 6, glm::value_ptr(lightPositions[0]));
+       glUniform3fv(glGetUniformLocation(pbrProg->progId, "lightColors"), 6, glm::value_ptr(lightColors[0]));
 
-       glEnableVertexAttribArray(colorId);
-       glVertexAttribPointer(colorId, 4, GL_FLOAT, GL_FALSE, 0, BUFFER_OFFSET(vertsLen));
+       /* pbr->getRoot()->model = glm::rotate(glm::mat4(1.f), glm::radians(d * 10), glm::vec3(0, 1, 0)); */
+        sceneModel->draw(skyboxes[activeSkybox], d * 1000);
 
-       glEnableVertexAttribArray(normalLoc);
-       glVertexAttribPointer(normalLoc, 3, GL_FLOAT, GL_FALSE, 0, BUFFER_OFFSET(vertsLen + colorsLen));
+        for (Light &light: lights) drawLight(light);
 
-       return vao;
+       if (discoLights) {
+               for (int i = 3; i < 6; i++) {
+                       Light l { lightPositions[i], lightColors[i] };
+                       drawLight(l);
                }
-
-vector<glm::vec3> quadToTriangles(glm::vec3 *quads) {
-       vector<glm::vec3> triangles(6);
-       triangles[0] = quads[0];
-       triangles[1] = quads[1];
-       triangles[2] = quads[2];
-       triangles[3] = quads[2];
-       triangles[4] = quads[3];
-       triangles[5] = quads[0];
-       return triangles;
        }
 
-template <typename T>
-void append(vector<T> &a, vector<T> &b) {
-       a.insert(a.end(), b.begin(), b.end());
-};
+       skyboxes[activeSkybox].draw(projMat(), viewMat());
+
+       glutSwapBuffers();
+}
 
 void setupLightBuffers(GLuint progId) {
-       vector<glm::vec3> vertices;
-       glm::vec3 front[] = {
-               glm::vec3(1, -1, -1),
-               glm::vec3(-1, -1, -1),
-               glm::vec3(-1, 1, -1),
-               glm::vec3(1, 1, -1)
-       };
-       vector<glm::vec3> frontTriangles = quadToTriangles(front);
-       append(vertices, frontTriangles);
-
-       glm::vec3 back[] = {
-               glm::vec3(1, 1, 1),
-               glm::vec3(-1, 1, 1),
-               glm::vec3(-1, -1, 1),
-               glm::vec3(1, -1, 1)
-       };
-       vector<glm::vec3> backQuads = quadToTriangles(back);
-       append(vertices, backQuads);
-
-       glm::vec3 top[] = {
-               glm::vec3(1, 1, -1),
-               glm::vec3(-1, 1, -1),
-               glm::vec3(-1, 1, 1),
-               glm::vec3(1, 1, 1)
-       };
-       vector<glm::vec3> topTriangles = quadToTriangles(top);
-       append(vertices, topTriangles);
-
-       glm::vec3 bottom[] = {
-               glm::vec3(1, -1, 1),
-               glm::vec3(-1, -1, 1),
-               glm::vec3(-1, -1, -1),
-               glm::vec3(1, -1, -1)
-       };
-       vector<glm::vec3> bottomTriangles = quadToTriangles(bottom);
-       append(vertices, bottomTriangles);
-
-       glm::vec3 left[] = {
-               glm::vec3(-1, 1, 1),
-               glm::vec3(-1, 1, -1),
-               glm::vec3(-1, -1, -1),
-               glm::vec3(-1, -1, 1)
-       };
-       vector<glm::vec3> leftTriangles = quadToTriangles(left);
-       append(vertices, leftTriangles);
-
-       glm::vec3 right[] = {
-               glm::vec3(1, 1, -1),
-               glm::vec3(1, 1, 1),
-               glm::vec3(1, -1, 1),
-               glm::vec3(1, -1, -1)
-       };
-       vector<glm::vec3> rightTriangles = quadToTriangles(right);
-       append(vertices, rightTriangles);
+       auto vertices = cube();
        GLuint verticesSize = 36 * 3 * sizeof(GLfloat);
 
        glGenVertexArrays(1, &lightVao);
@@ -293,76 +177,79 @@ void setupLightBuffers(GLuint progId) {
        glVertexAttribPointer(posLoc, 3, GL_FLOAT, GL_FALSE, 0, 0);
 }
 
-void validateProgram(GLuint progId) {
-       glValidateProgram(progId);
-       
-       GLint success;
-       glGetProgramiv(progId, GL_VALIDATE_STATUS, &success);
-       if (!success) {
-               GLchar log[1024];
-               glGetProgramInfoLog(progId, sizeof(log), NULL, log);
-               fprintf(stderr, "error: %s\n", log);
-               exit(1);
+int findNodeTrans(struct aiNode *n, const struct aiString name, glm::mat4 *dest) {
+       if (strcmp(n->mName.data, name.data) == 0) {
+               *dest = aiMatrixToMat4(n->mTransformation);
+               return 0;
+       }
+       for (int i = 0; i < n->mNumChildren; i++) {
+               if (findNodeTrans(n->mChildren[i], name, dest) == 0) {
+                       glm::mat4 t = aiMatrixToMat4(n->mTransformation);
+                       *dest = t * *dest;
+                       return 0;
+               }
        }
+       return 1;
 }
 
 void init() {
-       glm::vec3 vertices[12] = {
-               glm::vec3(0.0f, 1.0f, 0.0f),
-               glm::vec3(1.0f, -1.0f, -1.0f),
-               glm::vec3(-1.0f, -1.0f, -1.0f),
-
-               glm::vec3(0.0f, 1.0f, 0.0f),
-               glm::vec3(-1.0f, -1.0f, 1.0f),
-               glm::vec3(1.0f, -1.0f, 1.0f),
-
-               glm::vec3(0.0f, 1.0f, 0.0f),
-               glm::vec3(-1.0f, -1.0f, -1.0f),
-               glm::vec3(-1.0f, -1.0f, 1.0f),
-
-               glm::vec3(0.0f, 1.0f, 0.0f),
-               glm::vec3(1.0f, -1.0f, 1.0f),
-               glm::vec3(1.0f, -1.0f, -1.0f)
-       };
+       plainProg = new Program("plainvertex.glsl", "plainfrag.glsl");
+       glUseProgram(plainProg->progId);
+       setupLightBuffers(plainProg->progId);
+       plainProg->validate();
 
-       // work out the normals
-       glm::vec3 normals[12];
-       for (int i = 0; i < 4; i++) {
-               glm::vec3 a = vertices[i * 3];
-               glm::vec3 b = vertices[i * 3 + 1];
-               glm::vec3 c = vertices[i * 3 + 2];
-               glm::vec3 u = glm::normalize(a - c);
-               glm::vec3 v = glm::normalize(b - c);
-               glm::vec3 norm = glm::normalize(glm::cross(v, u));
-               for(int j = 0; j < 3; j++) {
-                       normals[i * 3 + j] = glm::vec3(norm);
-               }
+       skyboxes.push_back(Skybox(Image("skyboxes/wooden_lounge_8k.hdr")));
+       skyboxes.push_back(Skybox(Image("skyboxes/machine_shop_02_8k.hdr")));
+       skyboxes.push_back(Skybox(Image("skyboxes/pink_sunrise_8k.hdr")));
+
+       pbrProg = new Program("pbrvert.glsl", "pbrfrag.glsl");
+       glUseProgram(pbrProg->progId);
+
+       const aiScene *scene = importer.ReadFile("models/newtonsCradle.glb", aiProcess_Triangulate | aiProcess_CalcTangentSpace | aiProcess_GenNormals | aiProcess_FlipUVs);
+       if (!scene) {
+               std::cerr << importer.GetErrorString() << std::endl;
+               exit(1);
        }
 
-       gradientProgId = compileShaders((char*)"vertex.glsl", (char*)"fragment.glsl");
-       glUseProgram(gradientProgId);
-       pyramidVao = setupBuffers(vertices, normals, gradientProgId);
-       validateProgram(gradientProgId);
+       if (scene->mNumCameras > 0) {
+               struct aiCamera *cam = scene->mCameras[0];
+               glm::mat4 camTrans;
+               if (findNodeTrans(scene->mRootNode, cam->mName, &camTrans) != 0)
+                       abort(); // there must be a node with the same name as camera
 
-       solidProgId = compileShaders((char*)"solidvertex.glsl", (char*)"solidfrag.glsl");
-       glUseProgram(solidProgId);
-       setupLightBuffers(solidProgId);
-       validateProgram(solidProgId);
+               camPos = { camTrans[3][0], camTrans[3][1], camTrans[3][2] };
+
+               glm::vec3 camLookAt = glm::vec3(cam->mLookAt.x, cam->mLookAt.y, cam->mLookAt.z);
+               camFront = camLookAt - camPos;
+
+               camUp = glm::vec3(cam->mUp.x, cam->mUp.y, cam->mUp.z);
+               
+               fov = cam->mHorizontalFOV;
+               // TODO: aspectRatio = cam->mAspect;
+               znear = cam->mClipPlaneNear;
+               zfar = cam->mClipPlaneFar;
+       }
+
+       sceneModel = new Model(scene, *pbrProg);
 
        glEnable(GL_DEPTH_TEST); 
        glEnable(GL_CULL_FACE); 
+       // prevent edge artifacts in specular cubemaps
+       glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
+
+       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;
        if (key == 'z')
-               doScale = !doScale;
+               activeSkybox = (activeSkybox + 1) % skyboxes.size();
        if (key == 'x')
-               doRotate = !doRotate;
+               activeLight = (activeLight + 1) % lights.size();
        if (key == 'c')
-               doTranslate = !doTranslate;
+               discoLights = !discoLights;
 }
 
 void keyboardUp(unsigned char key, int x, int y) {
@@ -384,6 +271,13 @@ void timer(int _) {
        if (keyStates['e'])
                ySpeed = -0.1f;
 
+       if (keyStates['j']) lights[activeLight].pos.z += 0.1f;
+       if (keyStates['k']) lights[activeLight].pos.z -= 0.1f;
+       if (keyStates['h']) lights[activeLight].pos.x -= 0.1f;
+       if (keyStates['l']) lights[activeLight].pos.x += 0.1f;
+       if (keyStates['m']) lights[activeLight].pos.y -= 0.1f;
+       if (keyStates['n']) lights[activeLight].pos.y += 0.1f;
+
        camPos.x += xSpeed * sin(yaw) + zSpeed * cos(yaw);
        camPos.y += ySpeed;
        camPos.z += zSpeed * sin(yaw) - xSpeed * cos(yaw);
@@ -414,6 +308,12 @@ void motion(int x, int y) {
        front.y = sin(pitch);
        front.z = cos(pitch) * sin(yaw);
        camFront = glm::normalize(front);
+
+       if (pitch < -1.57079632679 || pitch >= 1.57079632679) {
+               camUp = glm::vec3(0, -1, 0);
+       } else {
+               camUp = glm::vec3(0, 1, 0);
+       }
 }
 
 void mouse(int button, int state, int x, int y) {
@@ -421,12 +321,17 @@ void mouse(int button, int state, int x, int y) {
                firstMouse = true;
 }
 
+void reshape(int newWidth, int newHeight) {
+       windowWidth = newWidth, windowHeight = newHeight;
+}
+
 int main(int argc, char** argv) {
        glutInit(&argc, argv);
        glutInitDisplayMode(GLUT_DEPTH|GLUT_DOUBLE|GLUT_RGB|GLUT_3_2_CORE_PROFILE);
-       glutInitWindowSize(800, 600);
-       int win = glutCreateWindow("Hello Triangle");
+       glutInitWindowSize(windowWidth, windowHeight);
+       glutCreateWindow("Physically Based Rendering");
        glutDisplayFunc(display);
+       glutReshapeFunc(reshape);
 
        glewInit();