17-refactor-bug-fix/src/main.cpp

@@ -83,6 +83,7 @@ Scene setup() {
 
   components::Scene config = utils::load_scene_config("config.json");
   Scene scene(config);
+  scene.configure();
 
   return scene;
 }
@@ -90,7 +91,7 @@ Scene setup() {
 void update(GLFWwindow* window, Scene& scene) {
   glfwPollEvents();
   process_input(window, scene);
-  scene.update();
+  scene.updateDelta();
 }
 
 void render(GLFWwindow* window, Scene& scene) {

17-refactor-bug-fix/src/mesh.cpp

@@ -2,25 +2,22 @@
 #include "dbc.hpp"
 
 void Mesh::draw(Shader &shader) {
-  // CAN WE DO THIS LESS OFTEN OUTSIDE DRAWING?
-  apply_textures(shader);
-
   glBindVertexArray(VAO);
   glDrawElements(GL_TRIANGLES, indices.size(), GL_UNSIGNED_INT, 0);
   glBindVertexArray(0);
   glActiveTexture(GL_TEXTURE0);
 }
 
-void Mesh::apply_textures(const Shader& shader) {
+void Mesh::connect_shader(const Shader& shader) {
   for(unsigned int i = 0; i < textures.size(); i++) {
     Texture& texture = textures[i];
-
-    texture.uniform_id = glGetUniformLocation(shader.ID, texture.target.c_str());
     glActiveTexture(GL_TEXTURE0 + i);
 
     // move this to setup_mesh
     glUniform1i(texture.uniform_id, i);
     glBindTexture(GL_TEXTURE_2D, texture.id);
+
+    texture.uniform_id = glGetUniformLocation(shader.ID, texture.target.c_str());
   }
 }
 

17-refactor-bug-fix/src/mesh.hpp

@@ -68,5 +68,5 @@ struct Mesh {
 
   void draw(Shader &shader);
   void setup_mesh();
-  void apply_textures(const Shader& shader);
+  void connect_shader(const Shader& shader);
 };

17-refactor-bug-fix/src/model.cpp

@@ -209,3 +209,9 @@ void Model::load_material_textures(const aiScene *scene, std::vector<Texture>& t
     }
   }
 }
+
+void Model::connect_shader(const Shader& shader) {
+  for(auto& mesh : meshes) {
+    mesh.connect_shader(shader);
+  }
+}

17-refactor-bug-fix/src/model.hpp

@@ -39,4 +39,6 @@ struct Model {
   Mesh process_mesh(const aiScene *scene, aiMesh *mesh);
 
   void load_material_textures(const aiScene *scene, std::vector<Texture>& textures, aiMaterial *mat, aiTextureType type, std::string typeName);
+
+  void connect_shader(const Shader& shader);
 };

17-refactor-bug-fix/src/scene.cpp

@@ -2,12 +2,17 @@
 #include "dbc.hpp"
 #include <math.h>
 
-void Scene::update() {
+void Scene::updateDelta() {
   float currentFrame = glfwGetTime();
   deltaTime = currentFrame - lastFrame;
   lastFrame = currentFrame;
+}
 
-  camera.update(deltaTime);
+void Scene::configure() {
+  // REFACTOR: really this should be done somewhere else
+  for(auto& [name, model] : models) {
+    model.connect_shader(shader);
+  }
 }
 
 void Scene::draw_model(Model& scene_model, Material& material, glm::mat4& projection, glm::mat4& view, glm::vec3& position)
@@ -33,6 +38,8 @@ void Scene::render(GLFWwindow* window) {
   // time is used for fake 3d rotation
   float time = glfwGetTime();
 
+  camera.update(deltaTime);
+
   glm::mat4 view = camera.look_at();
   glm::mat4 projection = glm::mat4(1.0f);
 

17-refactor-bug-fix/src/scene.hpp

@@ -56,7 +56,8 @@ struct Scene {
     }
   }
 
-  void update();
+  void updateDelta();
+  void configure();
   void draw_model(Model& scene_model, Material& material, glm::mat4& projection, glm::mat4& view, glm::vec3& position);
   void render(GLFWwindow* window);
   void cleanup();