19 files changed, 194 insertions, 194 deletions

@@ -14,20 +14,20 @@ class ControllableComponent : public Component {
     void setJumpKey(int k);
     int getDropKey() const;
     void setDropKey(int k);
-    
+
     bool isFrozen() const;
     void setFrozen(bool f);
     bool isHoldingLeft() const;
     void setHoldingLeft(bool f);
     bool isHoldingRight() const;
     void setHoldingRight(bool f);
-    
+
   private:
     int leftKey = GLFW_KEY_LEFT;
     int rightKey = GLFW_KEY_RIGHT;
     int jumpKey = GLFW_KEY_UP;
     int dropKey = GLFW_KEY_DOWN;
-    
+
     bool frozen = false;
     bool holdingLeft = false;
     bool holdingRight = false;
@@ -7,7 +7,7 @@ class DroppableComponent : public Component {
   public:
     void setDroppable(bool can);
     bool isDroppable() const;
-    
+
   private:
     bool droppable = false;
 };
@@ -13,7 +13,7 @@ class PonderableComponent : public Component {
     void setAccelX(double v);
     double getAccelY() const;
     void setAccelY(double v);
-    
+
   private:
     double velocityX = 0.0;
     double velocityY = 0.0;
@@ -3,7 +3,7 @@
 TransformableComponent::TransformableComponent(double x, double y, int w, int h)
   : x(x), y(y), w(w), h(h)
 {
-  
+
 }
 
 double TransformableComponent::getX() const
@@ -6,17 +6,17 @@
 class TransformableComponent : public Component {
   public:
     TransformableComponent(double x, double y, int w, int h);
-    
+
     double getX() const;
     double getY() const;
     int getW() const;
     int getH() const;
-    
+
     void setX(double v);
     void setY(double v);
     void setW(int v);
     void setH(int v);
-    
+
   private:
     double x;
     double y;
@@ -10,13 +10,13 @@ std::set<int> EntityManager::getEntitiesWithComponents<>(std::set<std::type_inde
   {
     return cachedComponents[componentTypes];
   }
-  
+
   std::set<int>& cache = cachedComponents[componentTypes];
   for (auto& entity : entities)
   {
     EntityData& data = entity.second;
     bool cacheEntity = true;
-    
+
     for (auto& componentType : componentTypes)
     {
       if (data.components.count(componentType) == 0)
@@ -25,13 +25,13 @@ std::set<int> EntityManager::getEntitiesWithComponents<>(std::set<std::type_inde
         break;
       }
     }
-    
+
     if (cacheEntity)
     {
       cache.insert(entity.first);
     }
   }
-  
+
   return cache;
 }
 
@@ -13,30 +13,30 @@ class EntityManager {
     struct EntityData {
       std::map<std::type_index, std::unique_ptr<Component>> components;
     };
-  
+
     std::map<int, EntityData> entities;
     std::map<std::set<std::type_index>, std::set<int>> cachedComponents;
-  
+
     int nextEntityID = 0;
-    
+
     template <class T, class... R>
     std::set<int> getEntitiesWithComponentsHelper(std::set<std::type_index>& componentTypes)
     {
       componentTypes.insert(typeid(T));
-      
+
       return getEntitiesWithComponents<R...>(componentTypes);
     }
-    
+
     template <class... R>
     std::set<int> getEntitiesWithComponents(std::set<std::type_index>& componentTypes)
     {
       return getEntitiesWithComponentsHelper<R...>(componentTypes);
     }
-    
+
   public:
     EntityManager() = default;
     EntityManager(const EntityManager& copy) = delete;
-    
+
     int emplaceEntity()
     {
       // Find a suitable entity ID
@@ -44,76 +44,76 @@ class EntityManager {
       {
         nextEntityID++;
       }
-        
+
       if (nextEntityID < 0)
       {
         nextEntityID = 0;
-        
+
         while ((entities.count(nextEntityID) == 1) && (nextEntityID >= 0))
         {
           nextEntityID++;
         }
-        
+
         assert(nextEntityID >= 0);
       }
-      
+
       // Initialize the data
       int id = nextEntityID++;
       entities[id];
-      
+
       return id;
     }
-    
+
     void deleteEntity(int entity)
     {
       assert(entities.count(entity) == 1);
-      
+
       // Uncache components
       for (auto& cache : cachedComponents)
       {
         cache.second.erase(entity);
       }
-      
+
       // Destroy the data
       entities.erase(entity);
     }
-    
+
     template <class T, class... Args>
     T& emplaceComponent(int entity, Args&&... args)
     {
       assert(entities.count(entity) == 1);
-      
+
       EntityData& data = entities[entity];
       std::type_index componentType = typeid(T);
-      
+
       assert(data.components.count(componentType) == 0);
-      
+
       // Initialize the component
       std::unique_ptr<T> ptr = std::unique_ptr<T>(new T(std::forward<Args>(args)...));
       T& component = *ptr;
       data.components[componentType] = std::move(ptr);
-      
+
       // Invalidate related caches
       erase_if(cachedComponents, [&componentType] (std::pair<const std::set<std::type_index>, std::set<int>>& cache) {
         return cache.first.count(componentType) == 1;
       });
-      
+
       return component;
     }
-    
+
     template <class T>
     void removeComponent(int entity)
     {
       assert(entities.count(entity) == 1);
-      
+
       EntityData& data = entities[entity];
       std::type_index componentType = typeid(T);
-      
+
       assert(data.components.count(componentType) == 1);
-      
+
       // Destroy the component
       data.components.erase(componentType);
-      
+
       // Uncache the component
       for (auto& cache : cachedComponents)
       {
@@ -123,25 +123,25 @@ class EntityManager {
         }
       }
     }
-    
+
     template <class T>
     T& getComponent(int entity)
     {
       assert(entities.count(entity) == 1);
-      
+
       EntityData& data = entities[entity];
       std::type_index componentType = typeid(T);
-      
+
       assert(data.components.count(componentType) == 1);
-      
+
       return *((T*)data.components[componentType].get());
     }
-    
+
     template <class... R>
     std::set<int> getEntitiesWithComponents()
     {
       std::set<std::type_index> componentTypes;
-      
+
       return getEntitiesWithComponentsHelper<R...>(componentTypes);
     }
 };
@@ -45,24 +45,24 @@ void Game::execute()
   double lastTime = glfwGetTime();
   const double dt = 0.01;
   double accumulator = 0.0;
-  
+
   while (!(shouldQuit || glfwWindowShouldClose(window)))
   {
     double currentTime = glfwGetTime();
     double frameTime = currentTime - lastTime;
     lastTime = currentTime;
-    
+
     glfwPollEvents();
-    
+
     accumulator += frameTime;
     while (accumulator >= dt)
     {
       systemManager.getSystem<ControllingSystem>().tick(dt);
       systemManager.getSystem<PonderingSystem>().tick(dt);
-      
+
       accumulator -= dt;
     }
-    
+
     systemManager.getSystem<RenderingSystem>().tick(frameTime);
   }
 }
@@ -8,12 +8,12 @@
 class Game {
   public:
     Game(GLFWwindow* window);
-    
+
     void execute();
     EntityManager& getEntityManager();
-    
+
     friend void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods);
-    
+
   private:
     EntityManager entityManager;
     SystemManager systemManager;
@@ -8,20 +8,20 @@
 int main()
 {
   srand(time(NULL));
-  
+
   GLFWwindow* window = initRenderer();
   glfwSwapInterval(1);
-  
+
   initMuxer();
-  
+
   // Put this in a block so game goes out of scope before we destroy the renderer
   {
     Game game {window};
     game.execute();
   }
-  
+
   destroyMuxer();
   destroyRenderer();
-  
+
   return 0;
 }
@@ -56,11 +56,11 @@ static GLuint mesh_normalbuffer;
 static int mesh_numvertices;
 
 GLuint LoadShaders(const char* vertex_file_path, const char* fragment_file_path)
-{ 
+{
     // Create the shaders
     GLuint VertexShaderID = glCreateShader(GL_VERTEX_SHADER);
     GLuint FragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER);
- 
+
     // Read the Vertex Shader code from the file
     std::string VertexShaderCode;
     std::ifstream VertexShaderStream(vertex_file_path, std::ios::in);
@@ -71,7 +71,7 @@ GLuint LoadShaders(const char* vertex_file_path, const char* fragment_file_path)
             VertexShaderCode += "\n" + Line;
         VertexShaderStream.close();
     }
- 
+
     // Read the Fragment Shader code from the file
     std::string FragmentShaderCode;
     std::ifstream FragmentShaderStream(fragment_file_path, std::ios::in);
@@ -81,53 +81,53 @@ GLuint LoadShaders(const char* vertex_file_path, const char* fragment_file_path)
             FragmentShaderCode += "\n" + Line;
         FragmentShaderStream.close();
     }
- 
+
     GLint Result = GL_FALSE;
     int InfoLogLength;
- 
+
     // Compile Vertex Shader
     printf("Compiling shader : %s\n", vertex_file_path);
     char const * VertexSourcePointer = VertexShaderCode.c_str();
     glShaderSource(VertexShaderID, 1, &VertexSourcePointer , nullptr);
     glCompileShader(VertexShaderID);
- 
+
     // Check Vertex Shader
     glGetShaderiv(VertexShaderID, GL_COMPILE_STATUS, &Result);
     glGetShaderiv(VertexShaderID, GL_INFO_LOG_LENGTH, &InfoLogLength);
     std::vector<char> VertexShaderErrorMessage(InfoLogLength);
     glGetShaderInfoLog(VertexShaderID, InfoLogLength, nullptr, &VertexShaderErrorMessage[0]);
     fprintf(stdout, "%s\n", &VertexShaderErrorMessage[0]);
- 
+
     // Compile Fragment Shader
     printf("Compiling shader : %s\n", fragment_file_path);
     char const * FragmentSourcePointer = FragmentShaderCode.c_str();
     glShaderSource(FragmentShaderID, 1, &FragmentSourcePointer , nullptr);
     glCompileShader(FragmentShaderID);
- 
+
     // Check Fragment Shader
     glGetShaderiv(FragmentShaderID, GL_COMPILE_STATUS, &Result);
     glGetShaderiv(FragmentShaderID, GL_INFO_LOG_LENGTH, &InfoLogLength);
     std::vector<char> FragmentShaderErrorMessage(InfoLogLength);
     glGetShaderInfoLog(FragmentShaderID, InfoLogLength, nullptr, &FragmentShaderErrorMessage[0]);
     fprintf(stdout, "%s\n", &FragmentShaderErrorMessage[0]);
- 
+
     // Link the program
     fprintf(stdout, "Linking program\n");
     GLuint ProgramID = glCreateProgram();
     glAttachShader(ProgramID, VertexShaderID);
     glAttachShader(ProgramID, FragmentShaderID);
     glLinkProgram(ProgramID);
- 
+
     // Check the program
     glGetProgramiv(ProgramID, GL_LINK_STATUS, &Result);
     glGetProgramiv(ProgramID, GL_INFO_LOG_LENGTH, &InfoLogLength);
     std::vector<char> ProgramErrorMessage( glm::max(InfoLogLength, int(1)) );
     glGetProgramInfoLog(ProgramID, InfoLogLength, nullptr, &ProgramErrorMessage[0]);
     fprintf(stdout, "%s\n", &ProgramErrorMessage[0]);
- 
+
     glDeleteShader(VertexShaderID);
     glDeleteShader(FragmentShaderID);
- 
+
     return ProgramID;
 }
 
@@ -135,14 +135,14 @@ void flipImageData(unsigned char* data, int width, int height, int comps)
 {
   unsigned char* data_copy = (unsigned char*) malloc(width*height*comps*sizeof(unsigned char));
   memcpy(data_copy, data, width*height*comps);
-  
+
   int row_size = width * comps;
-  
+
   for (int i=0;i<height;i++)
   {
     memcpy(data + (row_size*i), data_copy + (row_size*(height-i-1)), row_size);
   }
-  
+
   free(data_copy);
 }
 
@@ -154,11 +154,11 @@ void loadMesh(const char* filename, std::vector<glm::vec3>& out_vertices, std::v
     fprintf(stderr, "Could not open mesh file %s\n", filename);
     exit(1);
   }
-  
+
   std::vector<glm::vec3> temp_vertices;
   std::vector<glm::vec2> temp_uvs;
   std::vector<glm::vec3> temp_normals;
-  
+
   for (;;)
   {
     char lineHeader[256];
@@ -167,7 +167,7 @@ void loadMesh(const char* filename, std::vector<glm::vec3>& out_vertices, std::v
     {
       break;
     }
-    
+
     if (!strncmp(lineHeader, "v", 2))
     {
       glm::vec3 vertex;
@@ -187,7 +187,7 @@ void loadMesh(const char* filename, std::vector<glm::vec3>& out_vertices, std::v
     {
       int vertexIDs[3], uvIDs[3], normalIDs[3];
       fscanf(file, "%d/%d/%d %d/%d/%d %d/%d/%d\n", &vertexIDs[0], &uvIDs[0], &normalIDs[0], &vertexIDs[1], &uvIDs[1], &normalIDs[1], &vertexIDs[2], &uvIDs[2], &normalIDs[2]);
-      
+
       for (int i=0; i<3; i++)
       {
         out_vertices.push_back(temp_vertices[vertexIDs[i] - 1]);
@@ -202,24 +202,24 @@ void setFramebufferSize(GLFWwindow* w, int width, int height)
 {
   buffer_width = width;
   buffer_height = height;
-  
+
   glDeleteFramebuffers(1, &bloom_framebuffer);
   glDeleteRenderbuffers(1, &bloom_depthbuffer);
-  
+
   glGenFramebuffers(1, &bloom_framebuffer);
   glBindFramebuffer(GL_FRAMEBUFFER, bloom_framebuffer);
   GLenum DrawBuffers[1] = {GL_COLOR_ATTACHMENT1};
   glDrawBuffers(1, DrawBuffers);
-  
+
   glGenRenderbuffers(1, &bloom_depthbuffer);
   glBindRenderbuffer(GL_RENDERBUFFER, bloom_depthbuffer);
   glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, width, height);
   glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, bloom_depthbuffer);
-  
+
   glDeleteTextures(1, &preBloomTex);
   glDeleteTextures(1, &bloomPassTex1);
   glDeleteTextures(1, &bloomPassTex2);
-  
+
   glGenTextures(1, &preBloomTex);
   glBindTexture(GL_TEXTURE_2D, preBloomTex);
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, 0);
@@ -227,7 +227,7 @@ void setFramebufferSize(GLFWwindow* w, int width, int height)
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-  
+
   glGenTextures(1, &bloomPassTex1);
   glBindTexture(GL_TEXTURE_2D, bloomPassTex1);
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width/4, height/4, 0, GL_RGB, GL_UNSIGNED_BYTE, 0);
@@ -235,7 +235,7 @@ void setFramebufferSize(GLFWwindow* w, int width, int height)
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-  
+
   glGenTextures(1, &bloomPassTex2);
   glBindTexture(GL_TEXTURE_2D, bloomPassTex2);
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width/4, height/4, 0, GL_RGB, GL_UNSIGNED_BYTE, 0);
@@ -252,20 +252,20 @@ GLFWwindow* initRenderer()
     fprintf(stderr, "Renderer already initialized\n");
     exit(-1);
   }
-  
+
   // Initialize GLFW
   if (!glfwInit())
   {
     fprintf(stderr, "Failed to initialize GLFW\n");
     exit(-1);
   }
-  
+
   glfwWindowHint(GLFW_SAMPLES, 4); // 4x antialiasing
   glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); // We want version 3.3
   glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
   glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); // Mac requires this
   glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
