From 8da101b43a998112d183cf3a0a752d290410bce5 Mon Sep 17 00:00:00 2001
From: eug-vs <eugene@eug-vs.xyz>
Date: Thu, 12 Dec 2024 18:18:54 +0100
Subject: feat: represent forces as objects

---
 src/main.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index 718abf8..58e649f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,6 @@
 use std::path::PathBuf;
 
+use force::{drag::Drag, gravity::Gravity};
 use particle_system::{Particle, ParticleSystem, Point, Vector};
 use ppm::PPM;
 use solver::Solver;
@@ -8,6 +9,7 @@ mod constraint;
 mod particle_system;
 mod ppm;
 mod solver;
+mod force;
 
 fn main() {
     let ppm = PPM {
@@ -25,6 +27,12 @@ fn main() {
             Particle::new(Point::new(5.0, 20.0), 50.0),
         ],
         constraints: vec![],
+        forces: vec![
+            Box::new(Gravity {
+                vector: Vector::y() * -9.8,
+            }),
+            Box::new(Drag { coefficient: 0.0 }),
+        ],
         t: 0.0,
     };
 
@@ -34,15 +42,8 @@ fn main() {
     system.add_beam_constraint([1, 3]);
     system.add_beam_constraint([2, 3]);
 
-    let gravity = -9.8 * Vector::y();
-
     for i in 0..150_00 {
-        for particle in &mut system.particles {
-            particle.reset_force();
-            // Apply custom forces
-            particle.apply_force(gravity * particle.mass);
-        }
-        system.particles[0].apply_force(gravity); // Extra force on particle 0
+        system.apply_forces();
 
         if i % 10 == 0 {
             println!("Iteration #{i}");
-- 
cgit v1.2.3