Minor refactoring

xorz57 · Jan 30, 2024 · 7319d7d · 7319d7d
1 parent be80353
commit 7319d7d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/include/Cloth.hpp b/include/Cloth.hpp
@@ -4,4 +4,9 @@
 
 struct Cloth : SoftBody {
     Cloth(const glm::vec2 &position, unsigned int rows, unsigned int cols, float padding);
+
+    float particleMass{1.0f};
+    float particleRadius{1.0f};
+    float springConstant{100.0f};
+    float dampingConstant{2.0f};
 };
diff --git a/src/Application.cpp b/src/Application.cpp
@@ -21,8 +21,8 @@ Application::Application() {
 }
 
 void Application::Run() {
-    const unsigned int rows = 32u;
-    const unsigned int cols = 32u;
+    const unsigned int rows = 16u;
+    const unsigned int cols = 16u;
     const float padding = 8.0f;
     const glm::vec2 position = 0.5f * glm::vec2(mMode.width, mMode.height) - 0.5f * padding * glm::vec2(cols - 1, rows - 1);
     mSoftBodies.emplace_back(Cloth(position, rows, cols, padding));
@@ -89,9 +89,6 @@ void Application::Run() {
                 }
             }
             mWindow.draw(clothSurface);
-        }
-
-        for (const SoftBody &softBody: mSoftBodies) {
             for (const Spring &spring: softBody.springs) {
                 sf::VertexArray line(sf::Lines, 2);
                 line[0].position.x = spring.mParticle1.position.x;

diff --git a/src/Cloth.cpp b/src/Cloth.cpp
@@ -4,7 +4,7 @@ Cloth::Cloth(const glm::vec2 &position, unsigned int rows, unsigned int cols, fl
     for (unsigned int row = 0; row < rows; ++row) {
         for (unsigned int col = 0; col < cols; ++col) {
             const bool pinned = (row == 0) ? true : false;
-            particles.emplace_back(position + padding * glm::vec2(col, row), 1.0f, 2.0f, pinned);
+            particles.emplace_back(position + padding * glm::vec2(col, row), particleMass, particleRadius, pinned);
         }
     }
 
@@ -18,12 +18,12 @@ Cloth::Cloth(const glm::vec2 &position, unsigned int rows, unsigned int cols, fl
             if (col < cols - 1) {
                 Particle &particle1 = particles[row * cols + col];
                 Particle &particle2 = particles[row * cols + col + 1];
-                springs.emplace_back(particle1, particle2, distance(particle1, particle2), 256.0f, 2.0f);
+                springs.emplace_back(particle1, particle2, distance(particle1, particle2), springConstant, dampingConstant);
             }
             if (row < rows - 1) {
                 Particle &particle1 = particles[row * cols + col];
                 Particle &particle2 = particles[(row + 1) * cols + col];
-                springs.emplace_back(particle1, particle2, distance(particle1, particle2), 256.0f, 2.0f);
+                springs.emplace_back(particle1, particle2, distance(particle1, particle2), springConstant, dampingConstant);
             }
         }
     }