-  
+
   // Create a window
   window = glfwCreateWindow(1024, 768, "Aromatherapy", nullptr, nullptr);
   if (window == nullptr)
@@ -274,7 +274,7 @@ GLFWwindow* initRenderer()
     glfwTerminate();
     exit(-1);
   }
-  
+
   glfwMakeContextCurrent(window);
   glewExperimental = true; // Needed in core profile
   if (glewInit() != GLEW_OK)
@@ -282,37 +282,37 @@ GLFWwindow* initRenderer()
     fprintf(stderr, "Failed to initialize GLEW\n");
     exit(-1);
   }
-  
+
   glfwSetFramebufferSizeCallback(window, &setFramebufferSize);
-  
+
   // Set up vertex array object
   glGenVertexArrays(1, &VertexArrayID);
   glBindVertexArray(VertexArrayID);
-  
+
   // Enable depth testing
   glEnable(GL_DEPTH_TEST);
   glDepthFunc(GL_LESS);
-  
+
   // Enable blending
   glEnable(GL_BLEND);
   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-  
+
   // Set up the framebuffer
   glGenFramebuffers(1, &generic_framebuffer);
   glBindFramebuffer(GL_FRAMEBUFFER, generic_framebuffer);
   GLenum DrawBuffers[1] = {GL_COLOR_ATTACHMENT0};
   glDrawBuffers(1, DrawBuffers);
