aidan9382/strafe-client
1
Fork 0
forked from StrafesNET/strafe-client
Code Pull Requests Activity

erm what the rust

Browse Source
This commit is contained in:
Quaternions 2024-08-19 16:35:09 -07:00
parent 63395d3928
commit 35076f5c17
1 changed files with 359 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

412
src/physics.rs
View File

@ -579,6 +579,38 @@ impl MoveState{
MoveState::Fly=>None, MoveState::Fly=>None,
} }
} }
//lmao idk this is convenient
fn apply_enum_and_input_and_body(&mut self,body:&mut Body,touching:&TouchingState,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,style:&StyleModifiers,camera:&PhysicsCamera,input_state:&InputState){
self.apply_enum(body,touching,models,hitbox_mesh,style,camera,input_state);
self.apply_input(body,touching,models,hitbox_mesh,style,camera,input_state);
self.apply_to_body(body,touching,models,hitbox_mesh,style,camera,input_state);
}
fn apply_enum_and_body(&mut self,body:&mut Body,touching:&TouchingState,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,style:&StyleModifiers,camera:&PhysicsCamera,input_state:&InputState){
self.apply_enum(body,touching,models,hitbox_mesh,style,camera,input_state);
self.apply_to_body(body,touching,models,hitbox_mesh,style,camera,input_state);
}
fn apply_input_and_body(&mut self,body:&mut Body,touching:&TouchingState,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,style:&StyleModifiers,camera:&PhysicsCamera,input_state:&InputState){
self.apply_input(body,touching,models,hitbox_mesh,style,camera,input_state);
self.apply_to_body(body,touching,models,hitbox_mesh,style,camera,input_state);
}
fn set_move_state(&mut self,move_state:MoveState,body:&mut Body,touching:&TouchingState,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,style:&StyleModifiers,camera:&PhysicsCamera,input_state:&InputState){
*self=move_state;
//this function call reads the above state that was just set
self.apply_enum_and_body(body,touching,models,hitbox_mesh,style,camera,input_state);
}
fn cull_velocity(&mut self,velocity:Planar64Vec3,body:&mut Body,touching:&mut TouchingState,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,style:&StyleModifiers,camera:&PhysicsCamera,input_state:&InputState){
//TODO: be more precise about contacts
if set_velocity_cull(body,touching,models,hitbox_mesh,velocity){
//TODO do better
match self.get_walk_state(){
//did you stop touching the thing you were walking on?
Some(walk_state)=>if !touching.contacts.contains(&walk_state.contact){
self.set_move_state(MoveState::Air,body,touching,models,hitbox_mesh,style,camera,input_state);
},
None=>self.apply_enum_and_body(body,touching,models,hitbox_mesh,style,camera,input_state),
}
}
}
} }
#[derive(Clone,Default)] #[derive(Clone,Default)]
@ -956,39 +988,15 @@ impl PhysicsState{
fn next_move_instruction(&self)->Option<TimedInstruction<PhysicsInternalInstruction>>{ fn next_move_instruction(&self)->Option<TimedInstruction<PhysicsInternalInstruction>>{
self.move_state.next_move_instruction(&self.style.strafe,self.time) self.move_state.next_move_instruction(&self.style.strafe,self.time)
} }
//lmao idk this is convenient fn cull_velocity(&mut self,data:&PhysicsData,velocity:Planar64Vec3){
fn apply_enum_and_input_and_body(&mut self,data:&PhysicsData){ self.move_state.cull_velocity(velocity,&mut self.body,&mut self.touching,&data.models,&data.hitbox_mesh,&self.style,&self.camera,&self.input_state);
self.move_state.apply_enum(&mut self.body,&self.touching,&data.models,&data.hitbox_mesh,&self.style,&self.camera,&self.input_state);
self.move_state.apply_input(&self.body,&self.touching,&data.models,&data.hitbox_mesh,&self.style,&self.camera,&self.input_state);
self.move_state.apply_to_body(&mut self.body,&self.touching,&data.models,&data.hitbox_mesh,&self.style,&self.camera,&self.input_state);
}
fn apply_enum_and_body(&mut self,data:&PhysicsData){
self.move_state.apply_enum(&mut self.body,&self.touching,&data.models,&data.hitbox_mesh,&self.style,&self.camera,&self.input_state);
self.move_state.apply_to_body(&mut self.body,&self.touching,&data.models,&data.hitbox_mesh,&self.style,&self.camera,&self.input_state);
}
fn apply_input_and_body(&mut self,data:&PhysicsData){
self.move_state.apply_input(&self.body,&self.touching,&data.models,&data.hitbox_mesh,&self.style,&self.camera,&self.input_state);
self.move_state.apply_to_body(&mut self.body,&self.touching,&data.models,&data.hitbox_mesh,&self.style,&self.camera,&self.input_state);
} }
fn set_move_state(&mut self,data:&PhysicsData,move_state:MoveState){ fn set_move_state(&mut self,data:&PhysicsData,move_state:MoveState){
self.move_state=move_state; self.move_state.set_move_state(move_state,&mut self.body,&self.touching,&data.models,&data.hitbox_mesh,&self.style,&self.camera,&self.input_state);
//this function call reads the above state that was just set
self.apply_enum_and_body(data);
} }
fn cull_velocity(&mut self,data:&PhysicsData,velocity:Planar64Vec3){ fn apply_input_and_body(&mut self,data:&PhysicsData){
//TODO: be more precise about contacts self.move_state.apply_input_and_body(&mut self.body,&self.touching,&data.models,&data.hitbox_mesh,&self.style,&self.camera,&self.input_state);
if set_velocity_cull(&mut self.body,&mut self.touching,&data.models,&data.hitbox_mesh,velocity){
//TODO do better
match self.move_state.get_walk_state(){
//did you stop touching the thing you were walking on?
Some(walk_state)=>if !self.touching.contacts.contains(&walk_state.contact){
self.set_move_state(data,MoveState::Air);
},
None=>self.apply_enum_and_body(data),
} }
}
}
//state mutated on collision: //state mutated on collision:
//Accelerator //Accelerator
//stair step-up //stair step-up
@ -1255,50 +1263,79 @@ fn contact_normal(models:&PhysicsModels,hitbox_mesh:&HitboxMesh,contact:&Contact
} }
fn recalculate_touching( fn recalculate_touching(
state:&mut PhysicsState, move_state:&mut MoveState,
data:&PhysicsData, body:&mut Body,
touching:&mut TouchingState,
run:&mut run::Run,
mode_state:&mut ModeState,
mode:Option<&gameplay_modes::Mode>,
models:&PhysicsModels, models:&PhysicsModels,
hitbox_mesh:&HitboxMesh,
bvh:&bvh::BvhNode<ConvexMeshId>,
style:&StyleModifiers,
camera:&PhysicsCamera,
input_state:&InputState,
time:Time,
){ ){
//collision_end all existing contacts //collision_end all existing contacts
//I would have preferred while let Some(contact)=contacts.pop() //I would have preferred while let Some(contact)=contacts.pop()
//but there is no such method //but there is no such method
for contact in state.touching.contacts.clone().drain(){ while let Some(&contact)=touching.contacts.iter().next(){
collision_end_contact(state,data,models.contact_attr(contact.model_id),contact); collision_end_contact(move_state,body,touching,models,hitbox_mesh,style,camera,input_state,models.contact_attr(contact.model_id),contact)
} }
for intersect in state.touching.intersects.clone().drain(){ while let Some(&intersect)=touching.intersects.iter().next(){
collision_end_intersect(state,data,models.intersect_attr(intersect.model_id),intersect); collision_end_intersect(touching,mode,run,models.intersect_attr(intersect.model_id),intersect,time);
} }
//find all models in the teleport region //find all models in the teleport region
let mut aabb=aabb::Aabb::default(); let mut aabb=aabb::Aabb::default();
aabb.grow(state.body.position); aabb.grow(body.position);
aabb.inflate(data.hitbox_mesh.halfsize); aabb.inflate(hitbox_mesh.halfsize);
//relative to moving platforms //relative to moving platforms
//let relative_body=&VirtualBody::relative(&Body::default(),&state.body).body(state.time); //let relative_body=&VirtualBody::relative(&Body::default(),&state.body).body(state.time);
data.bvh.the_tester(&aabb,&mut |&convex_mesh_id|{ bvh.the_tester(&aabb,&mut |&convex_mesh_id|{
//no checks are needed because of the time limits. //no checks are needed because of the time limits.
let model_mesh=data.models.mesh(convex_mesh_id); let model_mesh=models.mesh(convex_mesh_id);
let minkowski=model_physics::MinkowskiMesh::minkowski_sum(model_mesh,data.hitbox_mesh.transformed_mesh()); let minkowski=model_physics::MinkowskiMesh::minkowski_sum(model_mesh,hitbox_mesh.transformed_mesh());
if minkowski.is_point_in_mesh(state.body.position){ if minkowski.is_point_in_mesh(body.position){
match convex_mesh_id.model_id{ match convex_mesh_id.model_id{
//being inside of contact objects is an invalid physics state //being inside of contact objects is an invalid physics state
//but the physics isn't advanced enough to do anything about it yet //but the physics isn't advanced enough to do anything about it yet
//TODO: PushSolve and search for the closest valid position //TODO: PushSolve and search for the closest valid position
PhysicsModelId::Contact(_)=>(), PhysicsModelId::Contact(_)=>(),
PhysicsModelId::Intersect(model_id)=> PhysicsModelId::Intersect(model_id)=>
collision_start_intersect(state,data,data.models.intersect_attr(model_id),IntersectCollision{ collision_start_intersect(move_state,body,mode_state,touching,mode,run,models,hitbox_mesh,bvh,style,camera,input_state,
models.intersect_attr(model_id),
IntersectCollision{
model_id, model_id,
submesh_id:convex_mesh_id.submesh_id, submesh_id:convex_mesh_id.submesh_id,
}), },
time,
),
} }
} }
}); });
} }
fn set_position(body:&mut Body,touching:&mut TouchingState,point:Planar64Vec3)->Planar64Vec3{ fn set_position(
point:Planar64Vec3,
move_state:&mut MoveState,
body:&mut Body,
touching:&mut TouchingState,
run:&mut run::Run,
mode_state:&mut ModeState,
mode:Option<&gameplay_modes::Mode>,
models:&PhysicsModels,
hitbox_mesh:&HitboxMesh,
bvh:&bvh::BvhNode<ConvexMeshId>,
style:&StyleModifiers,
camera:&PhysicsCamera,
input_state:&InputState,
time:Time,
)->Planar64Vec3{
//test intersections at new position //test intersections at new position
//hovering above the surface 0 units is not intersecting. you will fall into it just fine //hovering above the surface 0 units is not intersecting. you will fall into it just fine
body.position=point; body.position=point;
//calculate contacts and determine the actual state //calculate contacts and determine the actual state
recalculate_touching(state,data,models); recalculate_touching(move_state,body,touching,run,mode_state,mode,models,hitbox_mesh,bvh,style,camera,input_state,time);
point point
} }
fn set_velocity_cull(body:&mut Body,touching:&mut TouchingState,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,v:Planar64Vec3)->bool{ fn set_velocity_cull(body:&mut Body,touching:&mut TouchingState,models:&PhysicsModels,hitbox_mesh:&HitboxMesh,v:Planar64Vec3)->bool{
@ -1340,31 +1377,73 @@ fn set_acceleration(body:&mut Body,touching:&TouchingState,models:&PhysicsModels
body.acceleration=a; body.acceleration=a;
} }
fn teleport(body:&mut Body,touching:&mut TouchingState,models:&PhysicsModels,style:&StyleModifiers,hitbox_mesh:&HitboxMesh,point:Planar64Vec3)->MoveState{ fn teleport(
set_position(body,touching,point); point:Planar64Vec3,
move_state:&mut MoveState,
body:&mut Body,
touching:&mut TouchingState,
run:&mut run::Run,
mode_state:&mut ModeState,
mode:Option<&gameplay_modes::Mode>,
models:&PhysicsModels,
hitbox_mesh:&HitboxMesh,
bvh:&bvh::BvhNode<ConvexMeshId>,
style:&StyleModifiers,
camera:&PhysicsCamera,
input_state:&InputState,
time:Time,
){
set_position(point,move_state,body,touching,run,mode_state,mode,models,hitbox_mesh,bvh,style,camera,input_state,time);
set_acceleration(body,touching,models,hitbox_mesh,style.gravity); set_acceleration(body,touching,models,hitbox_mesh,style.gravity);
MoveState::Air
} }
fn teleport_to_spawn(body:&mut Body,touching:&mut TouchingState,style:&StyleModifiers,hitbox_mesh:&HitboxMesh,mode:&gameplay_modes::Mode,models:&PhysicsModels,stage_id:gameplay_modes::StageId)->Option<MoveState>{ enum TeleportToSpawnError{
let transform=models.get_model_transform(mode.get_spawn_model_id(stage_id)?)?; NoModel,
NoSpawn,
}
fn teleport_to_spawn(
stage_id:gameplay_modes::StageId,
move_state:&mut MoveState,
body:&mut Body,
touching:&mut TouchingState,
run:&mut run::Run,
mode_state:&mut ModeState,
mode:&gameplay_modes::Mode,
models:&PhysicsModels,
hitbox_mesh:&HitboxMesh,
bvh:&bvh::BvhNode<ConvexMeshId>,
style:&StyleModifiers,
camera:&PhysicsCamera,
input_state:&InputState,
time:Time,
)->Result<(),TeleportToSpawnError>{
let model_id=mode.get_spawn_model_id(stage_id).ok_or(TeleportToSpawnError::NoSpawn)?;
let transform=models.get_model_transform(model_id).ok_or(TeleportToSpawnError::NoModel)?;
let point=transform.vertex.transform_point3(Planar64Vec3::Y)+Planar64Vec3::Y*(style.hitbox.halfsize.y()+Planar64::ONE/16); let point=transform.vertex.transform_point3(Planar64Vec3::Y)+Planar64Vec3::Y*(style.hitbox.halfsize.y()+Planar64::ONE/16);
Some(teleport(body,touching,models,style,hitbox_mesh,point)) teleport(point,move_state,body,touching,run,mode_state,Some(mode),models,hitbox_mesh,bvh,style,camera,input_state,time);
Ok(())
} }
fn run_teleport_behaviour( fn run_teleport_behaviour(
wormhole:&Option<gameplay_attributes::Wormhole>,
models:&PhysicsModels,
mode:&gameplay_modes::Mode,
style:&StyleModifiers,
hitbox_mesh:&HitboxMesh,
mode_state:&mut ModeState,
touching:&mut TouchingState,
body:&mut Body,
model_id:ModelId, model_id:ModelId,
)->Option<MoveState>{ wormhole:Option<&gameplay_attributes::Wormhole>,
mode:Option<&gameplay_modes::Mode>,
move_state:&mut MoveState,
body:&mut Body,
touching:&mut TouchingState,
run:&mut run::Run,
mode_state:&mut ModeState,
models:&PhysicsModels,
hitbox_mesh:&HitboxMesh,
bvh:&bvh::BvhNode<ConvexMeshId>,
style:&StyleModifiers,
camera:&PhysicsCamera,
input_state:&InputState,
time:Time,
){
//TODO: jump count and checkpoints are always reset on teleport. //TODO: jump count and checkpoints are always reset on teleport.
//Map makers are expected to use tools to prevent //Map makers are expected to use tools to prevent
//multi-boosting on JumpLimit boosters such as spawning into a SetVelocity //multi-boosting on JumpLimit boosters such as spawning into a SetVelocity
if let Some(mode)=mode{
if let Some(stage_element)=mode.get_element(model_id){ if let Some(stage_element)=mode.get_element(model_id){
if let Some(stage)=mode.get_stage(stage_element.stage_id()){ if let Some(stage)=mode.get_stage(stage_element.stage_id()){
if mode_state.get_stage_id()<stage_element.stage_id(){ if mode_state.get_stage_id()<stage_element.stage_id(){
@ -1373,20 +1452,33 @@ fn run_teleport_behaviour(
if let Some(current_stage)=mode.get_stage(mode_state.get_stage_id()){ if let Some(current_stage)=mode.get_stage(mode_state.get_stage_id()){
if !current_stage.is_complete(mode_state.ordered_checkpoint_count(),mode_state.unordered_checkpoint_count()){ if !current_stage.is_complete(mode_state.ordered_checkpoint_count(),mode_state.unordered_checkpoint_count()){
//do the stage checkpoints have to be reset? //do the stage checkpoints have to be reset?
return teleport_to_spawn(body,touching,style,hitbox_mesh,mode,models,mode_state.get_stage_id()); teleport_to_spawn(mode_state.get_stage_id(),move_state,body,touching,run,mode_state,mode,models,hitbox_mesh,bvh,style,camera,input_state,time);
return;
} }
} }
//check if all between stages have no checkpoints required to pass them //check if all between stages have no checkpoints required to pass them
let mut loop_unbroken=true;
for stage_id in mode_state.get_stage_id().get()+1..stage_element.stage_id().get(){ for stage_id in mode_state.get_stage_id().get()+1..stage_element.stage_id().get(){
let stage_id=StageId::new(stage_id); let stage_id=StageId::new(stage_id);
//check if none of the between stages has checkpoints, if they do teleport back to that stage //check if none of the between stages has checkpoints, if they do teleport back to that stage
if !mode.get_stage(stage_id)?.is_empty(){ match mode.get_stage(stage_id){
Some(stage)=>if !stage.is_empty(){
mode_state.set_stage_id(stage_id); mode_state.set_stage_id(stage_id);
return teleport_to_spawn(body,touching,style,hitbox_mesh,mode,models,stage_id); teleport_to_spawn(stage_id,move_state,body,touching,run,mode_state,mode,models,hitbox_mesh,bvh,style,camera,input_state,time);
} return;
},
None=>{
//no such stage! set to last existing stage and break loop
mode_state.set_stage_id(StageId::new(stage_id.get()-1));
loop_unbroken=false;
break;
},
} }
};
//notably you do not get teleported for touching ordered checkpoints in the wrong order within the same stage. //notably you do not get teleported for touching ordered checkpoints in the wrong order within the same stage.
if loop_unbroken{
mode_state.set_stage_id(stage_element.stage_id()); mode_state.set_stage_id(stage_element.stage_id());
}
}else if stage_element.force(){ }else if stage_element.force(){
//forced stage_element will set the stage_id even if the stage has already been passed //forced stage_element will set the stage_id even if the stage has already been passed
mode_state.set_stage_id(stage_element.stage_id()); mode_state.set_stage_id(stage_element.stage_id());
@ -1396,7 +1488,8 @@ fn run_teleport_behaviour(
gameplay_modes::StageElementBehaviour::Trigger gameplay_modes::StageElementBehaviour::Trigger
|gameplay_modes::StageElementBehaviour::Teleport=>{ |gameplay_modes::StageElementBehaviour::Teleport=>{
//I guess this is correct behaviour when trying to teleport to a non-existent spawn but it's still weird //I guess this is correct behaviour when trying to teleport to a non-existent spawn but it's still weird
return teleport_to_spawn(body,touching,style,hitbox_mesh,mode,models,mode_state.get_stage_id()); teleport_to_spawn(mode_state.get_stage_id(),move_state,body,touching,run,mode_state,mode,models,hitbox_mesh,bvh,style,camera,input_state,time);
return;
}, },
gameplay_modes::StageElementBehaviour::Platform=>(), gameplay_modes::StageElementBehaviour::Platform=>(),
gameplay_modes::StageElementBehaviour::Check=>(),//this is to run the checkpoint check behaviour without any other side effects gameplay_modes::StageElementBehaviour::Check=>(),//this is to run the checkpoint check behaviour without any other side effects
@ -1410,67 +1503,75 @@ fn run_teleport_behaviour(
} }
} }
} }
match wormhole{
&Some(gameplay_attributes::Wormhole{destination_model})=>{
let origin=models.get_model_transform(model_id)?;
let destination=models.get_model_transform(destination_model)?;
//ignore the transform for now
Some(teleport(body,touching,models,style,hitbox_mesh,body.position-origin.vertex.translation+destination.vertex.translation))
} }
None=>None, if let Some(&gameplay_attributes::Wormhole{destination_model})=wormhole{
if let (Some(origin),Some(destination))=(models.get_model_transform(model_id),models.get_model_transform(destination_model)){
let point=body.position-origin.vertex.translation+destination.vertex.translation;
//TODO: camera angles
teleport(point,move_state,body,touching,run,mode_state,mode,models,hitbox_mesh,bvh,style,camera,input_state,time);
}
} }
} }
fn collision_start_contact( fn collision_start_contact(
state:&mut PhysicsState, move_state:&mut MoveState,
data:&PhysicsData, body:&mut Body,
mode_state:&mut ModeState,
touching:&mut TouchingState,
run:&mut run::Run,
mode:Option<&gameplay_modes::Mode>,
models:&PhysicsModels,
hitbox_mesh:&HitboxMesh,
bvh:&bvh::BvhNode<ConvexMeshId>,
style:&StyleModifiers,
camera:&PhysicsCamera,
input_state:&InputState,
attr:&gameplay_attributes::ContactAttributes, attr:&gameplay_attributes::ContactAttributes,
contact:ContactCollision, contact:ContactCollision,
time:Time,
){ ){
let incident_velocity=state.body.velocity; let incident_velocity=body.velocity;
//add to touching //add to touching
state.touching.insert(Collision::Contact(contact)); touching.insert(Collision::Contact(contact));
//clip v //clip v
set_velocity(&mut state.body,&state.touching,&data.models,&data.hitbox_mesh,incident_velocity); set_velocity(body,touching,models,hitbox_mesh,incident_velocity);
match &attr.contacting.contact_behaviour{ match &attr.contacting.contact_behaviour{
Some(gameplay_attributes::ContactingBehaviour::Surf)=>println!("I'm surfing!"), Some(gameplay_attributes::ContactingBehaviour::Surf)=>println!("I'm surfing!"),
Some(gameplay_attributes::ContactingBehaviour::Cling)=>println!("Unimplemented!"), Some(gameplay_attributes::ContactingBehaviour::Cling)=>println!("Unimplemented!"),
&Some(gameplay_attributes::ContactingBehaviour::Elastic(elasticity))=>{ &Some(gameplay_attributes::ContactingBehaviour::Elastic(elasticity))=>{
let reflected_velocity=state.body.velocity+(state.body.velocity-incident_velocity)*Planar64::raw(elasticity as i64+1); let reflected_velocity=body.velocity+(body.velocity-incident_velocity)*Planar64::raw(elasticity as i64+1);
set_velocity(&mut state.body,&state.touching,&data.models,&data.hitbox_mesh,reflected_velocity); set_velocity(body,touching,models,hitbox_mesh,reflected_velocity);
}, },
Some(gameplay_attributes::ContactingBehaviour::Ladder(contacting_ladder))=> Some(gameplay_attributes::ContactingBehaviour::Ladder(contacting_ladder))=>
if let Some(ladder_settings)=&state.style.ladder{ if let Some(ladder_settings)=&style.ladder{
if contacting_ladder.sticky{ if contacting_ladder.sticky{
//kill v //kill v
//actually you could do this with a booster attribute :thinking: //actually you could do this with a booster attribute :thinking:
//it's a little bit different because maybe you want to chain ladders together //it's a little bit different because maybe you want to chain ladders together
set_velocity(&mut state.body,&state.touching,&data.models,&data.hitbox_mesh,Planar64Vec3::ZERO);//model.velocity set_velocity(body,touching,models,hitbox_mesh,Planar64Vec3::ZERO);//model.velocity
} }
//ladder walkstate //ladder walkstate
let (gravity,target_velocity)=ladder_things(ladder_settings,&contact,&state.touching,&data.models,&data.hitbox_mesh,&state.style,&state.camera,&state.input_state); let (gravity,target_velocity)=ladder_things(ladder_settings,&contact,touching,models,hitbox_mesh,style,camera,input_state);
let walk_state=ContactMoveState::ladder(ladder_settings,&state.body,gravity,target_velocity,contact); let walk_state=ContactMoveState::ladder(ladder_settings,body,gravity,target_velocity,contact);
state.set_move_state(data,MoveState::Ladder(walk_state)); move_state.set_move_state(MoveState::Ladder(walk_state),body,touching,models,hitbox_mesh,style,camera,input_state);
}, },
Some(gameplay_attributes::ContactingBehaviour::NoJump)=>todo!("nyi"), Some(gameplay_attributes::ContactingBehaviour::NoJump)=>todo!("nyi"),
None=>if let Some(walk_settings)=&state.style.walk{ None=>if let Some(walk_settings)=&style.walk{
if walk_settings.is_slope_walkable(contact_normal(&data.models,&data.hitbox_mesh,&contact),Planar64Vec3::Y){ if walk_settings.is_slope_walkable(contact_normal(models,hitbox_mesh,&contact),Planar64Vec3::Y){
//ground //ground
let (gravity,target_velocity)=ground_things(walk_settings,&contact,&state.touching,&data.models,&data.hitbox_mesh,&state.style,&state.camera,&state.input_state); let (gravity,target_velocity)=ground_things(walk_settings,&contact,touching,models,hitbox_mesh,style,camera,input_state);
let walk_state=ContactMoveState::ground(walk_settings,&state.body,gravity,target_velocity,contact); let walk_state=ContactMoveState::ground(walk_settings,body,gravity,target_velocity,contact);
state.set_move_state(data,MoveState::Walk(walk_state)); move_state.set_move_state(MoveState::Walk(walk_state),body,touching,models,hitbox_mesh,style,camera,input_state);
} }
}, },
} }
//I love making functions with 10 arguments to dodge the borrow checker //I love making functions with 10 arguments to dodge the borrow checker
if let Some(mode)=data.modes.get_mode(state.mode_state.get_mode_id()){ run_teleport_behaviour(contact.model_id.into(),attr.general.wormhole.as_ref(),mode,move_state,body,touching,run,mode_state,models,hitbox_mesh,bvh,style,camera,input_state,time);
run_teleport_behaviour(&attr.general.wormhole,&data.models,mode,&state.style,&data.hitbox_mesh,&mut state.mode_state,&mut state.touching,&mut state.body,contact.model_id.into()); if style.get_control(Controls::Jump,input_state.controls){
} if let (Some(jump_settings),Some(walk_state))=(&style.jump,move_state.get_walk_state()){
if state.style.get_control(Controls::Jump,state.input_state.controls){ let jump_dir=walk_state.jump_direction.direction(models,hitbox_mesh,&walk_state.contact);
if let (Some(jump_settings),Some(walk_state))=(&state.style.jump,state.move_state.get_walk_state()){ let jumped_velocity=jump_settings.jumped_velocity(style,jump_dir,body.velocity,attr.general.booster.as_ref());
let jump_dir=walk_state.jump_direction.direction(&data.models,&data.hitbox_mesh,&walk_state.contact); move_state.cull_velocity(jumped_velocity,body,touching,models,hitbox_mesh,style,camera,input_state);
let jumped_velocity=jump_settings.jumped_velocity(&state.style,jump_dir,state.body.velocity,attr.general.booster.as_ref());
state.cull_velocity(data,jumped_velocity);
} }
} }
match &attr.general.trajectory{ match &attr.general.trajectory{
@ -1481,7 +1582,7 @@ fn collision_start_contact(
gameplay_attributes::SetTrajectory::TargetPointTime { target_point: _, time: _ }=>todo!(), gameplay_attributes::SetTrajectory::TargetPointTime { target_point: _, time: _ }=>todo!(),
gameplay_attributes::SetTrajectory::TargetPointSpeed { target_point: _, speed: _, trajectory_choice: _ }=>todo!(), gameplay_attributes::SetTrajectory::TargetPointSpeed { target_point: _, speed: _, trajectory_choice: _ }=>todo!(),
&gameplay_attributes::SetTrajectory::Velocity(velocity)=>{ &gameplay_attributes::SetTrajectory::Velocity(velocity)=>{
state.cull_velocity(data,velocity); move_state.cull_velocity(velocity,body,touching,models,hitbox_mesh,style,camera,input_state);
}, },
gameplay_attributes::SetTrajectory::DotVelocity { direction: _, dot: _ }=>todo!(), gameplay_attributes::SetTrajectory::DotVelocity { direction: _, dot: _ }=>todo!(),
} }
@ -1490,71 +1591,90 @@ fn collision_start_contact(
} }
//doing enum to set the acceleration when surfing //doing enum to set the acceleration when surfing
//doing input_and_body to refresh the walk state if you hit a wall while accelerating //doing input_and_body to refresh the walk state if you hit a wall while accelerating
state.apply_enum_and_input_and_body(data); move_state.apply_enum_and_input_and_body(body,touching,models,hitbox_mesh,style,camera,input_state);
} }
fn collision_start_intersect( fn collision_start_intersect(
state:&mut PhysicsState, move_state:&mut MoveState,
data:&PhysicsData, body:&mut Body,
mode_state:&mut ModeState,
touching:&mut TouchingState,
mode:Option<&gameplay_modes::Mode>,
run:&mut run::Run,
models:&PhysicsModels,
hitbox_mesh:&HitboxMesh,
bvh:&bvh::BvhNode<ConvexMeshId>,
style:&StyleModifiers,
camera:&PhysicsCamera,
input_state:&InputState,
attr:&gameplay_attributes::IntersectAttributes, attr:&gameplay_attributes::IntersectAttributes,
intersect:IntersectCollision, intersect:IntersectCollision,
time:Time,
){ ){
//I think that setting the velocity to 0 was preventing surface contacts from entering an infinite loop //I think that setting the velocity to 0 was preventing surface contacts from entering an infinite loop
state.touching.insert(Collision::Intersect(intersect)); touching.insert(Collision::Intersect(intersect));
//insta booster! //insta booster!
if let Some(booster)=&attr.general.booster{ if let Some(booster)=&attr.general.booster{
state.cull_velocity(data,booster.boost(state.body.velocity)); move_state.cull_velocity(booster.boost(body.velocity),body,touching,models,hitbox_mesh,style,camera,input_state);
} }
if let Some(mode)=data.modes.get_mode(state.mode_state.get_mode_id()){ if let Some(mode)=mode{
let zone=mode.get_zone(intersect.model_id.into()); let zone=mode.get_zone(intersect.model_id.into());
match zone{ match zone{
Some(gameplay_modes::Zone::Start)=>{ Some(gameplay_modes::Zone::Start)=>{
println!("@@@@ Starting new run!"); println!("@@@@ Starting new run!");
state.run=run::Run::new(); *run=run::Run::new();
}, },
Some(gameplay_modes::Zone::Finish)=>{ Some(gameplay_modes::Zone::Finish)=>{
match state.run.finish(state.time){ match run.finish(time){
Ok(())=>println!("@@@@ Finished run time={}",state.run.time(state.time)), Ok(())=>println!("@@@@ Finished run time={}",run.time(time)),
Err(e)=>println!("@@@@ Run Finish error:{e:?}"), Err(e)=>println!("@@@@ Run Finish error:{e:?}"),
} }
}, },
Some(gameplay_modes::Zone::Anticheat)=>state.run.flag(run::FlagReason::Anticheat), Some(gameplay_modes::Zone::Anticheat)=>run.flag(run::FlagReason::Anticheat),
None=>(), None=>(),
} }
run_teleport_behaviour(&attr.general.wormhole,&data.models,mode,&state.style,&data.hitbox_mesh,&mut state.mode_state,&mut state.touching,&mut state.body,intersect.model_id.into());
} }
run_teleport_behaviour(intersect.model_id.into(),attr.general.wormhole.as_ref(),mode,move_state,body,touching,run,mode_state,models,hitbox_mesh,bvh,style,camera,input_state,time);
} }
fn collision_end_contact( fn collision_end_contact(
state:&mut PhysicsState, move_state:&mut MoveState,
data:&PhysicsData, body:&mut Body,
touching:&mut TouchingState,
models:&PhysicsModels,
hitbox_mesh:&HitboxMesh,
style:&StyleModifiers,
camera:&PhysicsCamera,
input_state:&InputState,
_attr:&gameplay_attributes::ContactAttributes, _attr:&gameplay_attributes::ContactAttributes,
contact:ContactCollision, contact:ContactCollision,
){ ){
state.touching.remove(&Collision::Contact(contact));//remove contact before calling contact_constrain_acceleration touching.remove(&Collision::Contact(contact));//remove contact before calling contact_constrain_acceleration
//check ground //check ground
//TODO do better //TODO do better
//this is inner code from state.cull_velocity //this is inner code from move_state.cull_velocity
match state.move_state.get_walk_state(){ match move_state.get_walk_state(){
//did you stop touching the thing you were walking on? //did you stop touching the thing you were walking on?
Some(walk_state)=>if walk_state.contact==contact{ Some(walk_state)=>if walk_state.contact==contact{
state.set_move_state(data,MoveState::Air); move_state.set_move_state(MoveState::Air,body,touching,models,hitbox_mesh,style,camera,input_state);
}, },
None=>state.apply_enum_and_body(data), None=>move_state.apply_enum_and_body(body,touching,models,hitbox_mesh,style,camera,input_state),
} }
} }
fn collision_end_intersect( fn collision_end_intersect(
state:&mut PhysicsState, touching:&mut TouchingState,
data:&PhysicsData, mode:Option<&gameplay_modes::Mode>,
run:&mut run::Run,
_attr:&gameplay_attributes::IntersectAttributes, _attr:&gameplay_attributes::IntersectAttributes,
intersect:IntersectCollision, intersect:IntersectCollision,
time:Time,
){ ){
state.touching.remove(&Collision::Intersect(intersect)); touching.remove(&Collision::Intersect(intersect));
if let Some(mode)=data.modes.get_mode(state.mode_state.get_mode_id()){ if let Some(mode)=mode{
let zone=mode.get_zone(intersect.model_id.into()); let zone=mode.get_zone(intersect.model_id.into());
match zone{ match zone{
Some(gameplay_modes::Zone::Start)=>{ Some(gameplay_modes::Zone::Start)=>{
match state.run.start(state.time){ match run.start(time){
Ok(())=>println!("@@@@ Started run"), Ok(())=>println!("@@@@ Started run"),
Err(e)=>println!("@@@@ Run Start error:{e:?}"), Err(e)=>println!("@@@@ Run Start error:{e:?}"),
} }
@ -1575,13 +1695,41 @@ fn atomic_internal_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:Tim
state.body.advance_time(state.time); state.body.advance_time(state.time);
} }
match ins.instruction{ match ins.instruction{
PhysicsInternalInstruction::CollisionStart(collision)=>match collision{ PhysicsInternalInstruction::CollisionStart(collision)=>{
Collision::Contact(contact)=>collision_start_contact(state,data,data.models.contact_attr(contact.model_id),contact), let mode=data.modes.get_mode(state.mode_state.get_mode_id());
Collision::Intersect(intersect)=>collision_start_intersect(state,data,data.models.intersect_attr(intersect.model_id),intersect), match collision{
Collision::Contact(contact)=>collision_start_contact(
&mut state.move_state,&mut state.body,&mut state.mode_state,&mut state.touching,&mut state.run,
mode,
&data.models,&data.hitbox_mesh,&data.bvh,&state.style,&state.camera,&state.input_state,
data.models.contact_attr(contact.model_id),
contact,
state.time,
),
Collision::Intersect(intersect)=>collision_start_intersect(
&mut state.move_state,&mut state.body,&mut state.mode_state,&mut state.touching,
mode,
&mut state.run,&data.models,&data.hitbox_mesh,&data.bvh,&state.style,&state.camera,&state.input_state,
data.models.intersect_attr(intersect.model_id),
intersect,
state.time,
),
}
}, },
PhysicsInternalInstruction::CollisionEnd(collision)=>match collision{ PhysicsInternalInstruction::CollisionEnd(collision)=>match collision{
Collision::Contact(contact)=>collision_end_contact(state,data,data.models.contact_attr(contact.model_id),contact), Collision::Contact(contact)=>collision_end_contact(
Collision::Intersect(intersect)=>collision_end_intersect(state,data,data.models.intersect_attr(intersect.model_id),intersect), &mut state.move_state,&mut state.body,&mut state.touching,&data.models,&data.hitbox_mesh,&state.style,&state.camera,&state.input_state,
data.models.contact_attr(contact.model_id),
contact
),
Collision::Intersect(intersect)=>collision_end_intersect(
&mut state.touching,
data.modes.get_mode(state.mode_state.get_mode_id()),
&mut state.run,
data.models.intersect_attr(intersect.model_id),
intersect,
state.time
),
}, },
PhysicsInternalInstruction::StrafeTick=>{ PhysicsInternalInstruction::StrafeTick=>{
//TODO make this less huge //TODO make this less huge
@ -1704,14 +1852,15 @@ fn atomic_input_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:TimedI
}, },
PhysicsInputInstruction::Restart=>{ PhysicsInputInstruction::Restart=>{
//teleport to start zone //teleport to start zone
let spawn_point=data.modes.get_mode(state.mode_state.get_mode_id()).and_then(|mode| let mode=data.modes.get_mode(state.mode_state.get_mode_id());
let spawn_point=mode.and_then(|mode|
//TODO: spawn at the bottom of the start zone plus the hitbox size //TODO: spawn at the bottom of the start zone plus the hitbox size
//TODO: set camera andles to face the same way as the start zone //TODO: set camera andles to face the same way as the start zone
data.models.get_model_transform(mode.get_start().into()).map(|transform| data.models.get_model_transform(mode.get_start().into()).map(|transform|
transform.vertex.translation transform.vertex.translation
) )
).unwrap_or(Planar64Vec3::ZERO); ).unwrap_or(Planar64Vec3::ZERO);
set_position(&mut state.body,&mut state.touching,spawn_point); set_position(spawn_point,&mut state.move_state,&mut state.body,&mut state.touching,&mut state.run,&mut state.mode_state,mode,&data.models,&data.hitbox_mesh,&data.bvh,&state.style,&state.camera,&state.input_state,state.time);
set_velocity(&mut state.body,&state.touching,&data.models,&data.hitbox_mesh,Planar64Vec3::ZERO); set_velocity(&mut state.body,&state.touching,&data.models,&data.hitbox_mesh,Planar64Vec3::ZERO);
state.set_move_state(data,MoveState::Air); state.set_move_state(data,MoveState::Air);
b_refresh_walk_target=false; b_refresh_walk_target=false;
@ -1719,7 +1868,12 @@ fn atomic_input_instruction(state:&mut PhysicsState,data:&PhysicsData,ins:TimedI
PhysicsInputInstruction::Spawn(mode_id,stage_id)=>{ PhysicsInputInstruction::Spawn(mode_id,stage_id)=>{
//spawn at a particular stage //spawn at a particular stage
if let Some(mode)=data.modes.get_mode(mode_id){ if let Some(mode)=data.modes.get_mode(mode_id){
teleport_to_spawn(&mut state.body,&mut state.touching,&state.style,&data.hitbox_mesh,mode,&data.models,stage_id); teleport_to_spawn(
stage_id,
&mut state.move_state,&mut state.body,&mut state.touching,&mut state.run,&mut state.mode_state,
mode,
&data.models,&data.hitbox_mesh,&data.bvh,&state.style,&state.camera,&state.input_state,state.time
);
} }
b_refresh_walk_target=false; b_refresh_walk_target=false;
}, },