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

fix all type errors

Browse Source
This commit is contained in:
Quaternions 2024-02-08 19:27:59 -08:00
parent 7403ec8bed
commit fcc52a1215
4 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/model_physics.rs
View File

@ -122,7 +122,7 @@ impl From<MeshId> for PhysicsMeshId{
Self::new(value.get()) Self::new(value.get())
} }
} }
#[derive(Debug,Clone,Copy,Hash,id::Id,Eq,PartialEq)] #[derive(Debug,Default,Clone,Copy,Hash,id::Id,Eq,PartialEq)]
pub struct PhysicsSubmeshId(u32); pub struct PhysicsSubmeshId(u32);
pub struct PhysicsMesh{ pub struct PhysicsMesh{
data:PhysicsMeshData, data:PhysicsMeshData,

27
src/physics.rs
View File

@ -521,12 +521,12 @@ impl From<CollisionAttributesId> for PhysicsAttributesId{
} }
} }
//unique physics meshes indexed by this //unique physics meshes indexed by this
#[derive(Debug,Clone,Copy,Eq,Hash,PartialEq)] #[derive(Debug,Default,Clone,Copy,Eq,Hash,PartialEq)]
struct ConvexMeshId{ struct ConvexMeshId{
model_id:PhysicsModelId, model_id:PhysicsModelId,
submesh_id:PhysicsSubmeshId, submesh_id:PhysicsSubmeshId,
} }
#[derive(Debug,Clone,Copy,Hash,id::Id,Eq,PartialEq)] #[derive(Debug,Default,Clone,Copy,Hash,id::Id,Eq,PartialEq)]
struct PhysicsModelId(u32); struct PhysicsModelId(u32);
impl Into<ModelId> for PhysicsModelId{ impl Into<ModelId> for PhysicsModelId{
fn into(self)->ModelId{ fn into(self)->ModelId{
@ -869,6 +869,16 @@ impl Default for PhysicsState{
} }
} }
} }
impl Default for PhysicsData{
fn default()->Self{
Self{
bvh:bvh::BvhNode::default(),
models:Default::default(),
modes:Default::default(),
hitbox_mesh:StyleModifiers::default().calculate_mesh(),
}
}
}
impl PhysicsState { impl PhysicsState {
pub fn clear(&mut self){ pub fn clear(&mut self){
@ -952,6 +962,7 @@ impl PhysicsState {
} }
} }
} }
#[derive(Default)]
pub struct PhysicsContext{ pub struct PhysicsContext{
pub state:PhysicsState,//this captures the entire state of the physics. pub state:PhysicsState,//this captures the entire state of the physics.
data:PhysicsData,//data currently loaded into memory which is needded for physics to run, but is not part of the state. data:PhysicsData,//data currently loaded into memory which is needded for physics to run, but is not part of the state.
@ -1375,7 +1386,7 @@ fn run_teleport_behaviour(wormhole:&Option<gameplay_attributes::Wormhole>,mode_s
} }
}, },
PhysicsInstruction::Input(input_instruction) => { PhysicsInstruction::Input(input_instruction) => {
let mut refresh_walk_target=true; let mut b_refresh_walk_target=true;
match input_instruction{ match input_instruction{
PhysicsInputInstruction::SetNextMouse(m) => { PhysicsInputInstruction::SetNextMouse(m) => {
state.camera.move_mouse(state.next_mouse.pos); state.camera.move_mouse(state.next_mouse.pos);
@ -1400,11 +1411,11 @@ fn run_teleport_behaviour(wormhole:&Option<gameplay_attributes::Wormhole>,mode_s
(state.move_state,state.body.acceleration)=state.touching.get_move_state(&state.body,&data.models,&state.style,&data.hitbox_mesh,&state.camera,state.controls,&state.next_mouse,state.time); (state.move_state,state.body.acceleration)=state.touching.get_move_state(&state.body,&data.models,&state.style,&data.hitbox_mesh,&state.camera,state.controls,&state.next_mouse,state.time);
} }
} }
refresh_walk_target=false; b_refresh_walk_target=false;
}, },
PhysicsInputInstruction::SetZoom(s) => { PhysicsInputInstruction::SetZoom(s) => {
state.set_control(StyleModifiers::CONTROL_ZOOM,s); state.set_control(StyleModifiers::CONTROL_ZOOM,s);
refresh_walk_target=false; b_refresh_walk_target=false;
}, },
PhysicsInputInstruction::Reset => { PhysicsInputInstruction::Reset => {
//it matters which of these runs first, but I have not thought it through yet as it doesn't matter yet //it matters which of these runs first, but I have not thought it through yet as it doesn't matter yet
@ -1418,11 +1429,11 @@ fn run_teleport_behaviour(wormhole:&Option<gameplay_attributes::Wormhole>,mode_s
set_position(&mut state.body,&mut state.touching,spawn_point); set_position(&mut state.body,&mut state.touching,spawn_point);
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.move_state,state.body.acceleration)=state.touching.get_move_state(&state.body,&data.models,&state.style,&data.hitbox_mesh,&state.camera,state.controls,&state.next_mouse,state.time); (state.move_state,state.body.acceleration)=state.touching.get_move_state(&state.body,&data.models,&state.style,&data.hitbox_mesh,&state.camera,state.controls,&state.next_mouse,state.time);
refresh_walk_target=false; b_refresh_walk_target=false;
}, },
PhysicsInputInstruction::Idle => {refresh_walk_target=false;},//literally idle! PhysicsInputInstruction::Idle => {b_refresh_walk_target=false;},//literally idle!
} }
if refresh_walk_target{ if b_refresh_walk_target{
let a=refresh_walk_target(state,data); let a=refresh_walk_target(state,data);
if set_acceleration_cull(&mut state.body,&mut state.touching,&data.models,&data.hitbox_mesh,a){ if set_acceleration_cull(&mut state.body,&mut state.touching,&data.models,&data.hitbox_mesh,a){
(state.move_state,state.body.acceleration)=state.touching.get_move_state(&state.body,&data.models,&state.style,&data.hitbox_mesh,&state.camera,state.controls,&state.next_mouse,state.time); (state.move_state,state.body.acceleration)=state.touching.get_move_state(&state.body,&data.models,&state.style,&data.hitbox_mesh,&state.camera,state.controls,&state.next_mouse,state.time);

4
src/setup.rs
View File

@ -214,13 +214,13 @@ pub fn setup_and_start(title:String){
let window=crate::window::WindowContextSetup::new(&setup_context,&window); let window=crate::window::WindowContextSetup::new(&setup_context,&window);
//the thread that spawns the physics thread //the thread that spawns the physics thread
let window_thread=window.into_worker(setup_context); let mut window_thread=window.into_worker(setup_context);
let args:Vec<String>=std::env::args().collect(); let args:Vec<String>=std::env::args().collect();
let indexed_model_instances=if args.len()==2{ let indexed_model_instances=if args.len()==2{
let path=std::path::PathBuf::from(&args[1]); let path=std::path::PathBuf::from(&args[1]);
window_thread.send(TimedInstruction{ window_thread.send(TimedInstruction{
time:0, time:integer::Time::ZERO,
instruction:WindowInstruction::WindowEvent(winit::event::WindowEvent::DroppedFile(path)), instruction:WindowInstruction::WindowEvent(winit::event::WindowEvent::DroppedFile(path)),
}); });
}; };

28
src/window.rs
View File

@ -29,17 +29,17 @@ impl WindowContext<'_>{
winit::event::WindowEvent::DroppedFile(path)=>{ winit::event::WindowEvent::DroppedFile(path)=>{
//blocking because it's simpler... //blocking because it's simpler...
if let Ok(file)=std::fs::File::open(path){ if let Ok(file)=std::fs::File::open(path){
match strafesnet_snf::read_snf(std::io::BufReader::new(file)){ // match strafesnet_snf::read_snf(std::io::BufReader::new(file)){
Ok(strafesnet_snf::SNF::Map(streamable_map))=>{ // Ok(strafesnet_snf::SNF::Map(streamable_map))=>{
if let Ok(indexed_model_instances)=streamable_map.load_all(){ // if let Ok(indexed_model_instances)=streamable_map.load_all(){
self.physics_thread.send(TimedInstruction{time,instruction:crate::physics_worker::Instruction::ClearModels}).unwrap(); // self.physics_thread.send(TimedInstruction{time,instruction:crate::physics_worker::Instruction::ClearModels}).unwrap();
self.physics_thread.send(TimedInstruction{time,instruction:crate::physics_worker::Instruction::GenerateModels(indexed_model_instances)}).unwrap(); // self.physics_thread.send(TimedInstruction{time,instruction:crate::physics_worker::Instruction::GenerateModels(indexed_model_instances)}).unwrap();
} // }
}, // },
Ok(strafesnet_snf::SNF::Bot(streamable_map))=>println!("File type not yet supported"), // Ok(strafesnet_snf::SNF::Bot(streamable_map))=>println!("File type not yet supported"),
Ok(strafesnet_snf::SNF::Demo(streamable_map))=>println!("File type not yet supported"), // Ok(strafesnet_snf::SNF::Demo(streamable_map))=>println!("File type not yet supported"),
Err(e)=>println!("Error reading file: {e:?}"), // Err(e)=>println!("Error reading file: {e:?}"),
} // }
}else{ }else{
println!("Failed to open file {path:?}"); println!("Failed to open file {path:?}");
} }
@ -173,7 +173,7 @@ impl WindowContext<'_>{
pub struct WindowContextSetup<'a>{ pub struct WindowContextSetup<'a>{
user_settings:crate::settings::UserSettings, user_settings:crate::settings::UserSettings,
window:&'a winit::window::Window, window:&'a winit::window::Window,
physics:crate::physics::PhysicsState, physics:crate::physics::PhysicsContext,
graphics:crate::graphics::GraphicsState, graphics:crate::graphics::GraphicsState,
} }
@ -181,8 +181,8 @@ impl<'a> WindowContextSetup<'a>{
pub fn new(context:&crate::setup::SetupContext,window:&'a winit::window::Window)->Self{ pub fn new(context:&crate::setup::SetupContext,window:&'a winit::window::Window)->Self{
let user_settings=crate::settings::read_user_settings(); let user_settings=crate::settings::read_user_settings();
let mut physics=crate::physics::PhysicsState::default(); let mut physics=crate::physics::PhysicsContext::default();
physics.load_user_settings(&user_settings); physics.state.load_user_settings(&user_settings);
let mut graphics=crate::graphics::GraphicsState::new(&context.device,&context.queue,&context.config); let mut graphics=crate::graphics::GraphicsState::new(&context.device,&context.queue,&context.config);
graphics.load_user_settings(&user_settings); graphics.load_user_settings(&user_settings);