-  
+
   glGenFramebuffers(1, &bloom_framebuffer);
   glBindFramebuffer(GL_FRAMEBUFFER, bloom_framebuffer);
   GLenum DrawBuffers2[1] = {GL_COLOR_ATTACHMENT1};
   glDrawBuffers(1, DrawBuffers2);
-  
+
   glGenRenderbuffers(1, &bloom_depthbuffer);
   glBindRenderbuffer(GL_RENDERBUFFER, bloom_depthbuffer);
   glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, 1024, 768);
   glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, bloom_depthbuffer);
-  
+
   // Set up the NTSC rendering buffers
   glGenTextures(1, &renderedTex1);
   glBindTexture(GL_TEXTURE_2D, renderedTex1);
@@ -322,7 +322,7 @@ GLFWwindow* initRenderer()
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   renderedTexBufs[0] = renderedTex1;
-  
+
   glGenTextures(1, &renderedTex2);
   glBindTexture(GL_TEXTURE_2D, renderedTex2);
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, GAME_WIDTH, GAME_HEIGHT, 0, GL_RGB, GL_UNSIGNED_BYTE, 0);
@@ -331,7 +331,7 @@ GLFWwindow* initRenderer()
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   renderedTexBufs[1] = renderedTex2;
-  
+
   // Set up bloom rendering buffers
   glGenTextures(1, &preBloomTex);
   glBindTexture(GL_TEXTURE_2D, preBloomTex);
