Ligthing working

src/main.cpp

@@ -2,7 +2,6 @@
 #include <glad/glad.h> /*Must be before GLFW*/
 #include <GLFW/glfw3.h>
 #include <cassert>
-#include <glm/ext/matrix_transform.hpp>
 #include <glm/glm.hpp>
 #include <mesh.hpp>
 #include <shader.hpp>
@@ -14,13 +13,6 @@
 void processInput(GLFWwindow *window);
 void framebuffer_size_callback(GLFWwindow *window, int width, int height);
 
-glm::vec3 cubePositions[] = {
-    glm::vec3(0.0f, 0.0f, 0.0f),    glm::vec3(2.0f, 5.0f, -15.0f),
-    glm::vec3(-1.5f, -2.2f, -2.5f), glm::vec3(-3.8f, -2.0f, -12.3f),
-    glm::vec3(2.4f, -0.4f, -3.5f),  glm::vec3(-1.7f, 3.0f, -7.5f),
-    glm::vec3(1.3f, -2.0f, -2.5f),  glm::vec3(1.5f, 2.0f, -2.5f),
-    glm::vec3(1.5f, 0.2f, -1.5f),   glm::vec3(-1.3f, 1.0f, -1.5f)};
-
 int main(void) {
   glfwInit();
   glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
@@ -44,58 +36,57 @@ int main(void) {
 
   glGenBuffers(1, &VBO);
   glBindBuffer(GL_ARRAY_BUFFER, VBO);
-  glBufferData(GL_ARRAY_BUFFER, sizeof(cube_vertices), cube_vertices,
-               GL_STATIC_DRAW);
+  glBufferData(GL_ARRAY_BUFFER, sizeof(uvcube), uvcube, GL_STATIC_DRAW);
 
-  glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 5 * sizeof(float), (void *)0);
-  glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 5 * sizeof(float),
+  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);
 
-  glEnableVertexAttribArray(0); /*pos*/
-  glEnableVertexAttribArray(1); /*tex_cord*/
+  Shader *cubeShader = new Shader("./shaders/lighting/Vert.glsl",
+                                  "./shaders/lighting/Frag.glsl");
+  Mesh *cube = new Mesh(cubeShader, VAO, 36);
 
-  Shader *shaderProgram = new Shader("./shaders/MVPTexNoRGBVert.glsl",
-                                     "./shaders/TexNoRGBFrag.glsl");
-
-  Mesh *mesh = new Mesh(shaderProgram, VAO, 36);
-  mesh->setOwned(true);
-
-  Texture *texture = new Texture(GL_TEXTURE_2D, "./texture/container.jpg");
-  Texture *texture2 = new Texture(GL_TEXTURE_2D, "./texture/brick.jpg");
+  Shader *lightShader = new Shader("./shaders/lighting/Vert.glsl",
+                                   "./shaders/lighting/LightFrag.glsl");
+  Mesh *light = new Mesh(lightShader, VAO, 36);
+  glm::vec3 lightPos = glm::vec3(1, 2.0f, 1);
+  light->setPosition(lightPos);
+  light->setScale(glm::vec3(.3));
 
   Camera *cam =
       new Camera(glm::vec3(0.0, 0.0, 5.0), -90.0f, 0.0f, 45.0, 800.0 / 600);
   glfwSetWindowUserPointer(window, cam);
 
+  glm::vec3 cPos = glm::vec3(2.3, 3, 5);
+  cam->setPos(cPos);
+  cam->setRotate(-90.0f - 25.0f, -25.0f);
+
+  glm::vec3 lightc = glm::vec3(1);
   glEnable(GL_DEPTH_TEST);
   while (!glfwWindowShouldClose(window)) {
-
     glClearColor(0.2f, 0.3f, 0.3f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-    texture->bind(GL_TEXTURE0);
-    texture2->bind(GL_TEXTURE1);
-    glActiveTexture(GL_TEXTURE0);
-    for (unsigned int i = 0; i < 10; i++) {
-      mesh->setPosition(cubePositions[i]);
-      mesh->getShader()->setInt("tex0", i % 2);
+    Shader *s = cube->getShader();
+    s->use();
+    s->setVec3("lightColor", lightc);
+    s->setVec3("ourColor", glm::vec3(1.0f, 0.5f, 0.31f));
+    s->setVec3("lightPos", lightPos);
+    s->setVec3("viewPos", glm::vec3(0.0, 0.0, 5.0));
+    cube->draw(cam);
 
-      glm::mat4 rotate = glm::mat4(1);
-      float angle = 20.0f * i;
-      rotate =
-          glm::rotate(rotate, glm::radians(angle), glm::vec3(1.0f, 0.3f, 0.5f));
-      rotate = glm::rotate(rotate, (float)glfwGetTime() * glm::radians(55.0f),
-                           glm::vec3(1.0f, 0.5f, 0.0f));
-      mesh->setRotation(glm::quat_cast(rotate));
-      mesh->draw(cam);
-    }
+    s = light->getShader();
+    s->use();
+    s->setVec3("ourColor", lightc);
+    light->draw(cam);
 
     glfwSwapBuffers(window);
     glfwPollEvents();
     processInput(window);
   }
 
-  delete (shaderProgram);
   glfwTerminate();
   return 0;
 }

src/shader.cpp

@@ -45,6 +45,11 @@ void Shader::setFloat(const std::string &name, float value) {
   glUniform1f(glGetUniformLocation(ID, name.c_str()), value);
 }
 
+void Shader::setVec3(const std::string &name, glm::vec3 value) {
+  glUniform3fv(glGetUniformLocation(ID, name.c_str()), 1,
+               glm::value_ptr(value));
+}
+
 void Shader::setMat4(const std::string &name, glm::mat4 value) {
   glUniformMatrix4fv(glGetUniformLocation(ID, name.c_str()), 1, GL_FALSE,
                      glm::value_ptr(value));