fix: torus texture coordinates

JulioJPinto · May 26, 2024 · 9611197 · 9611197
1 parent 3fb8751
commit 9611197
Show file tree

Hide file tree

Showing 6 changed files with 624 additions and 13 deletions.
diff --git a/engine/include/light.hpp b/engine/include/light.hpp
@@ -27,7 +27,7 @@ Light createPointLight(glm::vec4 position);
 
 Light createSpotLight(glm::vec4 position, glm::vec4 direction, float cutoff);
 
-void setupLights(std::vector<Light> lights);
+bool setupLights(std::vector<Light> lights);
 
 void drawLights(std::vector<Light> lights);
 

diff --git a/engine/src/light.cpp b/engine/src/light.cpp
@@ -45,7 +45,7 @@ void setupMaterial(Material m) {
   glMaterialf(GL_FRONT, GL_SHININESS, m.shininess);
 }
 
-void setupLights(std::vector<Light> lights) {
+bool setupLights(std::vector<Light> lights) {
   if (lights.size() != 0) {
     glEnable(GL_RESCALE_NORMAL);
     float amb[4] = {1.0f, 1.0f, 1.0f, 1.0f};
@@ -59,7 +59,10 @@ void setupLights(std::vector<Light> lights) {
       glLightfv(GL_LIGHT0 + i, GL_DIFFUSE, white);
       glLightfv(GL_LIGHT0 + i, GL_SPECULAR, white);
     }
+    return true;
   }
+
+  return false;
 }
 
 void drawLights(std::vector<Light> lights) {

diff --git a/engine/src/main.cpp b/engine/src/main.cpp
@@ -27,6 +27,7 @@ bool axis = true;
 bool wireframe = false;
 bool normals = false;
 bool culling = false;
+bool lighting = false;
 
 int timebase;
 float frames;
@@ -105,6 +106,7 @@ void renderMenu() {
       ImGui::Checkbox("Wireframe", &wireframe);
       ImGui::Checkbox("Normals", &normals);
       ImGui::Checkbox("Frustsum", &culling);
+      ImGui::Checkbox("Lighting", &lighting);
       ImGui::Button("Reset", ImVec2(50, 20));
       if (ImGui::IsItemClicked()) {
         resetCamera();
@@ -157,12 +159,11 @@ void renderScene(void) {
   fillMode();
   drawAxis();
 
-  bool lights = c.lights.size() != 0;
-  if (lights) {
+  if (lighting) {
     drawLights(c.lights);
   }
 
-  c.group.drawGroup(lights, frustsum, normals);
+  c.group.drawGroup(lighting, frustsum, normals);
 
   // Start the Dear ImGui frame
   renderMenu();
@@ -250,7 +251,7 @@ int main(int argc, char** argv) {
   glEnable(GL_DEPTH_TEST);
   glEnable(GL_CULL_FACE);
   glEnable(GL_TEXTURE_2D);
-  setupLights(c.lights);
+  lighting = setupLights(c.lights);
   setupModels(c.group);
 
   // enter GLUT�s main cycle

diff --git a/generator/src/shapes/torus.cpp b/generator/src/shapes/torus.cpp
@@ -79,10 +79,10 @@ torusAllPoints(float majorRadius, float minorRadius, int sides, int rings) {
       normals.push_back(n3);
 
       // Texture coordinates
-      float u1 = static_cast<float>(i) / static_cast<float>(rings);
-      float u2 = static_cast<float>(i + 1) / static_cast<float>(rings);
-      float v1 = static_cast<float>(j) / static_cast<float>(sides);
-      float v2 = static_cast<float>(j + 1) / static_cast<float>(sides);
+      float u1 = static_cast<float>(j) / static_cast<float>(sides);
+      float u2 = static_cast<float>(j + 1) / static_cast<float>(sides);
+      float v1 = static_cast<float>(i) / static_cast<float>(rings);
+      float v2 = static_cast<float>(i + 1) / static_cast<float>(rings);
 
       textures.push_back(Point2D(u1, v1));
       textures.push_back(Point2D(u2, v1));
@@ -111,4 +111,4 @@ bool generateTorus(float majorRadius, float minorRadius, int sides, int rings,
   }
 
   return true;
-}
+}