@@ -340,7 +340,7 @@ GLFWwindow* initRenderer()
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-  
+
   glGenTextures(1, &bloomPassTex1);
   glBindTexture(GL_TEXTURE_2D, bloomPassTex1);
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 1024/4, 768/4, 0, GL_RGB, GL_UNSIGNED_BYTE, 0);
@@ -348,7 +348,7 @@ GLFWwindow* initRenderer()
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-  
+
   glGenTextures(1, &bloomPassTex2);
   glBindTexture(GL_TEXTURE_2D, bloomPassTex2);
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 1024/4, 768/4, 0, GL_RGB, GL_UNSIGNED_BYTE, 0);
@@ -356,31 +356,31 @@ GLFWwindow* initRenderer()
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-  
+
   curBuf = 0;
-  
+
   // Load the mesh!
   std::vector<glm::vec3> mesh_vertices;
   std::vector<glm::vec2> mesh_uvs;
   std::vector<glm::vec3> mesh_normals;
   loadMesh("res/monitor-fef.obj", mesh_vertices, mesh_uvs, mesh_normals);
-  
+
   mesh_numvertices = mesh_vertices.size();
-  
+
   glGenBuffers(1, &mesh_vertexbuffer);
   glBindBuffer(GL_ARRAY_BUFFER, mesh_vertexbuffer);
   glBufferData(GL_ARRAY_BUFFER, mesh_vertices.size() * sizeof(glm::vec3), &mesh_vertices[0], GL_STATIC_DRAW);
-  
+
   glGenBuffers(1, &mesh_uvbuffer);
   glBindBuffer(GL_ARRAY_BUFFER, mesh_uvbuffer);
   glBufferData(GL_ARRAY_BUFFER, mesh_uvs.size() * sizeof(glm::vec3), &mesh_uvs[0], GL_STATIC_DRAW);
-  
+
   glGenBuffers(1, &mesh_normalbuffer);
   glBindBuffer(GL_ARRAY_BUFFER, mesh_normalbuffer);
   glBufferData(GL_ARRAY_BUFFER, mesh_normals.size() * sizeof(glm::vec3), &mesh_normals[0], GL_STATIC_DRAW);
-  
+
   // Load the vertices of a flat surface
