delete unused code
This commit is contained in:
parent
6c1ce904ec
commit
35a0d0d655
98
src/main.rs
98
src/main.rs
@ -1,5 +1,3 @@
|
|||||||
use strafesnet_common::{model,integer};
|
|
||||||
|
|
||||||
mod setup;
|
mod setup;
|
||||||
mod window;
|
mod window;
|
||||||
mod worker;
|
mod worker;
|
||||||
@ -13,102 +11,6 @@ mod model_graphics;
|
|||||||
mod physics_worker;
|
mod physics_worker;
|
||||||
mod graphics_worker;
|
mod graphics_worker;
|
||||||
|
|
||||||
fn load_file(path: std::path::PathBuf)->Option<model::IndexedModelInstances>{
|
|
||||||
println!("Loading file: {:?}", &path);
|
|
||||||
//oh boy! let's load the map!
|
|
||||||
if let Ok(file)=std::fs::File::open(path){
|
|
||||||
let mut input = std::io::BufReader::new(file);
|
|
||||||
let mut first_8=[0u8;8];
|
|
||||||
//.rbxm roblox binary = "<roblox!"
|
|
||||||
//.rbxmx roblox xml = "<roblox "
|
|
||||||
//.bsp = "VBSP"
|
|
||||||
//.vmf =
|
|
||||||
//.snf = "SNMF"
|
|
||||||
//.snf = "SNBF"
|
|
||||||
if let (Ok(()),Ok(()))=(std::io::Read::read_exact(&mut input, &mut first_8),std::io::Seek::rewind(&mut input)){
|
|
||||||
match &first_8[0..4]{
|
|
||||||
b"<rob"=>{
|
|
||||||
match match &first_8[4..8]{
|
|
||||||
b"lox!"=>rbx_binary::from_reader(input).map_err(|e|format!("{:?}",e)),
|
|
||||||
b"lox "=>rbx_xml::from_reader(input,rbx_xml::DecodeOptions::default()).map_err(|e|format!("{:?}",e)),
|
|
||||||
other=>Err(format!("Unknown Roblox file type {:?}",other)),
|
|
||||||
}{
|
|
||||||
Ok(dom)=>Some(load_roblox::generate_indexed_models(dom)),
|
|
||||||
Err(e)=>{
|
|
||||||
println!("Error loading roblox file:{:?}",e);
|
|
||||||
None
|
|
||||||
},
|
|
||||||
}
|
|
||||||
},
|
|
||||||
b"VBSP"=>load_bsp::generate_indexed_models(&mut input).ok(),
|
|
||||||
//b"SNFM"=>Some(sniffer::generate_indexed_models(input)),
|
|
||||||
//b"SNFB"=>Some(sniffer::load_bot(input)),
|
|
||||||
other=>{
|
|
||||||
println!("loser file {:?}",other);
|
|
||||||
None
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
println!("Failed to read first 8 bytes and seek back to beginning of file.");
|
|
||||||
None
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
println!("Could not open file");
|
|
||||||
None
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn default_models()->model::IndexedModelInstances{
|
|
||||||
let mut indexed_models = Vec::new();
|
|
||||||
indexed_models.push(primitives::unit_sphere());
|
|
||||||
indexed_models.push(primitives::unit_cylinder());
|
|
||||||
indexed_models.push(primitives::unit_cube());
|
|
||||||
println!("models.len = {:?}", indexed_models.len());
|
|
||||||
//quad monkeys
|
|
||||||
indexed_models[0].instances.push(model::ModelInstance{
|
|
||||||
transform:integer::Planar64Affine3::try_from(glam::Affine3A::from_translation(glam::vec3(10.,5.,10.))).unwrap(),
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
indexed_models[0].instances.push(model::ModelInstance{
|
|
||||||
transform:integer::Planar64Affine3::try_from(glam::Affine3A::from_translation(glam::vec3(20.,5.,10.))).unwrap(),
|
|
||||||
color:glam::vec4(1.0,0.0,0.0,1.0),
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
indexed_models[0].instances.push(model::ModelInstance{
|
|
||||||
transform:integer::Planar64Affine3::try_from(glam::Affine3A::from_translation(glam::vec3(10.,5.,20.))).unwrap(),
|
|
||||||
color:glam::vec4(0.0,1.0,0.0,1.0),
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
indexed_models[0].instances.push(model::ModelInstance{
|
|
||||||
transform:integer::Planar64Affine3::try_from(glam::Affine3A::from_translation(glam::vec3(20.,5.,20.))).unwrap(),
|
|
||||||
color:glam::vec4(0.0,0.0,1.0,1.0),
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
//decorative monkey
|
|
||||||
indexed_models[0].instances.push(model::ModelInstance{
|
|
||||||
transform:integer::Planar64Affine3::try_from(glam::Affine3A::from_translation(glam::vec3(15.,10.,15.))).unwrap(),
|
|
||||||
color:glam::vec4(0.5,0.5,0.5,0.5),
|
|
||||||
attributes:model::CollisionAttributes::Decoration,
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
//teapot
|
|
||||||
indexed_models[1].instances.push(model::ModelInstance{
|
|
||||||
transform:integer::Planar64Affine3::try_from(glam::Affine3A::from_scale_rotation_translation(glam::vec3(0.5, 1.0, 0.2),glam::quat(-0.22248298016985793,-0.839457167990537,-0.05603504040830783,-0.49261857546227916),glam::vec3(-10.,7.,10.))).unwrap(),
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
//ground
|
|
||||||
indexed_models[2].instances.push(model::ModelInstance{
|
|
||||||
transform:integer::Planar64Affine3::try_from(glam::Affine3A::from_translation(glam::vec3(0.,0.,0.))*glam::Affine3A::from_scale(glam::vec3(160.0, 1.0, 160.0))).unwrap(),
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
model::IndexedModelInstances{
|
|
||||||
textures:Vec::new(),
|
|
||||||
models:indexed_models,
|
|
||||||
spawn_point:integer::Planar64Vec3::Y*50,
|
|
||||||
modes:Vec::new(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn main(){
|
fn main(){
|
||||||
setup::setup_and_start(format!("Strafe Client v{}",env!("CARGO_PKG_VERSION")));
|
setup::setup_and_start(format!("Strafe Client v{}",env!("CARGO_PKG_VERSION")));
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user