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

holy

Browse Source
This commit is contained in:
Quaternions 2024-07-30 19:07:24 -07:00
parent 9646804dcd
commit 0b8a433640
1 changed files with 58 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/physics_worker.rs
View File

@ -31,31 +31,71 @@ pub struct MouseInterpolator{
} }
impl MouseInterpolator{ impl MouseInterpolator{
fn handle_instruction(&mut self,physics:&mut crate::physics::PhysicsContext,ins:TimedInstruction<InputInstruction>){ fn handle_instruction(&mut self,physics:&mut crate::physics::PhysicsContext,ins:TimedInstruction<InputInstruction>){
let is_inserting_mouse_instruction=matches!(ins.instruction,InputInstruction::MoveMouse(_));
self.queue.push_back(ins); self.queue.push_back(ins);
//We just pushed an element. //We just pushed an element.
//The first element is guaranteed to exist. //The first element is guaranteed to exist.
let t0=self.queue[0].time;
let mut iter=self.queue.iter(); let mut iter=self.queue.iter();
//find a mouse input //find a mouse input
let mut mouse0=None; 'outer: loop{
iter.take_while(|&ins|{ match iter.next(){
match ins.instruction{ Some(ins0)=>{
InputInstruction::MoveMouse(m)=>{ let physics_input=match &ins0.instruction{
mouse0=Some(m); InputInstruction::MoveMouse(mouse0)=>{
false loop{
match iter.next(){
Some(ins1)=>match ins1.instruction{
InputInstruction::MoveMouse(mouse1)=>{
//we found two mouse events to interpolate between
let consume_count=self.queue.len()-iter.len()-1;//don't consume the mouse1 instruction
//fire off a mouse instruction
//drain and handle the elements from the front
break 'outer;
}, },
_=>{ _=>{
//TODO: 10ms<ins.time-time break and do something else //TODO: 10ms<ins.time-time break and do something else
true
}, },
} },
None=>{
if is_inserting_mouse_instruction{
//the mouse started moving again after being still for over 10ms.
//replace the entire mouse state
physics.run_input_instruction(TimedInstruction{
time:physics.get_next_mouse().time,
instruction:PhysicsInputInstruction::ReplaceMouse(
physics.get_next_mouse().clone(),
MouseState{time:ins0.time,pos:*mouse0}
),
}); });
if mouse0.is_none(){
return;
} }
let mut mouse1=None; break 'outer;
for ins in iter{ }
//fill mouse0 }
}
},
&InputInstruction::MoveForward(s)=>PhysicsInputInstruction::SetMoveForward(s),
&InputInstruction::MoveLeft(s)=>PhysicsInputInstruction::SetMoveLeft(s),
&InputInstruction::MoveBack(s)=>PhysicsInputInstruction::SetMoveBack(s),
&InputInstruction::MoveRight(s)=>PhysicsInputInstruction::SetMoveRight(s),
&InputInstruction::MoveUp(s)=>PhysicsInputInstruction::SetMoveUp(s),
&InputInstruction::MoveDown(s)=>PhysicsInputInstruction::SetMoveDown(s),
&InputInstruction::Jump(s)=>PhysicsInputInstruction::SetJump(s),
&InputInstruction::Zoom(s)=>PhysicsInputInstruction::SetZoom(s),
InputInstruction::Reset=>PhysicsInputInstruction::Reset,
InputInstruction::PracticeFly=>PhysicsInputInstruction::PracticeFly,
};
//handle each event immediately, we are not waiting for mouse
physics.run_input_instruction(TimedInstruction{
time:ins0.time,
instruction:physics_input,
});
},
None=>{
//if mouse0 is never found and the loop ends, we can drain the entire queue
//because we are not waiting for mouse events.
break 'outer;
}
}
} }
} }
} }