-  GLfloat g_quad_vertex_buffer_data[] = { 
+  GLfloat g_quad_vertex_buffer_data[] = {
                 -1.0f, -1.0f, 0.0f,
                  1.0f, -1.0f, 0.0f,
                 -1.0f,  1.0f, 0.0f,
@@ -392,7 +392,7 @@ GLFWwindow* initRenderer()
   glGenBuffers(1, &quad_vertexbuffer);
   glBindBuffer(GL_ARRAY_BUFFER, quad_vertexbuffer);
   glBufferData(GL_ARRAY_BUFFER, sizeof(g_quad_vertex_buffer_data), g_quad_vertex_buffer_data, GL_STATIC_DRAW);
-  
+
   glGenTextures(1, &artifactsTex);
   glBindTexture(GL_TEXTURE_2D, artifactsTex);
   int atdw, atdh;
@@ -403,7 +403,7 @@ GLFWwindow* initRenderer()
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
   glGenerateMipmap(GL_TEXTURE_2D);
-  
+
   glGenTextures(1, &scanlinesTex);
   glBindTexture(GL_TEXTURE_2D, scanlinesTex);
   int stdw, stdh;
@@ -414,7 +414,7 @@ GLFWwindow* initRenderer()
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
   glGenerateMipmap(GL_TEXTURE_2D);
-  
+
   // Load the shaders
   ntscShader = LoadShaders("shaders/ntsc.vertex", "shaders/ntsc.fragment");
   finalShader = LoadShaders("shaders/final.vertex", "shaders/final.fragment");
@@ -422,9 +422,9 @@ GLFWwindow* initRenderer()
   fillShader = LoadShaders("shaders/fill.vertex", "shaders/fill.fragment");
   bloom1Shader = LoadShaders("shaders/bloom1.vertex", "shaders/bloom1.fragment");
   bloom2Shader = LoadShaders("shaders/bloom2.vertex", "shaders/bloom2.fragment");
-  
+
   rendererInitialized = true;
-  
+
   return window;
 }
 
@@ -435,13 +435,13 @@ void destroyRenderer()
     fprintf(stderr, "Renderer not initialized\n");
     exit(-1);
   }
-  
+
   // Delete the plane buffer
   glDeleteBuffers(1, &quad_vertexbuffer);
   glDeleteBuffers(1, &mesh_vertexbuffer);
   glDeleteBuffers(1, &mesh_uvbuffer);
   glDeleteBuffers(1, &mesh_normalbuffer);
-  
+
   // Delete the shaders
   glDeleteProgram(ntscShader);
   glDeleteProgram(finalShader);
@@ -449,7 +449,7 @@ void destroyRenderer()
   glDeleteProgram(fillShader);
   glDeleteProgram(bloom1Shader);
   glDeleteProgram(bloom2Shader);
-  
+
   // Delete the NTSC rendering buffers
   glDeleteTextures(1, &renderedTex1);
   glDeleteTextures(1, &renderedTex2);
@@ -458,18 +458,18 @@ void destroyRenderer()
   glDeleteTextures(1, &preBloomTex);
   glDeleteTextures(1, &bloomPassTex1);
   glDeleteTextures(1, &bloomPassTex2);
-  
+
   // Delete the framebuffer
   glDeleteRenderbuffers(1, &bloom_depthbuffer);
   glDeleteFramebuffers(1, &bloom_framebuffer);
   glDeleteFramebuffers(1, &generic_framebuffer);
-  
+
   // Delete the VAO
   glDeleteVertexArrays(1, &VertexArrayID);
-  
+
   // Kill the window
   glfwTerminate();
-  
+
   rendererInitialized = false;
 }
 
@@ -480,10 +480,10 @@ Texture::Texture(int width, int height)
     fprintf(stderr, "Renderer not initialized\n");
     exit(-1);
   }
-  
+
   this->width = width;
   this->height = height;
-  
+
   glGenTextures(1, &texID);
   glBindTexture(GL_TEXTURE_2D, texID);
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
@@ -500,7 +500,7 @@ Texture::Texture(const char* filename)
     fprintf(stderr, "Renderer not initialized\n");
     exit(-1);
   }
-  
+
   glGenTextures(1, &texID);
   glBindTexture(GL_TEXTURE_2D, texID);
   unsigned char* data = stbi_load(filename, &width, &height, 0, 4);
@@ -520,14 +520,14 @@ Texture::Texture(const Texture& tex)
     fprintf(stderr, "Renderer not initialized\n");
     exit(-1);
   }
-  
+
   width = tex.width;
   height = tex.height;
-  
+
   unsigned char* data = (unsigned char*) malloc(4 * width * height);
   glBindTexture(GL_TEXTURE_2D, tex.texID);
   glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
-  
+
   glGenTextures(1, &texID);
   glBindTexture(GL_TEXTURE_2D, texID);
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
@@ -535,7 +535,7 @@ Texture::Texture(const Texture& tex)
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-  
+
   free(data);
 }
 
@@ -551,14 +551,14 @@ Texture::~Texture()
     fprintf(stderr, "Renderer not initialized\n");
     exit(-1);
   }
-  
+
   glDeleteTextures(1, &texID);
 }
 
 Texture& Texture::operator= (Texture tex)
 {
   swap(*this, tex);
-  
+
   return *this;
 }
 
@@ -576,17 +576,17 @@ void Texture::fill(Rectangle dstrect, int r, int g, int b)
     fprintf(stderr, "Renderer not initialized\n");
     exit(-1);
   }
-  
+
   // Target the framebuffer
   glBindFramebuffer(GL_FRAMEBUFFER, generic_framebuffer);
   glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, texID, 0);
