StrafesNET/strafe-project
6
Fork 4
Code Issues 1 Pull Requests 1 Packages Projects Releases 1 Wiki Activity

notes

Browse Source
This commit is contained in:
Quaternions 2025-01-07 05:59:31 -08:00
parent 63fbc94287
commit 479e657251
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
strafe-client/src/model_physics.rs
View File

@ -787,6 +787,7 @@ impl MinkowskiMesh<'_>{
impl MeshQuery<MinkowskiFace,MinkowskiDirectedEdge,MinkowskiVert> for MinkowskiMesh<'_>{ impl MeshQuery<MinkowskiFace,MinkowskiDirectedEdge,MinkowskiVert> for MinkowskiMesh<'_>{
type Normal=Vector3<Fixed<3,96>>; type Normal=Vector3<Fixed<3,96>>;
type Offset=Fixed<4,128>; type Offset=Fixed<4,128>;
// TODO: relative d
fn face_nd(&self,face_id:MinkowskiFace)->(Self::Normal,Self::Offset){ fn face_nd(&self,face_id:MinkowskiFace)->(Self::Normal,Self::Offset){
match face_id{ match face_id{
MinkowskiFace::VertFace(v0,f1)=>{ MinkowskiFace::VertFace(v0,f1)=>{

4
strafe-client/src/physics.rs
View File

@ -1092,7 +1092,7 @@ impl instruction::InstructionConsumer<PhysicsInstruction> for PhysicsContext{
} }
} }
impl instruction::InstructionEmitter<PhysicsInternalInstruction> for PhysicsContext{ impl instruction::InstructionEmitter<PhysicsInternalInstruction> for PhysicsContext{
//this little next instruction function can cache its return value and invalidate the cached value by watching the State. //this little next instruction function could cache its return value and invalidate the cached value by watching the State.
fn next_instruction(&self,time_limit:Time)->Option<TimedInstruction<PhysicsInternalInstruction>>{ fn next_instruction(&self,time_limit:Time)->Option<TimedInstruction<PhysicsInternalInstruction>>{
next_instruction_internal(&self.state,&self.data,time_limit) next_instruction_internal(&self.state,&self.data,time_limit)
} }
@ -1488,6 +1488,7 @@ struct CheckpointCheckOutcome{
teleport_to_model:Option<ModelId>, teleport_to_model:Option<ModelId>,
} }
// stage_element.touch_result(mode,mode_state)
fn checkpoint_check( fn checkpoint_check(
mode_state:&ModeState, mode_state:&ModeState,
stage_element:&gameplay_modes::StageElement, stage_element:&gameplay_modes::StageElement,
@ -1498,7 +1499,6 @@ fn checkpoint_check(
//check if current stage is complete //check if current stage is complete
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?
return CheckpointCheckOutcome{ return CheckpointCheckOutcome{
set_stage:None, set_stage:None,
teleport_to_model:Some(current_stage.spawn()), teleport_to_model:Some(current_stage.spawn()),