diff --git a/src/physics_worker.rs b/src/physics_worker.rs index 3c4a949..aa83bb9 100644 --- a/src/physics_worker.rs +++ b/src/physics_worker.rs @@ -1,4 +1,4 @@ -use crate::physics::{MouseState,PhysicsInputInstruction}; +use crate::physics::{MouseState,PhysicsInputInstruction, PhysicsState}; use strafesnet_common::integer::Time; use strafesnet_common::instruction::{TimedInstruction,InstructionConsumer}; use strafesnet_common::integer::{self,Planar64,Planar64Vec3,Planar64Mat3,Angle32,Ratio64,Ratio64Vec2}; @@ -24,36 +24,28 @@ pub enum Instruction{ ClearModels, //Graphics(crate::graphics_worker::Instruction), } - pub struct Speed{ pub player_vel:Planar64Vec3, - pub time:Time -} - -impl std::ops::Neg for Speed{ - type Output=Self; - fn neg(self)->Self::Output{ - Self{ - player_vel:self.player_vel, - time:self.time - } - } + pub time:Time, + pub start_time:Option<Time>, } impl Speed{ - pub fn new(player_vel:Planar64Vec3,time:Time)->Self{ + pub fn new(self,player_vel:Planar64Vec3,time:Time)->Self{ Self{ player_vel, time, + start_time:None, + } } } + pub fn new(mut physics:crate::physics::PhysicsState,mut graphics_worker:crate::compat_worker::INWorker<crate::graphics_worker::Instruction>)->crate::compat_worker::QNWorker<TimedInstruction<Instruction>>{ let mut mouse_blocking=true; let mut last_mouse_time=physics.next_mouse.time; let mut timeline=std::collections::VecDeque::new(); let mut next_velocity_print=std::time::Instant::now(); - let mut player_vel = physics.body.velocity.length(); crate::compat_worker::QNWorker::new(move |ins:TimedInstruction<Instruction>|{ if if let Some(phys_input)=match &ins.instruction{ Instruction::Input(input_instruction)=>match input_instruction{ @@ -138,10 +130,11 @@ impl Speed{ }); } //some random print stuff - if 3.0/5.0<next_velocity_print.elapsed().as_secs_f64(){ - next_velocity_print=next_velocity_print+std::time::Duration::from_secs_f64(1.0/30.0); - println!("velocity: {} u/s", (Planar64Vec3::new(physics.body.velocity.x(), Planar64::int(0), physics.body.velocity.z())).length()*(Planar64::int(130)/9)); - } + if 3.0/5.0<next_velocity_print.elapsed().as_secs_f64(){ + next_velocity_print=next_velocity_print+std::time::Duration::from_secs_f64(1.0/10.0); + println!("xz Velocity: {} u/s", (Planar64Vec3::new(physics.body.velocity.x(), Planar64::int(0), physics.body.velocity.z())).length()); + } + } match ins.instruction{ Instruction::Render=>{