-  
+
   // Set up the vertex attributes
   GLfloat minx = (GLfloat) dstrect.x / width * 2.0 - 1.0;
   GLfloat miny = -((GLfloat) dstrect.y / height * 2.0 - 1.0);
   GLfloat maxx = (GLfloat) (dstrect.x + dstrect.w) / width * 2.0 - 1.0;
   GLfloat maxy = -((GLfloat) (dstrect.y + dstrect.h) / height * 2.0 - 1.0);
-  
+
   GLfloat vertexbuffer_data[] = {
     minx, miny,
     maxx, miny,
@@ -601,14 +601,14 @@ void Texture::fill(Rectangle dstrect, int r, int g, int b)
   glBufferData(GL_ARRAY_BUFFER, sizeof(vertexbuffer_data), vertexbuffer_data, GL_STATIC_DRAW);
   glEnableVertexAttribArray(0);
   glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, (void*)0);
-  
+
   glViewport(0, 0, width, height);
   glClear(GL_DEPTH_BUFFER_BIT);
   glUseProgram(fillShader);
   glUniform3f(glGetUniformLocation(fillShader, "vecColor"), r / 255.0, g / 255.0, b / 255.0);
-  
+
   glDrawArrays(GL_TRIANGLES, 0, 6);
-  
+
   glDisableVertexAttribArray(0);
   glDeleteBuffers(1, &vertexbuffer);
 }
@@ -620,19 +620,19 @@ void Texture::blit(const Texture& srctex, Rectangle srcrect, Rectangle dstrect,
     fprintf(stderr, "Renderer not initialized\n");
     exit(-1);
   }
-  
+
   alpha = glm::clamp(alpha, 0.0, 1.0);
-  
+
   // Target the framebuffer
   glBindFramebuffer(GL_FRAMEBUFFER, generic_framebuffer);
   glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, texID, 0);
-  
+
   // Set up the vertex attributes
   GLfloat minx = (GLfloat) dstrect.x / width * 2.0 - 1.0;
   GLfloat miny = -((GLfloat) dstrect.y / height * 2.0 - 1.0);
   GLfloat maxx = (GLfloat) (dstrect.x + dstrect.w) / width * 2.0 - 1.0;
   GLfloat maxy = -((GLfloat) (dstrect.y + dstrect.h) / height * 2.0 - 1.0);
-  
+
   GLfloat vertexbuffer_data[] = {
     minx, miny,
     maxx, miny,
@@ -645,12 +645,12 @@ void Texture::blit(const Texture& srctex, Rectangle srcrect, Rectangle dstrect,
   glBufferData(GL_ARRAY_BUFFER, sizeof(vertexbuffer_data), vertexbuffer_data, GL_STATIC_DRAW);
   glEnableVertexAttribArray(0);
   glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, (void*)0);
-  
+
   GLfloat minu = (GLfloat) srcrect.x / srctex.width;
   GLfloat minv = 1 - ((GLfloat) srcrect.y / srctex.height);
   GLfloat maxu = (GLfloat) (srcrect.x + srcrect.w) / srctex.width;
   GLfloat maxv = 1 - ((GLfloat) (srcrect.y + srcrect.h) / srctex.height);
-  
+
   GLfloat texcoordbuffer_data[] = {
     minu, minv,
     maxu, minv,
@@ -663,20 +663,20 @@ void Texture::blit(const Texture& srctex, Rectangle srcrect, Rectangle dstrect,
   glBufferData(GL_ARRAY_BUFFER, sizeof(texcoordbuffer_data), texcoordbuffer_data, GL_STATIC_DRAW);
   glEnableVertexAttribArray(1);
   glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 0, (void*)0);
-  
+
   // Set up the shader
   glUseProgram(blitShader);
   glClear(GL_DEPTH_BUFFER_BIT);
   glViewport(0, 0, width, height);
-  
+
   glActiveTexture(GL_TEXTURE0);
   glBindTexture(GL_TEXTURE_2D, srctex.texID);
   glUniform1i(glGetUniformLocation(blitShader, "srctex"), 0);
   glUniform1f(glGetUniformLocation(blitShader, "alpha"), alpha);
-  
+
   // Blit!
   glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-  
+
   // Unload everything
   glDisableVertexAttribArray(1);
   glDisableVertexAttribArray(0);
@@ -691,11 +691,11 @@ void bloomPass1(GLuint srcTex, GLuint dstTex, bool horizontal, glm::vec2 srcRes,
   glViewport(0,0,dstRes.x,dstRes.y);
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glUseProgram(bloom1Shader);
-  
+
   glActiveTexture(GL_TEXTURE0);
   glBindTexture(GL_TEXTURE_2D, srcTex);
   glUniform1i(glGetUniformLocation(bloom1Shader, "inTex"), 0);
-  
+
   glm::vec2 offset = glm::vec2(0.0);
   if (horizontal)
   {
@@ -703,9 +703,9 @@ void bloomPass1(GLuint srcTex, GLuint dstTex, bool horizontal, glm::vec2 srcRes,
   } else {
     offset.y = 1.2/srcRes.y;
   }
-  
+
   glUniform2f(glGetUniformLocation(bloom1Shader, "offset"), offset.x, offset.y);
-  
+
   glEnableVertexAttribArray(0);
   glBindBuffer(GL_ARRAY_BUFFER, quad_vertexbuffer);
   glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, (void*)0);
@@ -720,17 +720,17 @@ void Texture::renderScreen() const
     fprintf(stderr, "Renderer not initialized\n");
     exit(-1);
   }
-  
+
   // First we're going to composite our frame with the previous frame
   // We start by setting up the framebuffer
   glBindFramebuffer(GL_FRAMEBUFFER, generic_framebuffer);
   glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, renderedTexBufs[curBuf], 0);
-  
+
   // Set up the shader
   glViewport(0,0,GAME_WIDTH,GAME_HEIGHT);
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glUseProgram(ntscShader);
-  
+
   // Use the current frame texture, nearest neighbor and clamped to edge
   glActiveTexture(GL_TEXTURE0);
   glBindTexture(GL_TEXTURE_2D, texID);
@@ -739,7 +739,7 @@ void Texture::renderScreen() const
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glUniform1i(glGetUniformLocation(ntscShader, "curFrameSampler"), 0);
-  
+
   // Use the previous frame composite texture, nearest neighbor and clamped to edge
   glActiveTexture(GL_TEXTURE1);
   glBindTexture(GL_TEXTURE_2D, renderedTexBufs[(curBuf + 1) % 2]);
@@ -748,13 +748,13 @@ void Texture::renderScreen() const
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glUniform1i(glGetUniformLocation(ntscShader, "prevFrameSampler"), 1);
-  
+
   // Load the NTSC artifact texture
   glActiveTexture(GL_TEXTURE2);
   glBindTexture(GL_TEXTURE_2D, artifactsTex);
   glUniform1i(glGetUniformLocation(ntscShader, "NTSCArtifactSampler"), 2);
   glUniform1f(glGetUniformLocation(ntscShader, "NTSCLerp"), curBuf * 1.0);
-  
+
   if ((rand() % 60) == 0)
   {
     // Change the 0.0 to a 1.0 or a 10.0 for a glitchy effect!
@@ -762,7 +762,7 @@ void Texture::renderScreen() const
   } else {
     glUniform1f(glGetUniformLocation(ntscShader, "Tuning_NTSC"), 0.0);
   }
-  
+
   // Render our composition
   glEnableVertexAttribArray(0);
   glBindBuffer(GL_ARRAY_BUFFER, quad_vertexbuffer);
@@ -776,7 +776,7 @@ void Texture::renderScreen() const
   glViewport(0,0,buffer_width,buffer_height);
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glUseProgram(finalShader);
-  
+
   // Use the composited frame texture, linearly filtered and filling in black for the border
   glActiveTexture(GL_TEXTURE0);
   glBindTexture(GL_TEXTURE_2D, renderedTexBufs[curBuf]);
@@ -788,69 +788,69 @@ void Texture::renderScreen() const
   glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, border_color);
         glGenerateMipmap(GL_TEXTURE_2D);
   glUniform1i(glGetUniformLocation(finalShader, "rendertex"), 0);
