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

write body extrapolation from time ratio using ridiculous trait bounds

Browse Source
This commit is contained in:
Quaternions 2024-09-16 12:07:42 -07:00
parent d6e15dea05
commit 215dfab8a9
1 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/physics.rs
View File

@ -836,6 +836,45 @@ impl Body{
let dt=time-self.time; let dt=time-self.time;
self.velocity+(self.acceleration*dt).map(|elem|elem.divide().fix_1()) self.velocity+(self.acceleration*dt).map(|elem|elem.divide().fix_1())
} }
pub fn extrapolated_position_ratio_dt<Num,Den,N1,D1,N2,N3,D2,N4,N5,N6,T1>(&self,dt:integer::Ratio<Num,Den>)->Planar64Vec3
where
// Why?
// All of this can be removed with const generics because the type can be specified as
// Ratio<Fixed<N,NF>,Fixed<D,DF>>
// which is known to implement all the necessary traits
Num:Copy,
Den:Copy+core::ops::Mul<i64,Output=D1>,
D1:Copy,
Num:core::ops::Mul<Planar64,Output=N1>,
Planar64:core::ops::Mul<D1,Output=N2>,
N1:core::ops::Add<N2,Output=N3>,
Num:core::ops::Mul<N3,Output=N4>,
Den:core::ops::Mul<D1,Output=D2>,
D2:Copy,
Planar64:core::ops::Mul<D2,Output=N5>,
N4:core::ops::Add<N5,Output=N6>,
N6:integer::Divide<D2,Output=T1>,
T1:integer::Fix<Planar64>,
{
// a*dt^2/2 + v*dt + p
// (a*dt/2+v)*dt+p
((self.acceleration.map(|elem|dt*elem/2)+self.velocity).map(|elem|dt.mul_ratio(elem))+self.position)
.map(|elem|elem.divide().fix())
}
pub fn extrapolated_velocity_ratio_dt<Num,Den,N1,N2,N3,T1>(&self,dt:integer::Ratio<Num,Den>)->Planar64Vec3
where
Num:Copy,
Den:Copy,
Num:core::ops::Mul<Planar64,Output=N1>,
Planar64:core::ops::Mul<Den,Output=N2>,
N1:core::ops::Add<N2,Output=N3>,
N3:integer::Divide<Den,Output=T1>,
T1:integer::Fix<Planar64>,
{
// a*dt + v
(self.acceleration.map(|elem|dt*elem)+self.velocity)
.map(|elem|elem.divide().fix())
}
pub fn advance_time(&mut self,time:Time){ pub fn advance_time(&mut self,time:Time){
self.position=self.extrapolated_position(time); self.position=self.extrapolated_position(time);
self.velocity=self.extrapolated_velocity(time); self.velocity=self.extrapolated_velocity(time);
@ -858,21 +897,21 @@ impl Body{
//v+a*t==0 //v+a*t==0
//goober code //goober code
if !self.acceleration.x.is_zero(){ if !self.acceleration.x.is_zero(){
let t=Time::from(-(self.velocity.x/self.acceleration.x).divide().fix_1()); let t=-self.velocity.x/self.acceleration.x;
if t0<t&&t<t1{ if t0.to_ratio().lt_ratio(t)&&t.lt_ratio(t1.to_ratio()){
aabb.grow(self.extrapolated_position(t)); aabb.grow(self.extrapolated_position_ratio_dt(t));
} }
} }
if !self.acceleration.y.is_zero(){ if !self.acceleration.y.is_zero(){
let t=Time::from(-(self.velocity.y/self.acceleration.y).divide().fix_1()); let t=-self.velocity.y/self.acceleration.y;
if t0<t&&t<t1{ if t0.to_ratio().lt_ratio(t)&&t.lt_ratio(t1.to_ratio()){
aabb.grow(self.extrapolated_position(t)); aabb.grow(self.extrapolated_position_ratio_dt(t));
} }
} }
if !self.acceleration.z.is_zero(){ if !self.acceleration.z.is_zero(){
let t=Time::from(-(self.velocity.z/self.acceleration.z).divide().fix_1()); let t=-self.velocity.z/self.acceleration.z;
if t0<t&&t<t1{ if t0.to_ratio().lt_ratio(t)&&t.lt_ratio(t1.to_ratio()){
aabb.grow(self.extrapolated_position(t)); aabb.grow(self.extrapolated_position_ratio_dt(t));
} }
} }
} }