loading obj files working.

headers/camera.hpp

@@ -7,7 +7,11 @@ public:
   Camera(glm::vec3 pos, float yaw, float pitch, float fov, float aspect);
   ~Camera();
   void setPos(glm::vec3 pos);
+  void addPos(glm::vec3 pos);
+  void addFPos(glm::vec3 pos);
   void setRotate(float yaw, float pitch);
+  void addRotate(float yaw, float pitch);
+  glm::vec3 getPos();
   glm::mat4 getView();
   glm::mat4 getProjection();
   float aspect;

headers/mesh.hpp

@@ -8,6 +8,7 @@
 class Mesh {
 public:
   Mesh(Shader *s, unsigned int VAO, int count);
+  Mesh(Shader *s, std::string path);
   ~Mesh();
   void draw(Camera *c);
   void setPosition(glm::vec3 p);

headers/obj.hpp

@@ -0,0 +1,4 @@
+#include <glm/glm.hpp>
+#include <vector>
+
+unsigned int loadOBJ(const char *path, std::vector<float> *out_vertices);

shaders/lighting/Frag.glsl

@@ -6,35 +6,43 @@ struct Material {
   float shininess;
 };
 
+
+struct Light {
+    vec3 position;
+    vec3 ambient;
+    vec3 diffuse;
+    vec3 specular;
+};
+
+
 out vec4 FragColor;
 
 in vec3 FragPos;
 in vec3 Normal;
 
 uniform vec3 ourColor;
-uniform vec3 lightColor;
-uniform vec3 lightPos;
 uniform vec3 viewPos;
 uniform Material material;
+uniform Light light;
 
 void main()
 {
   //misc
   vec3 norm = normalize(Normal);
-  vec3 lightDir = normalize(lightPos - FragPos);
+  vec3 lightDir = normalize(light.position - FragPos);
 
   // ambient
-  vec3 ambient = vec3(0.2) * (lightColor * material.ambient);
+  vec3 ambient = light.ambient * material.ambient;
 
   // diffuse
   float diff = max(dot(norm, lightDir), 0.0);
-  vec3 diffuse = lightColor * (diff * material.diffuse);
+  vec3 diffuse = light.diffuse * (diff * material.diffuse);
 
   // specular
   vec3 viewDir = normalize(viewPos - FragPos);
   vec3 reflectDir = reflect(-lightDir, norm);
   float spec = pow(max(dot(viewDir, reflectDir), 0.0), material.shininess);
-  vec3 specular = vec3(0.5) * (lightColor * (spec * material.specular));
+  vec3 specular = light.specular * (spec * material.specular);
 
   //out
   vec3 result = ambient + diffuse + specular;

src/camera.cpp

@@ -16,8 +16,28 @@ void Camera::setRotate(float yaw, float pitch) {
   update();
 }
 
+void Camera::addRotate(float yaw, float pitch) {
+  this->yaw += yaw;
+  this->pitch += pitch;
+  if (this->pitch > 89.0f)
+    this->pitch = 89.0f;
+  if (this->pitch < -89.0f)
+    this->pitch = -89.0f;
+  update();
+}
+
 void Camera::setPos(glm::vec3 pos) { this->pos = pos; }
 
+void Camera::addPos(glm::vec3 pos) { this->pos += pos; }
+
+void Camera::addFPos(glm::vec3 pos) {
+  glm::vec3 f = glm::normalize(glm::vec3(front.x, 0, front.z));
+  glm::vec3 r = glm::normalize(glm::cross(f, up));
+  this->pos += f * pos.x;
+  this->pos += up * pos.y;
+  this->pos += r * pos.z;
+}
+
 void Camera::update() {
   glm::vec3 direction;
   direction.x = cos(glm::radians(yaw)) * cos(glm::radians(pitch));
@@ -32,6 +52,8 @@ glm::mat4 Camera::getView() {
   return view;
 }
 
+glm::vec3 Camera::getPos() { return pos; }
+
 glm::mat4 Camera::getProjection() {
   return glm::perspective(glm::radians(fov), aspect, 0.1f, 100.0f);
 }

src/main.cpp

@@ -1,17 +1,20 @@
 #include "camera.hpp"
-#include <glad/glad.h> /*Must be before GLFW*/
+#include "glad/glad.h"
 #include <GLFW/glfw3.h>
 #include <cassert>
 #include <glm/glm.hpp>
 #include <mesh.hpp>
 #include <shader.hpp>
-#include <shapes.h>
 #include <texture.hpp>
 
 #define UNUSED(x) (void)(x)
 
-void processInput(GLFWwindow *window);
+glm::vec3 processInput(GLFWwindow *window);
 void framebuffer_size_callback(GLFWwindow *window, int width, int height);
+void mouse_callback(GLFWwindow *window, double xpos, double ypos);
+
+float deltaTime = 0;
+
 GLFWwindow *init() {
   glfwInit();
   glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
@@ -25,36 +28,27 @@ GLFWwindow *init() {
   int is_ok = 0;
   is_ok = gladLoadGLLoader((GLADloadproc)glfwGetProcAddress);
   assert(is_ok && "Failed to init glad");
+  glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_DISABLED);
 
   glViewport(0, 0, 800, 600);
   glfwSetFramebufferSizeCallback(window, framebuffer_size_callback);
+  glfwSetCursorPosCallback(window, mouse_callback);
   return window;
 }
 
-unsigned int meshInit() {
+void showFPS(GLFWwindow *window, double delta) {
-  unsigned int VBO, VAO;
+  char title[22];
-  glGenVertexArrays(1, &VAO);
+  title[21] = '\0';
-  glBindVertexArray(VAO);
+  snprintf(title, 20, "OpenGl FPS: [%3.2f]", (1 / delta));
-
+  glfwSetWindowTitle(window, title);
-  glGenBuffers(1, &VBO);
-  glBindBuffer(GL_ARRAY_BUFFER, VBO);
-  glBufferData(GL_ARRAY_BUFFER, sizeof(uvcube), uvcube, GL_STATIC_DRAW);
-
-  glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(float), (void *)0);
-  glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(float),
-                        (void *)(3 * sizeof(float)));
-  glEnableVertexAttribArray(0);
-  glEnableVertexAttribArray(1);
-  return VAO;
 }
 
 int main(void) {
   glm::vec3 lightPos = glm::vec3(1, 2.0f, 1);
-  glm::vec3 cameraPos = glm::vec3(2.3, 3, 5);
   glm::vec3 lightColor = glm::vec3(1);
 
   GLFWwindow *window = init();
-  Camera *cam = new Camera(cameraPos, -115.0f, -25.0f, 45, 800.0 / 600);
+  Camera *cam = new Camera(glm::vec3(0), 0, 0, 45, 800.0 / 600);
   glfwSetWindowUserPointer(window, cam);
 
   Shader *cubeShader = new Shader("./shaders/lighting/Vert.glsl",
@@ -62,9 +56,8 @@ int main(void) {
   Shader *lightShader = new Shader("./shaders/lighting/Vert.glsl",
                                    "./shaders/lighting/LightFrag.glsl");
 
-  uint VAO = meshInit();
+  Mesh *cube = new Mesh(cubeShader, "./cube.obj");
-  Mesh *cube = new Mesh(cubeShader, VAO, 36);
+  Mesh *light = new Mesh(lightShader, "./cube.obj");
-  Mesh *light = new Mesh(lightShader, VAO, 36);
   cube->setOwnedShader(true);
   light->setOwnedShader(true);
 
@@ -72,7 +65,13 @@ int main(void) {
   light->setScale(glm::vec3(.3));
 
   glEnable(GL_DEPTH_TEST);
+  float lastFrame = 0;
   while (!glfwWindowShouldClose(window)) {
+    float currentFrame = (float)glfwGetTime();
+    deltaTime = currentFrame - lastFrame;
+    lastFrame = currentFrame;
+    showFPS(window, deltaTime);
+
     glClearColor(0.2f, 0.3f, 0.3f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
@@ -81,14 +80,17 @@ int main(void) {
     s->setVec3("lightColor", lightColor);
     s->setVec3("ourColor", glm::vec3(0.24725, 0.1995, 0.0745));
     s->setVec3("lightPos", lightPos);
-    s->setVec3("viewPos", glm::vec3(0.0, 0.0, 5.0));
+    s->setVec3("viewPos", cam->getPos());
 
-    /*mat taken from*/
+    s->setVec3("light.ambient", glm::vec3(0.2));
-    /*http://devernay.free.fr/cours/opengl/materials.html*/
+    s->setVec3("light.diffuse", glm::vec3(0.5));
-    s->setVec3("material.ambient", glm::vec3(0.24725, 0.1995, 0.0745));
+    s->setVec3("light.specular", glm::vec3(1));
-    s->setVec3("material.diffuse", glm::vec3(0.75164, 0.60648, 0.22648));
+    s->setVec3("light.position", lightPos);
-    s->setVec3("material.specular", glm::vec3(0.628281, 0.555802, 0.366065));
+
-    s->setFloat("material.shininess", 0.4 * 128);
+    s->setVec3("material.ambient", glm::vec3(1.0, 0.5, 0.31));
+    s->setVec3("material.diffuse", glm::vec3(1.0, 0.5, 0.31));
+    s->setVec3("material.specular", glm::vec3(0.5));
+    s->setFloat("material.shininess", 32);
     cube->draw(cam);
 
     s = light->getShader();
@@ -98,7 +100,9 @@ int main(void) {
 
     glfwSwapBuffers(window);
     glfwPollEvents();
-    processInput(window);
+    glm::vec3 mov = processInput(window);
+    mov *= deltaTime;
+    cam->addFPos(mov);
   }
 
   delete cam;
@@ -108,9 +112,26 @@ int main(void) {
   return 0;
 }
 
-void processInput(GLFWwindow *window) {
+glm::vec3 processInput(GLFWwindow *window) {
+  glm::vec3 mov = glm::vec3(0);
   if (glfwGetKey(window, GLFW_KEY_ESCAPE) == GLFW_PRESS)
     glfwSetWindowShouldClose(window, true);
+
+  if (glfwGetKey(window, GLFW_KEY_W) == GLFW_PRESS)
+    mov += glm::vec3(1, 0, 0);
+  if (glfwGetKey(window, GLFW_KEY_S) == GLFW_PRESS)
+    mov -= glm::vec3(1, 0, 0);
+  if (glfwGetKey(window, GLFW_KEY_D) == GLFW_PRESS)
+    mov += glm::vec3(0, 0, 1);
+  if (glfwGetKey(window, GLFW_KEY_A) == GLFW_PRESS)
+    mov -= glm::vec3(0, 0, 1);
+  if (glfwGetKey(window, GLFW_KEY_Q) == GLFW_PRESS)
+    mov += glm::vec3(0, 1, 0);
+  if (glfwGetKey(window, GLFW_KEY_E) == GLFW_PRESS)
+    mov -= glm::vec3(0, 1, 0);
+
+  mov *= 5;
+  return mov;
 }
 
 void framebuffer_size_callback(GLFWwindow *window, int width, int height) {
@@ -120,3 +141,20 @@ void framebuffer_size_callback(GLFWwindow *window, int width, int height) {
   if (cam)
     cam->aspect = (float)width / height;
 }
+
+void mouse_callback(GLFWwindow *window, double xpos, double ypos) {
+  static float xprev = 0.0, yprev = 0.0;
+
+  float xchange = xpos - xprev;
+  float ychange = yprev - ypos;
+  xprev = xpos;
+  yprev = ypos;
+
+  float sensitivity = 0.1f;
+  xchange *= sensitivity;
+  ychange *= sensitivity;
+
+  Camera *cam = (Camera *)glfwGetWindowUserPointer(window);
+  if (cam)
+    cam->addRotate(xchange, ychange);
+}

src/mesh.cpp

@@ -1,16 +1,28 @@
 #include "camera.hpp"
+#include "obj.hpp"
 #include "shader.hpp"
 #include <mesh.hpp>
+#include <vector>
+
+unsigned int meshInit(std::string path, std::vector<float> &data);
 
 Mesh::Mesh(Shader *s, unsigned int VAO, int count)
     : buffersOwned(false), shaderOwned(false), count(count), VAO(VAO),
       shader(s), position(glm::vec3(0)), scale(glm::vec3(1)),
       rotation(glm::quat(1.0f, 0.0f, 0.0f, 0.0f)) {}
 
+Mesh::Mesh(Shader *s, std::string path)
+    : buffersOwned(true), shaderOwned(false), shader(s), position(glm::vec3(0)),
+      scale(glm::vec3(1)), rotation(glm::quat(1.0f, 0.0f, 0.0f, 0.0f)) {
+  std::vector<float> data;
+  VAO = meshInit(path, data);
+  count = data.size() / 8;
+}
+
 Mesh::~Mesh() {
   if (shaderOwned)
     delete shader;
-  if (buffersOwned){
+  if (buffersOwned) {
     glDeleteVertexArrays(1, &VAO);
     // TODO vbo, ibo
   }
@@ -18,7 +30,7 @@ Mesh::~Mesh() {
 
 void Mesh::draw(Camera *c) {
   glm::mat4 model = glm::mat4(1);
-
+  glBindVertexArray(VAO);
   shader->use();
   shader->setMat4("view", c->getView());
   shader->setMat4("projection", c->getProjection());
@@ -26,7 +38,7 @@ void Mesh::draw(Camera *c) {
   model = glm::scale(model, scale);
   model = model * glm::mat4_cast(rotation);
   shader->setMat4("model", model);
-  glDrawArrays(GL_TRIANGLES, 0, 36);
+  glDrawArrays(GL_TRIANGLES, 0, count);
 }
 
 void Mesh::setPosition(glm::vec3 p) { position = p; }
@@ -40,3 +52,27 @@ void Mesh::setOwnedBuffers(bool o) { buffersOwned = o; }
 void Mesh::setOwnedShader(bool o) { shaderOwned = o; }
 
 Shader *Mesh::getShader() { return shader; }
+
+unsigned int meshInit(std::string path, std::vector<float> &data) {
+  unsigned int VBO, VAO;
+  glGenVertexArrays(1, &VAO);
+  glBindVertexArray(VAO);
+
+  glGenBuffers(1, &VBO);
+  glBindBuffer(GL_ARRAY_BUFFER, VBO);
+
+  loadOBJ(path.c_str(), &data);
+  glBufferData(GL_ARRAY_BUFFER, data.size() * sizeof(float), data.data(),
+               GL_STATIC_DRAW);
+  glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 8 * sizeof(float), (void *)0);
+  glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 8 * sizeof(float),
+                        (void *)(3 * sizeof(float)));
+  glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, 8 * sizeof(float),
+                        (void *)(6 * sizeof(float)));
+
+  glEnableVertexAttribArray(0);
+  glEnableVertexAttribArray(1);
+  glEnableVertexAttribArray(2); // not in use
+  glBindVertexArray(0);
+  return VAO;
+}

src/obj.cpp

@@ -0,0 +1,66 @@
+#include "obj.hpp"
+#include <cassert>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
+
+/*this is ugly but works*/
+unsigned int loadOBJ(const char *path, std::vector<float> *out_vertices) {
+  std::vector<glm::vec3> verts, norms;
+  std::vector<glm::vec2> uvs;
+
+  FILE *file = fopen(path, "r");
+  assert(file && "file not found");
+
+  int tmp = 0;
+  while (1) {
+    char lineHeader[128];
+    int res = fscanf(file, "%s", lineHeader);
+    if (res == EOF)
+      break;
+    if (strcmp(lineHeader, "v") == 0) {
+      glm::vec3 vert;
+      tmp = fscanf(file, "%f %f %f\n", &vert.x, &vert.y, &vert.z);
+      assert(tmp == 3 && "bad vert");
+      verts.push_back(vert);
+    } else if (strcmp(lineHeader, "vt") == 0) {
+      glm::vec2 uv;
+      tmp = fscanf(file, "%f %f\n", &uv.x, &uv.y);
+      assert(tmp == 2 && "bad uv");
+      uvs.push_back(uv);
+    } else if (strcmp(lineHeader, "vn") == 0) {
+      glm::vec3 norm;
+      tmp = fscanf(file, "%f %f %f\n", &norm.x, &norm.y, &norm.z);
+      assert(tmp == 3 && "bad norm");
+      norms.push_back(norm);
+    } else if (strcmp(lineHeader, "f") == 0) {
+      unsigned int vIndex[3], uvIndex[3], nIndex[3];
+      tmp = fscanf(file, "%d/%d/%d %d/%d/%d %d/%d/%d\n", &vIndex[0],
+                   &uvIndex[0], &nIndex[0], &vIndex[1], &uvIndex[1], &nIndex[1],
+                   &vIndex[2], &uvIndex[2], &nIndex[2]);
+      assert(tmp == 9 && "bad face");
+
+      for (size_t i = 0; i < 3; ++i) {
+        size_t vi, ni, ui;
+        vi = (vIndex[i] - 1);
+        ni = (nIndex[i] - 1);
+        ui = (uvIndex[i] - 1);
+        assert(verts.size() > vi);
+        assert(norms.size() > ni);
+        assert(uvs.size() > ui);
+        auto vert = verts[vi];
+        auto norm = norms[ni];
+        auto uv = uvs[ui];
+        out_vertices->push_back(vert.x);
+        out_vertices->push_back(vert.y);
+        out_vertices->push_back(vert.z);
+        out_vertices->push_back(norm.x);
+        out_vertices->push_back(norm.y);
+        out_vertices->push_back(norm.z);
+        out_vertices->push_back(uv.x);
+        out_vertices->push_back(uv.y);
+      }
+    }
+  }
+  return verts.size();
+}