Compare commits

..

No commits in common. "5e6ebdf12574bd4f3676e6d4fa8762e0f737f328" and "f07d9f968ef0340e8da7d49a84f73bbceeae9ff3" have entirely different histories.

2 changed files with 23 additions and 17 deletions

View File

@ -45,7 +45,6 @@ pub struct Body{
pub acceleration:Planar64Vec3,//I64 where 2^32 = 1 u/s/s
pub time:Time,//nanoseconds x xxxxD!
}
impl std::ops::Neg for Body{
type Output=Self;
fn neg(self)->Self::Output{
@ -1178,7 +1177,7 @@ impl PhysicsState {
ordered_checkpoint_from_checkpoint_id:eshmep2,
});
}
// println!("Physics Objects: {}",self.models.models.len());
println!("Physics Objects: {}",self.models.models.len());
}
pub fn load_user_settings(&mut self,user_settings:&crate::settings::UserSettings){
@ -1361,7 +1360,7 @@ fn set_velocity_cull(body:&mut Body,touching:&mut TouchingState,models:&PhysicsM
let r=n.dot(v)<=Planar64::ZERO;
if !r{
culled=true;
// println!("set_velocity_cull contact={:?}",contact);
println!("set_velocity_cull contact={:?}",contact);
}
r
});

View File

@ -1,4 +1,4 @@
use crate::physics::{MouseState,PhysicsInputInstruction, PhysicsState};
use crate::physics::{MouseState,PhysicsInputInstruction};
use strafesnet_common::integer::Time;
use strafesnet_common::instruction::{TimedInstruction,InstructionConsumer};
use strafesnet_common::integer::{self,Planar64,Planar64Vec3,Planar64Mat3,Angle32,Ratio64,Ratio64Vec2};
@ -24,28 +24,36 @@ pub enum Instruction{
ClearModels,
//Graphics(crate::graphics_worker::Instruction),
}
pub struct Speed{
pub player_vel:Planar64Vec3,
pub time:Time,
pub start_time:Option<Time>,
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
}
}
}
impl Speed{
pub fn new(self,player_vel:Planar64Vec3,time:Time)->Self{
pub fn new(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{
@ -131,10 +139,9 @@ 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/10.0);
println!("xz Velocity: {} u/s", (Planar64Vec3::new(physics.body.velocity.x(), Planar64::int(0), physics.body.velocity.z())).length());
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));
}
}
match ins.instruction{
Instruction::Render=>{