blocksrey/strafe-client
1
Fork 0
forked from StrafesNET/strafe-client
Code Issues Pull Requests Packages Projects Releases Wiki Activity

put jump in style

Browse Source
This commit is contained in:
Quaternions 2023-10-14 14:51:13 -07:00
parent 0d6741a81c
commit 381b7b3c2f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/physics.rs
View File

@ -205,12 +205,13 @@ pub struct WorldState{}
pub struct StyleModifiers{ pub struct StyleModifiers{
pub controls_mask:u32,//controls which are unable to be activated pub controls_mask:u32,//controls which are unable to be activated
pub controls_held:u32,//controls which must be active to be able to strafe pub controls_held:u32,//controls which must be active to be able to strafe
pub strafe_tick_rate:Ratio64,
pub jump_time:Time,
pub mv:Planar64, pub mv:Planar64,
pub walkspeed:Planar64, pub walkspeed:Planar64,
pub friction:Planar64, pub friction:Planar64,
pub walk_accel:Planar64, pub walk_accel:Planar64,
pub gravity:Planar64Vec3, pub gravity:Planar64Vec3,
pub strafe_tick_rate:Ratio64,
pub hitbox_halfsize:Planar64Vec3, pub hitbox_halfsize:Planar64Vec3,
} }
impl std::default::Default for StyleModifiers{ impl std::default::Default for StyleModifiers{
@ -219,6 +220,7 @@ impl std::default::Default for StyleModifiers{
controls_mask: !0,//&!(Self::CONTROL_MOVEUP|Self::CONTROL_MOVEDOWN), controls_mask: !0,//&!(Self::CONTROL_MOVEUP|Self::CONTROL_MOVEDOWN),
controls_held: 0, controls_held: 0,
strafe_tick_rate:Ratio64::new(100,Time::ONE_SECOND.nanos() as u64).unwrap(), strafe_tick_rate:Ratio64::new(100,Time::ONE_SECOND.nanos() as u64).unwrap(),
jump_time: Time::from_nanos(715_588_000/2*100),//0.715588/2.0*100.0
gravity: Planar64Vec3::int(0,-100,0), gravity: Planar64Vec3::int(0,-100,0),
friction: Planar64::int(12)/10, friction: Planar64::int(12)/10,
walk_accel: Planar64::int(90), walk_accel: Planar64::int(90),
@ -275,6 +277,10 @@ impl StyleModifiers{
} }
return control_dir return control_dir
} }
fn get_jump_power(&self)->Planar64Vec3{
Planar64Vec3::int(0,715588,0)/(2*1000000/100)
}
} }
pub struct PhysicsState{ pub struct PhysicsState{
@ -643,7 +649,7 @@ impl PhysicsState {
} }
fn jump(&mut self){ fn jump(&mut self){
self.grounded=false;//do I need this? self.grounded=false;//do I need this?
let mut v=self.body.velocity+Planar64Vec3::int(0,715588,0)/(2*1000000/100);//0.715588/2.0*100.0 let mut v=self.body.velocity+self.style.get_jump_power();
self.contact_constrain_velocity(&mut v); self.contact_constrain_velocity(&mut v);
self.body.velocity=v; self.body.velocity=v;
} }