From fd38502e0745c50c99393c64d42cba57358387a4 Mon Sep 17 00:00:00 2001 From: Quaternions Date: Mon, 18 Sep 2023 21:28:09 -0700 Subject: [PATCH] only walk if grounded --- src/body.rs | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/body.rs b/src/body.rs index 6ec57d6a..28258d76 100644 --- a/src/body.rs +++ b/src/body.rs @@ -400,7 +400,7 @@ impl PhysicsState { fn next_walk_instruction(&self) -> Option> { //check if you have a valid walk state and create an instruction - if self.walk.body_hash==self.body.hash(){ + if self.grounded&&self.walk.body_hash==self.body.hash(){ Some(TimedInstruction{ time:self.walk.target_time, instruction:PhysicsInstruction::ReachWalkTargetVelocity @@ -754,16 +754,18 @@ impl crate::instruction::InstructionConsumer for PhysicsStat } PhysicsInstruction::SetWalkTargetVelocity(v) => { //calculate acceleration yada yada - let target_diff=v-self.body.velocity; - if target_diff==glam::Vec3::ZERO{ - self.body.acceleration=glam::Vec3::ZERO; - }else{ - let accel=self.walk_accel.min(self.gravity.length()*self.friction); - let time_delta=target_diff.length()/accel; - self.body.acceleration=target_diff/time_delta; - self.walk.target_velocity=v; - self.walk.target_time=self.body.time+((time_delta as f64)*1_000_000_000f64) as TIME; - self.walk.body_hash=self.body.hash();//hash check to see if walk target is valid + if self.grounded{ + let target_diff=v-self.body.velocity; + if target_diff==glam::Vec3::ZERO{ + self.body.acceleration=glam::Vec3::ZERO; + }else{ + let accel=self.walk_accel.min(self.gravity.length()*self.friction); + let time_delta=target_diff.length()/accel; + self.body.acceleration=target_diff/time_delta; + self.walk.target_velocity=v; + self.walk.target_time=self.body.time+((time_delta as f64)*1_000_000_000f64) as TIME; + self.walk.body_hash=self.body.hash();//hash check to see if walk target is valid + } } }, }