-  
+
   // Use the scanlines texture
   glActiveTexture(GL_TEXTURE1);
   glBindTexture(GL_TEXTURE_2D, scanlinesTex);
   glUniform1i(glGetUniformLocation(finalShader, "scanlinestex"), 1);
-  
+
   // Initialize the MVP matrices
   glm::mat4 p_matrix = glm::perspective(42.5f, (float) buffer_width / (float) buffer_height, 0.1f, 100.0f);
   glm::mat4 v_matrix = glm::lookAt(glm::vec3(2,0,0), glm::vec3(0,0,0), glm::vec3(0,1,0));
   glm::mat4 m_matrix = glm::mat4(1.0);
   glm::mat4 mvp_matrix = p_matrix * v_matrix * m_matrix;
-  
+
   glUniformMatrix4fv(glGetUniformLocation(finalShader, "MVP"), 1, GL_FALSE, &mvp_matrix[0][0]);
   glUniformMatrix4fv(glGetUniformLocation(finalShader, "worldMat"), 1, GL_FALSE, &m_matrix[0][0]);
   glUniform2f(glGetUniformLocation(finalShader, "resolution"), buffer_width, buffer_height);
   glUniform1f(glGetUniformLocation(finalShader, "iGlobalTime"), glfwGetTime());
-  
+
   glEnableVertexAttribArray(0);
   glBindBuffer(GL_ARRAY_BUFFER, mesh_vertexbuffer);
   glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, (void*)0);
-  
+
   glEnableVertexAttribArray(1);
   glBindBuffer(GL_ARRAY_BUFFER, mesh_normalbuffer);
   glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 0, (void*)0);
-  
+
   glEnableVertexAttribArray(2);
   glBindBuffer(GL_ARRAY_BUFFER, mesh_uvbuffer);
   glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, 0, (void*)0);
-  
+
   glDrawArrays(GL_TRIANGLES, 0, mesh_numvertices);
   glDisableVertexAttribArray(2);
   glDisableVertexAttribArray(1);
   glDisableVertexAttribArray(0);
-  
+
   // First pass of bloom!
   glm::vec2 buffer_size = glm::vec2(buffer_width, buffer_height);
   bloomPass1(preBloomTex, bloomPassTex1, true, buffer_size, buffer_size / 4.0f);
   bloomPass1(bloomPassTex1, bloomPassTex2, false, buffer_size / 4.0f, buffer_size / 4.0f);
-  
+
   // Do the second pass of bloom and render to screen
   glBindFramebuffer(GL_FRAMEBUFFER, 0);
   glViewport(0, 0, buffer_width, buffer_height);
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glUseProgram(bloom2Shader);
-  
+
   glActiveTexture(GL_TEXTURE0);
   glBindTexture(GL_TEXTURE_2D, preBloomTex);
   glUniform1i(glGetUniformLocation(bloom2Shader, "clearTex"), 0);
