StrafesNET/strafe-client
5
Fork 4
Code Issues 2 Pull Requests 1 Packages Projects Releases 1 Wiki Activity

move function into struct impls

Browse Source
This commit is contained in:
Quaternions 2024-08-22 11:51:44 -07:00
parent f3314308ef
commit a916068d16
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/push_solve.rs
View File

@ -34,6 +34,10 @@ impl Contact{
fn relative_dot(&self,direction:Planar64Vec3)->Planar64{ fn relative_dot(&self,direction:Planar64Vec3)->Planar64{
(direction-self.velocity).dot(self.normal) (direction-self.velocity).dot(self.normal)
} }
/// Calculate the time of intersection. (previously get_touch_time)
fn solve(&self,ray:&Ray)->Planar64{
(self.position-ray.origin).dot(self.normal)/(ray.direction-self.velocity).dot(self.normal)
}
} }
//A reference to a Contact and its respective index, paired together //A reference to a Contact and its respective index, paired together
@ -288,9 +292,6 @@ fn get_best_push_ray_and_indices(
} }
} }
fn get_touch_time(ray:&Ray,c:&Contact)->Planar64{
(ray.origin-c.position).dot(c.normal)/(c.velocity-ray.direction).dot(c.normal)
}
fn get_first_touch(conts:&Vec<Contact>,ray:&Ray,indices:&Indices)->Option<(Planar64,usize)>{ fn get_first_touch(conts:&Vec<Contact>,ray:&Ray,indices:&Indices)->Option<(Planar64,usize)>{
conts.iter() conts.iter()
.enumerate() .enumerate()
@ -298,7 +299,7 @@ fn get_first_touch(conts:&Vec<Contact>,ray:&Ray,indices:&Indices)->Option<(Plana
!indices.contains(&i) !indices.contains(&i)
&&contact.relative_dot(ray.direction)< -EPSILON &&contact.relative_dot(ray.direction)< -EPSILON
) )
.map(|(i,contact)|(get_touch_time(ray,contact),i)) .map(|(i,contact)|(contact.solve(ray),i))
.min_by_key(|&(t,_)|t) .min_by_key(|&(t,_)|t)
} }