Compare commits

...

2 Commits

Author SHA1 Message Date
c9b06823e7 timer 2024-02-11 04:44:51 -08:00
c58ea36d28 print speed every 0.6s 2024-02-11 04:44:51 -08:00
2 changed files with 26 additions and 1 deletions

View File

@ -727,7 +727,7 @@ enum MoveState{
pub struct PhysicsState{
time:Time,
body:Body,
pub body:Body,
world:WorldState,//currently there is only one state the world can be in
game:GameMechanicsState,
style:StyleModifiers,
@ -744,6 +744,8 @@ pub struct PhysicsState{
//the spawn point is where you spawn when you load into the map.
//This is not the same as Reset which teleports you to Spawn0
spawn_point:Planar64Vec3,
//lmao lets go
start_time:Option<Time>,
}
#[derive(Clone,Default)]
pub struct PhysicsOutputState{
@ -1086,6 +1088,7 @@ impl Default for PhysicsState{
world:WorldState{},
game:GameMechanicsState::default(),
modes:Modes::default(),
start_time:None,
}
}
}
@ -1569,6 +1572,21 @@ impl instruction::InstructionConsumer<PhysicsInstruction> for PhysicsState {
set_acceleration(&mut self.body,&self.touching,&self.models,&self.style.mesh(),a);
},
(PhysicsCollisionAttributes::Intersect{intersecting: _,general},Collision::Intersect(intersect))=>{
//check for mapstart and set start time
let model_id=c.model_id();
let start_model_id=self.modes.get_mode(0).unwrap().start;
if model_id==start_model_id{
//object touched is a mapstart
println!("Start!");
self.start_time=Some(self.time);
}
//check for map finish and print end time
if general.zone.as_ref().is_some_and(|zone|zone.behaviour==crate::model::ZoneBehaviour::Finish){
if let Some(start_time)=self.start_time.take(){
println!("Finish! Time={}",self.time-start_time);
}
}
//I think that setting the velocity to 0 was preventing surface contacts from entering an infinite loop
self.touching.insert(c);
run_teleport_behaviour(&general.teleport_behaviour,&mut self.game,&self.models,&self.modes,&self.style,&mut self.touching,&mut self.body,model_id);

View File

@ -27,6 +27,7 @@ pub enum 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();
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{
@ -110,6 +111,12 @@ pub enum Instruction{
instruction:crate::physics::PhysicsInstruction::Input(instruction.instruction),
});
}
//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(3.0/5.0);
println!("speed={}",physics.body.velocity.length());
}
}
match ins.instruction{
Instruction::Render=>{