-  
+
   glActiveTexture(GL_TEXTURE1);
   glBindTexture(GL_TEXTURE_2D, bloomPassTex2);
   glUniform1i(glGetUniformLocation(bloom2Shader, "blurTex"), 1);
-  
+
   glUniform1f(glGetUniformLocation(bloom2Shader, "iGlobalTime"), glfwGetTime());
-  
+
   glEnableVertexAttribArray(0);
   glBindBuffer(GL_ARRAY_BUFFER, quad_vertexbuffer);
   glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, (void*)0);
   glDrawArrays(GL_TRIANGLES, 0, 6);
   glDisableVertexAttribArray(0);
-  
+
   glfwSwapBuffers(window);
-  
+
   curBuf = (curBuf + 1) % 2;
 }
 
@@ -24,7 +24,7 @@ class Texture {
     void blit(const Texture& src, Rectangle srcrect, Rectangle dstrect, double alpha = 1.0);
     void renderScreen() const;
     Rectangle entirety() const;
-    
+
   private:
     GLuint texID;
     int width;
@@ -7,9 +7,9 @@ class System {
   public:
     System(Game& game)
       : game(game) {}
-    
+
     virtual void tick(double dt) = 0;
-    
+
   protected:
     Game& game;
 };
@@ -18,18 +18,18 @@ class SystemManager {
     {
       std::unique_ptr<T> ptr = std::unique_ptr<T>(new T(game, std::forward<Args>(args)...));
       std::type_index systemType = typeid(T);
-      
+
       systems[systemType] = ptr.get();
       loop.push_back(std::move(ptr));
     }
-    
+
     template <class T>
     T& getSystem()
     {
       std::type_index systemType = typeid(T);
-      
+
       assert(systems.count(systemType) == 1);
-      
+
       return *((T*)systems[systemType]);
     }
 };
@@ -14,12 +14,12 @@ void ControllingSystem::tick(double dt)
   {
     int key = actions.front().first;
     int action = actions.front().second;
-    
+
     auto entities = game.getEntityManager().getEntitiesWithComponents<ControllableComponent, PonderableComponent, AnimatableComponent, DroppableComponent>();
     for (auto entity : entities)
     {
       auto& controllable = game.getEntityManager().getComponent<ControllableComponent>(entity);
-      
+
       if (action == GLFW_PRESS)
       {
         if (key == controllable.getLeftKey())
@@ -33,7 +33,7 @@ void ControllingSystem::tick(double dt)
         } else if (key == controllable.getRightKey())
         {
           controllable.setHoldingRight(true);
-      
+
           if (!controllable.isFrozen())
           {
             walkRight(entity);
@@ -56,7 +56,7 @@ void ControllingSystem::tick(double dt)
         if (key == controllable.getLeftKey())
         {
           controllable.setHoldingLeft(false);
-      
+
           if (!controllable.isFrozen())
           {
             if (controllable.isHoldingRight())
@@ -69,7 +69,7 @@ void ControllingSystem::tick(double dt)
         } else if (key == controllable.getRightKey())
         {
           controllable.setHoldingRight(false);
-      
+
           if (!controllable.isFrozen())
           {
             if (controllable.isHoldingRight())
@@ -94,7 +94,7 @@ void ControllingSystem::tick(double dt)
         }
       }
     }
-    
+
     actions.pop();
   }
 }
@@ -8,10 +8,10 @@ class ControllingSystem : public System {
   public:
     ControllingSystem(Game& game)
       : System(game) {}
-    
+
     void tick(double dt);
     void input(int key, int action);
-    
+
   private:
     void walkLeft(int entity);
     void walkRight(int entity);
@@ -19,7 +19,7 @@ class ControllingSystem : public System {
     void jump(int entity);
     void stopJumping(int entity);
     void drop(int entity, bool start);
-    
+
     std::queue<std::pair<int,int>> actions;
 };
 
@@ -6,16 +6,16 @@
 void PonderingSystem::tick(double dt)
 {
   auto entities = game.getEntityManager().getEntitiesWithComponents<PonderableComponent, TransformableComponent>();
-  
+
   for (auto entity : entities)
   {
     auto& transformable = game.getEntityManager().getComponent<TransformableComponent>(entity);
     auto& ponderable = game.getEntityManager().getComponent<PonderableComponent>(entity);
-    
+
     // Accelerate
     ponderable.setVelocityX(ponderable.getVelocityX() + ponderable.getAccelX() * dt);
     ponderable.setVelocityY(ponderable.getVelocityY() + ponderable.getAccelY() * dt);
-    
+
     // Move
     transformable.setX(transformable.getX() + ponderable.getVelocityX() * dt);
     transformable.setY(transformable.getY() + ponderable.getVelocityY() * dt);
@@ -7,7 +7,7 @@ class PonderingSystem : public System {
   public:
     PonderingSystem(Game& game)
       : System(game) {}
-    
+
     void tick(double dt);
 };
 
@@ -9,9 +9,9 @@ class RenderingSystem : public System {
   public:
     RenderingSystem(Game& game)
       : System(game) {}
-    
+
     void tick(double dt);
-    
+
   private:
     Texture texture {GAME_WIDTH, GAME_HEIGHT};
 };