From de5f28b4f706879d7cee1a29da3c29c99910b846 Mon Sep 17 00:00:00 2001 From: Raptorox <70806316+Raptorox@users.noreply.github.com> Date: Thu, 5 Jun 2025 17:55:35 +0200 Subject: [PATCH] update deps; tweak constants --- Cargo.lock | 8 ++-- src/link.rs | 33 ++++++++-------- src/main.rs | 103 ++++++++++++++++++++++++++++++++++-------------- src/particle.rs | 12 +++--- 4 files changed, 101 insertions(+), 55 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9a6ed36..df125b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,15 +10,15 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "bitflags" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" [[package]] name = "cc" -version = "1.2.20" +version = "1.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a" +checksum = "16595d3be041c03b09d08d0858631facccee9221e579704070e6e9e4915d3bc7" dependencies = [ "shlex", ] diff --git a/src/link.rs b/src/link.rs index 41c9962..fe34657 100644 --- a/src/link.rs +++ b/src/link.rs @@ -1,36 +1,35 @@ use crate::particle::Particle; -use std::rc::Rc; use std::cell::RefCell; +use std::rc::Rc; pub struct Link { p1: Rc>, p2: Rc>, - length: f32 + length: f32, } impl Link { pub fn new(p1: Rc>, p2: Rc>, length: f32) -> Self { - Link { - p1: p1, - p2: p2, - length: length - } + Link { p1, p2, length } } pub fn solve(&mut self) { let vec = self.p2.borrow().pos - self.p1.borrow().pos; - let vec_len = (vec.x*vec.x + vec.y*vec.y).sqrt(); - let vec_norm = vec/vec_len; + let vec_len = (vec.x * vec.x + vec.y * vec.y).sqrt(); - let max_stretch = 50.; - let clamped_len = vec_len.min(self.length + max_stretch); + if vec_len > self.length { + let vec_norm = vec / vec_len; - let displacement = clamped_len - vec_len; - let stiffness = 99.; - let vec_scaled = vec_norm * displacement * stiffness; + let max_stretch = 0.5; + let clamped_len = vec_len.min(self.length + max_stretch); - let damping = 0.98; - self.p1.borrow_mut().apply_force(-vec_scaled * damping); - self.p2.borrow_mut().apply_force(vec_scaled * damping); + let displacement = clamped_len - vec_len; + let stiffness = 999.; + let vec_scaled = vec_norm * displacement * stiffness; + + let damping = 0.99; + self.p1.borrow_mut().apply_force(-vec_scaled * damping); + self.p2.borrow_mut().apply_force(vec_scaled * damping); + } } } diff --git a/src/main.rs b/src/main.rs index c4ac27c..afee280 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,9 +1,9 @@ -use sfml::graphics::*; -use sfml::window::*; use sfml::SfResult; -use sfml::system::{Vector2f, Clock}; -use std::rc::Rc; +use sfml::graphics::*; +use sfml::system::{Clock, Vector2f}; +use sfml::window::*; use std::cell::RefCell; +use std::rc::Rc; mod particle; use particle::Particle; @@ -15,8 +15,8 @@ const GRAVITY: f32 = 100.; fn populate_particles(particles: &mut Vec>>, num: u32, cols: u32) { for i in 0..num { - let x_pos = 200. + 50. * (i % cols) as f32; - let y_pos = 100. + 50. * (i / cols) as f32; + let x_pos = 150. + 20. * (i % cols) as f32; + let y_pos = 80. + 20. * (i / cols) as f32; let immovable = i < cols; let particle = Particle::new(Vector2f::new(x_pos, y_pos), immovable); particles.push(Rc::new(RefCell::new(particle))); @@ -31,16 +31,41 @@ fn populate_circles(circles: &mut Vec, num: u32, rad: f32, pts: usi } } -fn populate_links(links: &mut Vec, particles: &Vec>>, num: u32) { - for i in 0..(num-1) { +/*fn populate_links(links: &mut Vec, particles: &[Rc>], num: u32) { + for i in 0..(num - 1) { let p1 = &particles[i as usize]; - let p2 = &particles[(i as usize)+1]; + let p2 = &particles[(i as usize) + 1]; //let vec = p2.borrow().pos - p1.borrow().pos; //let dist = (vec.x*vec.x + vec.y*vec.y).sqrt(); let link = Link::new(Rc::clone(p1), Rc::clone(p2), 100.); links.push(link); } +}*/ + +fn populate_links( + links: &mut Vec, + particles: &[Rc>], + width: usize, + height: usize, +) { + for y in 0..height { + for x in 0..width { + let i = y * width + x; + + if x < width - 1 { + let right = i + 1; + let link = Link::new(Rc::clone(&particles[i]), Rc::clone(&particles[right]), 20.); + links.push(link); + } + + if y < height - 1 { + let below = i + width; + let link = Link::new(Rc::clone(&particles[i]), Rc::clone(&particles[below]), 20.); + links.push(link); + } + } + } } /*fn populate_lines(lines: &mut Vec, circles: &Vec, num: u32) { @@ -53,25 +78,31 @@ fn apply_forces(particles: &Vec>>) { for particle in particles { let mut borrowed = particle.borrow_mut(); borrowed.apply_force(Vector2f::new(0., GRAVITY)); - } } fn update_particles(particles: &Vec>>, dt: f32) { - for particle in particles { particle.borrow_mut().update(dt); } + for particle in particles { + particle.borrow_mut().update(dt); + } } fn solve_links(links: &mut Vec) { - for link in links { link.solve(); } + for link in links { + link.solve(); + } } -fn update_positions(circles: &mut Vec, particles: &Vec>>) { +fn update_positions(circles: &mut Vec, particles: &[Rc>]) { for (index, circle) in circles.iter_mut().enumerate() { circle.set_position(particles[index].borrow().pos); } } -fn draw_all(window: &mut RenderWindow, circles: &Vec, /* lines: &Vec */) { +fn draw_all( + window: &mut RenderWindow, + circles: &Vec, /* lines: &Vec */ +) { for circle in circles { window.draw(circle); } @@ -82,27 +113,31 @@ fn draw_all(window: &mut RenderWindow, circles: &Vec, /* lines: &Ve } fn main() -> SfResult<()> { - let mut window = RenderWindow::new( - (800, 600), - "Verlet", - Style::CLOSE, - &Default::default() - )?; + let mut window = RenderWindow::new((800, 600), "Verlet", Style::CLOSE, &Default::default())?; window.set_framerate_limit(60); let mut clock = Clock::start()?; - let particle_count: u32 = 60; - let column_count: u32 = 10; + let mouse_pos_prev = window.mouse_position(); + let mut mouse_coords_prev = window.map_pixel_to_coords_current_view(mouse_pos_prev); + + let particle_count: u32 = 600; + let column_count: u32 = 30; + let row_count: u32 = particle_count / column_count; let mut particles: Vec>> = vec![]; populate_particles(&mut particles, particle_count, column_count); let mut links: Vec = vec![]; - populate_links(&mut links, &particles, particle_count); + populate_links( + &mut links, + &particles, + column_count as usize, + row_count as usize, + ); // let mut link3 = Link::new(Rc::clone(&(particles[0])), Rc::clone(&(particles[2])), 200.); - let radius: f32 = 32.; + let radius: f32 = 8.; let point_count: usize = 100; let mut circles: Vec = vec![]; populate_circles(&mut circles, particle_count, radius, point_count); @@ -112,17 +147,27 @@ fn main() -> SfResult<()> { while window.is_open() { while let Some(event) = window.poll_event() { + #[allow(clippy::single_match)] match event { Event::Closed => window.close(), _ => {} } } + let mouse_pos = window.mouse_position(); + let mouse_coords = window.map_pixel_to_coords_current_view(mouse_pos); + let mouse_vel = mouse_coords - mouse_coords_prev; + mouse_coords_prev = mouse_coords; + if mouse::Button::is_pressed(mouse::Button::Left) { - let mouse_pos = window.mouse_position(); - let mouse_coords = window.map_pixel_to_coords_current_view(mouse_pos); - let p_pos = particles[10].borrow().pos; - particles[10].borrow_mut().apply_force((mouse_coords - p_pos)*4.); + for particle in &particles { + let p_pos = particle.borrow().pos; + let dist_vec = mouse_coords - p_pos; + let dist = (dist_vec.x * dist_vec.x + dist_vec.y * dist_vec.y).sqrt(); + if dist < 20. { + particle.borrow_mut().apply_force(mouse_vel * 128.); + } + } } let dt = clock.restart().as_seconds(); @@ -137,7 +182,7 @@ fn main() -> SfResult<()> { update_positions(&mut circles, &particles); window.clear(Color::BLACK); - draw_all(&mut window, &circles, /* &lines */); + draw_all(&mut window, &circles /* &lines */); window.display(); } diff --git a/src/particle.rs b/src/particle.rs index 6ad602f..f82c886 100644 --- a/src/particle.rs +++ b/src/particle.rs @@ -5,26 +5,28 @@ pub struct Particle { prev_pos: Vector2f, accel: Vector2f, - immovable: bool + immovable: bool, } impl Particle { pub fn new(pos: Vector2f, immovable: bool) -> Self { Particle { - pos: pos, + pos, prev_pos: pos, accel: Vector2f::default(), - immovable: immovable + immovable, } } pub fn apply_force(&mut self, force: Vector2f) { + if self.immovable { + return; + } self.accel += force; } pub fn update(&mut self, dt: f32) { - if self.immovable { return; } let damping = 0.99; let vel = (self.pos - self.prev_pos) * damping; let new_pos = self.pos + vel + self.accel * (dt * dt); @@ -33,4 +35,4 @@ impl Particle { self.pos = new_pos; self.accel = Vector2f::default(); } -} \ No newline at end of file +}