Fix compilation errors

Author: joinemm

src/camera.cpp

@@ -3,7 +3,7 @@
 
 #include "camera.h"
 
-Camera::Camera(float aspectRatio) { Camera::aspectRatio = aspectRatio; }
+Camera::Camera(float aspect) { Camera::aspectRatio = aspect; }
 
 void Camera::moveForward(float amount) { pos += front * amount; }
 

src/camera.h

@@ -20,7 +20,7 @@ class Camera {
 
   float aspectRatio;
 
-  Camera(float aspectRatio);
+  Camera(float aspect);
 
   void moveForward(float amount);
   void moveSideways(float amount);

src/texture.cpp

@@ -7,8 +7,7 @@
 
 #include "texture.h"
 
-Texture::Texture(const std::string &path, unsigned int filter,
-                 unsigned int wrap) {
+Texture::Texture(const std::string &path, GLint filter, GLint wrap) {
   // create a texture object
   glGenTextures(1, &ID);
   glBindTexture(GL_TEXTURE_2D, ID);
@@ -40,7 +39,7 @@ Texture::Texture(const std::string &path, unsigned int filter,
                 << " channels which is unhandled case!" << std::endl;
     }
     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-    glTexImage2D(GL_TEXTURE_2D, 0, format, width, height, 0, format,
+    glTexImage2D(GL_TEXTURE_2D, 0, (GLint)format, width, height, 0, format,
                  GL_UNSIGNED_BYTE, data);
     glGenerateMipmap(GL_TEXTURE_2D);
   } else {

src/texture.h

@@ -1,14 +1,15 @@
 #ifndef TEXTURE_H
 #define TEXTURE_H
 
+#include <GL/glew.h>
 #include <fstream>
 
 class Texture {
 public:
   unsigned int ID;
   int width, height, nrChannels;
 
-  Texture(const std::string &path, unsigned int filter, unsigned int wrap);
+  Texture(const std::string &path, GLint filter, GLint wrap);
   void use(unsigned int texture_id);
 };