|
|
|
|
@@ -291,7 +291,7 @@ enum JumpImpulse{
|
|
|
|
|
struct StyleModifiers{
|
|
|
|
|
controls_mask:u32,//controls which are unable to be activated
|
|
|
|
|
controls_held:u32,//controls which must be active to be able to strafe
|
|
|
|
|
strafe_tick_rate:Option<Ratio64>,
|
|
|
|
|
strafe_tick_rate:Ratio64,
|
|
|
|
|
jump_impulse:JumpImpulse,
|
|
|
|
|
jump_calculation:JumpCalculation,
|
|
|
|
|
static_friction:Planar64,
|
|
|
|
|
@@ -305,7 +305,6 @@ struct StyleModifiers{
|
|
|
|
|
mass:Planar64,
|
|
|
|
|
mv:Planar64,
|
|
|
|
|
air_accel_limit:Option<Planar64>,
|
|
|
|
|
rocket_force:Option<Planar64>,
|
|
|
|
|
gravity:Planar64Vec3,
|
|
|
|
|
hitbox_halfsize:Planar64Vec3,
|
|
|
|
|
}
|
|
|
|
|
@@ -332,7 +331,7 @@ impl StyleModifiers{
|
|
|
|
|
Self{
|
|
|
|
|
controls_mask:!0,//&!(Self::CONTROL_MOVEUP|Self::CONTROL_MOVEDOWN),
|
|
|
|
|
controls_held:0,
|
|
|
|
|
strafe_tick_rate:Some(Ratio64::new(128,Time::ONE_SECOND.nanos() as u64).unwrap()),
|
|
|
|
|
strafe_tick_rate:Ratio64::new(128,Time::ONE_SECOND.nanos() as u64).unwrap(),
|
|
|
|
|
jump_impulse:JumpImpulse::FromEnergy(Planar64::int(512)),
|
|
|
|
|
jump_calculation:JumpCalculation::Energy,
|
|
|
|
|
gravity:Planar64Vec3::int(0,-80,0),
|
|
|
|
|
@@ -341,7 +340,6 @@ impl StyleModifiers{
|
|
|
|
|
mass:Planar64::int(1),
|
|
|
|
|
mv:Planar64::int(2),
|
|
|
|
|
air_accel_limit:None,
|
|
|
|
|
rocket_force:None,
|
|
|
|
|
walk_speed:Planar64::int(16),
|
|
|
|
|
walk_accel:Planar64::int(80),
|
|
|
|
|
ladder_speed:Planar64::int(16),
|
|
|
|
|
@@ -356,7 +354,7 @@ impl StyleModifiers{
|
|
|
|
|
Self{
|
|
|
|
|
controls_mask:!0,//&!(Self::CONTROL_MOVEUP|Self::CONTROL_MOVEDOWN),
|
|
|
|
|
controls_held:0,
|
|
|
|
|
strafe_tick_rate:Some(Ratio64::new(100,Time::ONE_SECOND.nanos() as u64).unwrap()),
|
|
|
|
|
strafe_tick_rate:Ratio64::new(100,Time::ONE_SECOND.nanos() as u64).unwrap(),
|
|
|
|
|
jump_impulse:JumpImpulse::FromTime(Time::from_micros(715_588)),
|
|
|
|
|
jump_calculation:JumpCalculation::Capped,
|
|
|
|
|
gravity:Planar64Vec3::int(0,-100,0),
|
|
|
|
|
@@ -365,7 +363,6 @@ impl StyleModifiers{
|
|
|
|
|
mass:Planar64::int(1),
|
|
|
|
|
mv:Planar64::int(27)/10,
|
|
|
|
|
air_accel_limit:None,
|
|
|
|
|
rocket_force:None,
|
|
|
|
|
walk_speed:Planar64::int(18),
|
|
|
|
|
walk_accel:Planar64::int(90),
|
|
|
|
|
ladder_speed:Planar64::int(18),
|
|
|
|
|
@@ -379,7 +376,7 @@ impl StyleModifiers{
|
|
|
|
|
Self{
|
|
|
|
|
controls_mask:!0,//&!(Self::CONTROL_MOVEUP|Self::CONTROL_MOVEDOWN),
|
|
|
|
|
controls_held:0,
|
|
|
|
|
strafe_tick_rate:Some(Ratio64::new(100,Time::ONE_SECOND.nanos() as u64).unwrap()),
|
|
|
|
|
strafe_tick_rate:Ratio64::new(100,Time::ONE_SECOND.nanos() as u64).unwrap(),
|
|
|
|
|
jump_impulse:JumpImpulse::FromTime(Time::from_micros(715_588)),
|
|
|
|
|
jump_calculation:JumpCalculation::Capped,
|
|
|
|
|
gravity:Planar64Vec3::int(0,-50,0),
|
|
|
|
|
@@ -388,7 +385,6 @@ impl StyleModifiers{
|
|
|
|
|
mass:Planar64::int(1),
|
|
|
|
|
mv:Planar64::int(27)/10,
|
|
|
|
|
air_accel_limit:None,
|
|
|
|
|
rocket_force:None,
|
|
|
|
|
walk_speed:Planar64::int(18),
|
|
|
|
|
walk_accel:Planar64::int(90),
|
|
|
|
|
ladder_speed:Planar64::int(18),
|
|
|
|
|
@@ -404,7 +400,7 @@ impl StyleModifiers{
|
|
|
|
|
Self{
|
|
|
|
|
controls_mask:!0,//&!(Self::CONTROL_MOVEUP|Self::CONTROL_MOVEDOWN),
|
|
|
|
|
controls_held:0,
|
|
|
|
|
strafe_tick_rate:Some(Ratio64::new(100,Time::ONE_SECOND.nanos() as u64).unwrap()),
|
|
|
|
|
strafe_tick_rate:Ratio64::new(100,Time::ONE_SECOND.nanos() as u64).unwrap(),
|
|
|
|
|
jump_impulse:JumpImpulse::FromHeight(Planar64::raw(52<<28)),
|
|
|
|
|
jump_calculation:JumpCalculation::Linear,
|
|
|
|
|
gravity:Planar64Vec3::raw(0,-800<<28,0),
|
|
|
|
|
@@ -413,7 +409,6 @@ impl StyleModifiers{
|
|
|
|
|
mass:Planar64::int(1),
|
|
|
|
|
mv:Planar64::raw(30<<28),
|
|
|
|
|
air_accel_limit:Some(Planar64::raw(150<<28)*66),
|
|
|
|
|
rocket_force:None,
|
|
|
|
|
walk_speed:Planar64::int(18),//?
|
|
|
|
|
walk_accel:Planar64::int(90),//?
|
|
|
|
|
ladder_speed:Planar64::int(18),//?
|
|
|
|
|
@@ -428,7 +423,7 @@ impl StyleModifiers{
|
|
|
|
|
Self{
|
|
|
|
|
controls_mask:!0,//&!(Self::CONTROL_MOVEUP|Self::CONTROL_MOVEDOWN),
|
|
|
|
|
controls_held:0,
|
|
|
|
|
strafe_tick_rate:Some(Ratio64::new(66,Time::ONE_SECOND.nanos() as u64).unwrap()),
|
|
|
|
|
strafe_tick_rate:Ratio64::new(66,Time::ONE_SECOND.nanos() as u64).unwrap(),
|
|
|
|
|
jump_impulse:JumpImpulse::FromHeight(Planar64::raw(52<<28)),
|
|
|
|
|
jump_calculation:JumpCalculation::Linear,
|
|
|
|
|
gravity:Planar64Vec3::raw(0,-800<<28,0),
|
|
|
|
|
@@ -437,7 +432,6 @@ impl StyleModifiers{
|
|
|
|
|
mass:Planar64::int(1),
|
|
|
|
|
mv:Planar64::raw(30<<28),
|
|
|
|
|
air_accel_limit:Some(Planar64::raw(150<<28)*66),
|
|
|
|
|
rocket_force:None,
|
|
|
|
|
walk_speed:Planar64::int(18),//?
|
|
|
|
|
walk_accel:Planar64::int(90),//?
|
|
|
|
|
ladder_speed:Planar64::int(18),//?
|
|
|
|
|
@@ -447,29 +441,6 @@ impl StyleModifiers{
|
|
|
|
|
hitbox_halfsize:Planar64Vec3::raw(33<<28,73<<28,33<<28)/2,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
fn roblox_rocket()->Self{
|
|
|
|
|
Self{
|
|
|
|
|
controls_mask:!0,//&!(Self::CONTROL_MOVEUP|Self::CONTROL_MOVEDOWN),
|
|
|
|
|
controls_held:0,
|
|
|
|
|
strafe_tick_rate:None,
|
|
|
|
|
jump_impulse:JumpImpulse::FromTime(Time::from_micros(715_588)),
|
|
|
|
|
jump_calculation:JumpCalculation::Capped,
|
|
|
|
|
gravity:Planar64Vec3::int(0,-100,0),
|
|
|
|
|
static_friction:Planar64::int(2),
|
|
|
|
|
kinetic_friction:Planar64::int(3),//unrealistic: kinetic friction is typically lower than static
|
|
|
|
|
mass:Planar64::int(1),
|
|
|
|
|
mv:Planar64::int(27)/10,
|
|
|
|
|
air_accel_limit:None,
|
|
|
|
|
rocket_force:Some(Planar64::int(200)),
|
|
|
|
|
walk_speed:Planar64::int(18),
|
|
|
|
|
walk_accel:Planar64::int(90),
|
|
|
|
|
ladder_speed:Planar64::int(18),
|
|
|
|
|
ladder_accel:Planar64::int(180),
|
|
|
|
|
ladder_dot:(Planar64::int(1)/2).sqrt(),
|
|
|
|
|
swim_speed:Planar64::int(12),
|
|
|
|
|
hitbox_halfsize:Planar64Vec3::int(2,5,2)/2,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn get_control(&self,control:u32,controls:u32)->bool{
|
|
|
|
|
controls&self.controls_mask&control==control
|
|
|
|
|
@@ -537,9 +508,10 @@ impl StyleModifiers{
|
|
|
|
|
// return cross(cross(Normal,ControlDir),Normal)/sqrt(1-d*d)
|
|
|
|
|
control_dir*self.walk_speed
|
|
|
|
|
}
|
|
|
|
|
fn get_propulsion_control_dir(&self,camera:&PhysicsCamera,controls:u32,next_mouse:&MouseState,time:Time)->Planar64Vec3{
|
|
|
|
|
fn get_propulsion_target_velocity(&self,camera:&PhysicsCamera,controls:u32,next_mouse:&MouseState,time:Time)->Planar64Vec3{
|
|
|
|
|
let camera_mat=camera.simulate_move_rotation(camera.mouse.lerp(&next_mouse,time));
|
|
|
|
|
camera_mat*self.get_control_dir(controls)
|
|
|
|
|
let control_dir=camera_mat*self.get_control_dir(controls);
|
|
|
|
|
control_dir*self.walk_speed
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -884,13 +856,11 @@ impl PhysicsState {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn next_strafe_instruction(&self) -> Option<TimedInstruction<PhysicsInstruction>> {
|
|
|
|
|
self.style.strafe_tick_rate.as_ref().map(|strafe_tick_rate|{
|
|
|
|
|
TimedInstruction{
|
|
|
|
|
time:Time::from_nanos(strafe_tick_rate.rhs_div_int(strafe_tick_rate.mul_int(self.time.nanos())+1)),
|
|
|
|
|
//only poll the physics if there is a before and after mouse event
|
|
|
|
|
instruction:PhysicsInstruction::StrafeTick
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
return Some(TimedInstruction{
|
|
|
|
|
time:Time::from_nanos(self.style.strafe_tick_rate.rhs_div_int(self.style.strafe_tick_rate.mul_int(self.time.nanos())+1)),
|
|
|
|
|
//only poll the physics if there is a before and after mouse event
|
|
|
|
|
instruction:PhysicsInstruction::StrafeTick
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//state mutated on collision:
|
|
|
|
|
@@ -924,20 +894,16 @@ impl PhysicsState {
|
|
|
|
|
// });
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
fn refresh_walk_target(&mut self)->Option<Planar64Vec3>{
|
|
|
|
|
fn refresh_walk_target(&mut self){
|
|
|
|
|
match &mut self.move_state{
|
|
|
|
|
MoveState::Air|MoveState::Water=>None,
|
|
|
|
|
MoveState::Air|MoveState::Water=>(),
|
|
|
|
|
MoveState::Walk(WalkState{normal,state})=>{
|
|
|
|
|
let n=normal;
|
|
|
|
|
let a;
|
|
|
|
|
(*state,a)=WalkEnum::with_target_velocity(&self.touching,&self.body,&self.style,&self.models,self.style.get_walk_target_velocity(&self.camera,self.controls,&self.next_mouse,self.time),&n);
|
|
|
|
|
Some(a)
|
|
|
|
|
(*state,self.body.acceleration)=WalkEnum::with_target_velocity(&self.touching,&self.body,&self.style,&self.models,self.style.get_walk_target_velocity(&self.camera,self.controls,&self.next_mouse,self.time),&n);
|
|
|
|
|
},
|
|
|
|
|
MoveState::Ladder(WalkState{normal,state})=>{
|
|
|
|
|
let n=normal;
|
|
|
|
|
let a;
|
|
|
|
|
(*state,a)=WalkEnum::with_target_velocity(&self.touching,&self.body,&self.style,&self.models,self.style.get_ladder_target_velocity(&self.camera,self.controls,&self.next_mouse,self.time),&n);
|
|
|
|
|
Some(a)
|
|
|
|
|
(*state,self.body.acceleration)=WalkEnum::with_target_velocity(&self.touching,&self.body,&self.style,&self.models,self.style.get_ladder_target_velocity(&self.camera,self.controls,&self.next_mouse,self.time),&n);
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@@ -975,8 +941,7 @@ impl PhysicsState {
|
|
|
|
|
//collect x
|
|
|
|
|
match collision_data.face {
|
|
|
|
|
TreyMeshFace::Top|TreyMeshFace::Back|TreyMeshFace::Bottom|TreyMeshFace::Front=>{
|
|
|
|
|
let (roots,nroots)=zeroes2(mesh0.max.x()-mesh1.min.x(),v.x(),a.x()/2);
|
|
|
|
|
for &t in &roots[0..nroots]{
|
|
|
|
|
for t in zeroes2(mesh0.max.x()-mesh1.min.x(),v.x(),a.x()/2) {
|
|
|
|
|
//negative t = back in time
|
|
|
|
|
//must be moving towards surface to collide
|
|
|
|
|
//must beat the current soonest collision time
|
|
|
|
|
@@ -989,8 +954,7 @@ impl PhysicsState {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
let (roots,nroots)=zeroes2(mesh0.min.x()-mesh1.max.x(),v.x(),a.x()/2);
|
|
|
|
|
for &t in &roots[0..nroots]{
|
|
|
|
|
for t in zeroes2(mesh0.min.x()-mesh1.max.x(),v.x(),a.x()/2) {
|
|
|
|
|
//negative t = back in time
|
|
|
|
|
//must be moving towards surface to collide
|
|
|
|
|
//must beat the current soonest collision time
|
|
|
|
|
@@ -1022,8 +986,7 @@ impl PhysicsState {
|
|
|
|
|
//collect y
|
|
|
|
|
match collision_data.face {
|
|
|
|
|
TreyMeshFace::Left|TreyMeshFace::Back|TreyMeshFace::Right|TreyMeshFace::Front=>{
|
|
|
|
|
let (roots,nroots)=zeroes2(mesh0.max.y()-mesh1.min.y(),v.y(),a.y()/2);
|
|
|
|
|
for &t in &roots[0..nroots]{
|
|
|
|
|
for t in zeroes2(mesh0.max.y()-mesh1.min.y(),v.y(),a.y()/2) {
|
|
|
|
|
//negative t = back in time
|
|
|
|
|
//must be moving towards surface to collide
|
|
|
|
|
//must beat the current soonest collision time
|
|
|
|
|
@@ -1036,8 +999,7 @@ impl PhysicsState {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
let (roots,nroots)=zeroes2(mesh0.min.y()-mesh1.max.y(),v.y(),a.y()/2);
|
|
|
|
|
for &t in &roots[0..nroots]{
|
|
|
|
|
for t in zeroes2(mesh0.min.y()-mesh1.max.y(),v.y(),a.y()/2) {
|
|
|
|
|
//negative t = back in time
|
|
|
|
|
//must be moving towards surface to collide
|
|
|
|
|
//must beat the current soonest collision time
|
|
|
|
|
@@ -1069,8 +1031,7 @@ impl PhysicsState {
|
|
|
|
|
//collect z
|
|
|
|
|
match collision_data.face {
|
|
|
|
|
TreyMeshFace::Left|TreyMeshFace::Bottom|TreyMeshFace::Right|TreyMeshFace::Top=>{
|
|
|
|
|
let (roots,nroots)=zeroes2(mesh0.max.z()-mesh1.min.z(),v.z(),a.z()/2);
|
|
|
|
|
for &t in &roots[0..nroots]{
|
|
|
|
|
for t in zeroes2(mesh0.max.z()-mesh1.min.z(),v.z(),a.z()/2) {
|
|
|
|
|
//negative t = back in time
|
|
|
|
|
//must be moving towards surface to collide
|
|
|
|
|
//must beat the current soonest collision time
|
|
|
|
|
@@ -1083,8 +1044,7 @@ impl PhysicsState {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
let (roots,nroots)=zeroes2(mesh0.min.z()-mesh1.max.z(),v.z(),a.z()/2);
|
|
|
|
|
for &t in &roots[0..nroots]{
|
|
|
|
|
for t in zeroes2(mesh0.min.z()-mesh1.max.z(),v.z(),a.z()/2) {
|
|
|
|
|
//negative t = back in time
|
|
|
|
|
//must be moving towards surface to collide
|
|
|
|
|
//must beat the current soonest collision time
|
|
|
|
|
@@ -1114,7 +1074,7 @@ impl PhysicsState {
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
//generate instruction
|
|
|
|
|
if let Some(_face) = exit_face{
|
|
|
|
|
if let Some(face) = exit_face{
|
|
|
|
|
return Some(TimedInstruction {
|
|
|
|
|
time: best_time,
|
|
|
|
|
instruction: PhysicsInstruction::CollisionEnd(collision_data.clone())
|
|
|
|
|
@@ -1130,8 +1090,7 @@ impl PhysicsState {
|
|
|
|
|
let mut best_time=time_limit;
|
|
|
|
|
let mut best_face:Option<TreyMeshFace>=None;
|
|
|
|
|
//collect x
|
|
|
|
|
let (roots,nroots)=zeroes2(mesh0.max.x()-mesh1.min.x(),v.x(),a.x()/2);
|
|
|
|
|
for &t in &roots[0..nroots]{
|
|
|
|
|
for t in zeroes2(mesh0.max.x()-mesh1.min.x(),v.x(),a.x()/2) {
|
|
|
|
|
//must collide now or in the future
|
|
|
|
|
//must beat the current soonest collision time
|
|
|
|
|
//must be moving towards surface
|
|
|
|
|
@@ -1147,8 +1106,7 @@ impl PhysicsState {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
let (roots,nroots)=zeroes2(mesh0.min.x()-mesh1.max.x(),v.x(),a.x()/2);
|
|
|
|
|
for &t in &roots[0..nroots]{
|
|
|
|
|
for t in zeroes2(mesh0.min.x()-mesh1.max.x(),v.x(),a.x()/2) {
|
|
|
|
|
//must collide now or in the future
|
|
|
|
|
//must beat the current soonest collision time
|
|
|
|
|
//must be moving towards surface
|
|
|
|
|
@@ -1165,8 +1123,7 @@ impl PhysicsState {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//collect y
|
|
|
|
|
let (roots,nroots)=zeroes2(mesh0.max.y()-mesh1.min.y(),v.y(),a.y()/2);
|
|
|
|
|
for &t in &roots[0..nroots]{
|
|
|
|
|
for t in zeroes2(mesh0.max.y()-mesh1.min.y(),v.y(),a.y()/2) {
|
|
|
|
|
//must collide now or in the future
|
|
|
|
|
//must beat the current soonest collision time
|
|
|
|
|
//must be moving towards surface
|
|
|
|
|
@@ -1182,8 +1139,7 @@ impl PhysicsState {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
let (roots,nroots)=zeroes2(mesh0.min.y()-mesh1.max.y(),v.y(),a.y()/2);
|
|
|
|
|
for &t in &roots[0..nroots]{
|
|
|
|
|
for t in zeroes2(mesh0.min.y()-mesh1.max.y(),v.y(),a.y()/2) {
|
|
|
|
|
//must collide now or in the future
|
|
|
|
|
//must beat the current soonest collision time
|
|
|
|
|
//must be moving towards surface
|
|
|
|
|
@@ -1200,8 +1156,7 @@ impl PhysicsState {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//collect z
|
|
|
|
|
let (roots,nroots)=zeroes2(mesh0.max.z()-mesh1.min.z(),v.z(),a.z()/2);
|
|
|
|
|
for &t in &roots[0..nroots]{
|
|
|
|
|
for t in zeroes2(mesh0.max.z()-mesh1.min.z(),v.z(),a.z()/2) {
|
|
|
|
|
//must collide now or in the future
|
|
|
|
|
//must beat the current soonest collision time
|
|
|
|
|
//must be moving towards surface
|
|
|
|
|
@@ -1217,8 +1172,7 @@ impl PhysicsState {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
let (roots,nroots)=zeroes2(mesh0.min.z()-mesh1.max.z(),v.z(),a.z()/2);
|
|
|
|
|
for &t in &roots[0..nroots]{
|
|
|
|
|
for t in zeroes2(mesh0.min.z()-mesh1.max.z(),v.z(),a.z()/2) {
|
|
|
|
|
//must collide now or in the future
|
|
|
|
|
//must beat the current soonest collision time
|
|
|
|
|
//must be moving towards surface
|
|
|
|
|
@@ -1377,7 +1331,7 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
|
|
|
|
|
match booster{
|
|
|
|
|
&crate::model::GameMechanicBooster::Affine(transform)=>v=transform.transform_point3(v),
|
|
|
|
|
&crate::model::GameMechanicBooster::Velocity(velocity)=>v+=velocity,
|
|
|
|
|
&crate::model::GameMechanicBooster::Energy{direction: _,energy: _}=>todo!(),
|
|
|
|
|
&crate::model::GameMechanicBooster::Energy{direction,energy}=>todo!(),
|
|
|
|
|
}
|
|
|
|
|
self.touching.constrain_velocity(&self.models,&mut v);
|
|
|
|
|
},
|
|
|
|
|
@@ -1388,10 +1342,10 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
|
|
|
|
|
match trajectory{
|
|
|
|
|
crate::model::GameMechanicSetTrajectory::AirTime(_) => todo!(),
|
|
|
|
|
crate::model::GameMechanicSetTrajectory::Height(_) => todo!(),
|
|
|
|
|
crate::model::GameMechanicSetTrajectory::TargetPointTime { target_point: _, time: _ } => todo!(),
|
|
|
|
|
crate::model::GameMechanicSetTrajectory::TrajectoryTargetPoint { target_point: _, speed: _, trajectory_choice: _ } => todo!(),
|
|
|
|
|
crate::model::GameMechanicSetTrajectory::TargetPointTime { target_point, time } => todo!(),
|
|
|
|
|
crate::model::GameMechanicSetTrajectory::TrajectoryTargetPoint { target_point, speed, trajectory_choice } => todo!(),
|
|
|
|
|
&crate::model::GameMechanicSetTrajectory::Velocity(velocity)=>v=velocity,
|
|
|
|
|
crate::model::GameMechanicSetTrajectory::DotVelocity { direction: _, dot: _ } => todo!(),
|
|
|
|
|
crate::model::GameMechanicSetTrajectory::DotVelocity { direction, dot } => todo!(),
|
|
|
|
|
}
|
|
|
|
|
self.touching.constrain_velocity(&self.models,&mut v);
|
|
|
|
|
},
|
|
|
|
|
@@ -1401,11 +1355,9 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
|
|
|
|
|
if self.style.get_control(StyleModifiers::CONTROL_JUMP,self.controls){
|
|
|
|
|
self.jump();
|
|
|
|
|
}
|
|
|
|
|
if let Some(a)=self.refresh_walk_target(){
|
|
|
|
|
self.body.acceleration=a;
|
|
|
|
|
}
|
|
|
|
|
self.refresh_walk_target();
|
|
|
|
|
},
|
|
|
|
|
PhysicsCollisionAttributes::Intersect{intersecting: _,general}=>{
|
|
|
|
|
PhysicsCollisionAttributes::Intersect{intersecting,general}=>{
|
|
|
|
|
//I think that setting the velocity to 0 was preventing surface contacts from entering an infinite loop
|
|
|
|
|
self.touching.insert_intersect(c.model,c);
|
|
|
|
|
run_teleport_behaviour(&general.teleport_behaviour,&mut self.game,&self.models,&self.modes,&self.style,&mut self.touching,&mut self.body,model);
|
|
|
|
|
@@ -1415,12 +1367,9 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
|
|
|
|
|
PhysicsInstruction::CollisionEnd(c) => {
|
|
|
|
|
let model=c.model(&self.models).unwrap();
|
|
|
|
|
match &model.attributes{
|
|
|
|
|
PhysicsCollisionAttributes::Contact{contacting: _,general: _}=>{
|
|
|
|
|
PhysicsCollisionAttributes::Contact{contacting,general}=>{
|
|
|
|
|
self.touching.remove_contact(c.model);//remove contact before calling contact_constrain_acceleration
|
|
|
|
|
let mut a=self.style.gravity;
|
|
|
|
|
if let Some(rocket_force)=self.style.rocket_force{
|
|
|
|
|
a+=self.style.get_propulsion_control_dir(&self.camera,self.controls,&self.next_mouse,self.time)*rocket_force;
|
|
|
|
|
}
|
|
|
|
|
self.touching.constrain_acceleration(&self.models,&mut a);
|
|
|
|
|
self.body.acceleration=a;
|
|
|
|
|
//check ground
|
|
|
|
|
@@ -1430,12 +1379,10 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
|
|
|
|
|
//TODO: make this more advanced checking contacts
|
|
|
|
|
self.move_state=MoveState::Air;
|
|
|
|
|
},
|
|
|
|
|
_=>if let Some(a)=self.refresh_walk_target(){
|
|
|
|
|
self.body.acceleration=a;
|
|
|
|
|
},
|
|
|
|
|
_=>self.refresh_walk_target(),
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
PhysicsCollisionAttributes::Intersect{intersecting: _,general: _}=>{
|
|
|
|
|
PhysicsCollisionAttributes::Intersect{intersecting,general}=>{
|
|
|
|
|
self.touching.remove_intersect(c.model);
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
@@ -1509,14 +1456,7 @@ impl crate::instruction::InstructionConsumer<PhysicsInstruction> for PhysicsStat
|
|
|
|
|
PhysicsInputInstruction::Idle => {refresh_walk_target=false;},//literally idle!
|
|
|
|
|
}
|
|
|
|
|
if refresh_walk_target{
|
|
|
|
|
if let Some(a)=self.refresh_walk_target(){
|
|
|
|
|
self.body.acceleration=a;
|
|
|
|
|
}else if let Some(rocket_force)=self.style.rocket_force{
|
|
|
|
|
let mut a=self.style.gravity;
|
|
|
|
|
a+=self.style.get_propulsion_control_dir(&self.camera,self.controls,&self.next_mouse,self.time)*rocket_force;
|
|
|
|
|
self.touching.constrain_acceleration(&self.models,&mut a);
|
|
|
|
|
self.body.acceleration=a;
|
|
|
|
|
}
|
|
|
|
|
self.refresh_walk_target();
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
