Add normals and texture coordinates to sphere, cylinder and bezier patches

include/generator/BezierPatch.hpp

@@ -33,8 +33,22 @@ class BezierPatch : public utils::WavefrontOBJ {
     float stringToFloat(std::string str);
     glm::vec3 stringToVector(const std::string &str);
     std::vector<int> stringToArray(const std::string &str);
-
     glm::mat4 preComputePatchMatrix(const std::vector<glm::vec3> &patchPoints, int coordinate);
+    glm::vec3 evaluateBezierSurface(const glm::mat4 &mx,
+                                    const glm::mat4 &my,
+                                    const glm::mat4 &mz,
+                                    float u,
+                                    float v);
+    glm::vec3 evaluateBezierSurfaceDu(const glm::mat4 &mx,
+                                      const glm::mat4 &my,
+                                      const glm::mat4 &mz,
+                                      float u,
+                                      float v);
+    glm::vec3 evaluateBezierSurfaceDv(const glm::mat4 &mx,
+                                      const glm::mat4 &my,
+                                      const glm::mat4 &mz,
+                                      float u,
+                                      float v);
 };
 
 }

include/generator/figures/Cylinder.hpp

@@ -20,7 +20,7 @@ namespace generator::figures {
 
 class Cylinder : public utils::WavefrontOBJ {
 public:
-    Cylinder(float radius, float height, int slices, int stacks);
+    Cylinder(float radius, float height, int slices, int stacks, bool multiTextured = false);
 };
 
 }

include/utils/WavefrontOBJ.hpp

@@ -50,9 +50,7 @@ class WavefrontOBJ {
                std::vector<uint32_t>> // Indices
         getIndexedVertices() const;
 
-    // TODO - Mariana, please make generateNormals private when Sphere.cpp doesn't need it anymore
-
-protected:
+private:
     void generateNormals();
 };