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

make a bit better

Browse Source
This commit is contained in:
Quaternions 2024-01-08 18:29:57 -08:00
parent bf1d7cb20f
commit d8043a9265
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/load_bsp.rs
View File

@ -1,4 +1,4 @@
const VALVE_SCALE:f32=1.0/16.0;
pub fn generate_indexed_models<R:std::io::Read+std::io::Seek>(input:&mut R)->Result<crate::model::IndexedModelInstances,vbsp::BspError>{ pub fn generate_indexed_models<R:std::io::Read+std::io::Seek>(input:&mut R)->Result<crate::model::IndexedModelInstances,vbsp::BspError>{
let mut s=Vec::new(); let mut s=Vec::new();
@ -16,13 +16,10 @@ pub fn generate_indexed_models<R:std::io::Read+std::io::Seek>(input:&mut R)->Res
let vertices: Vec<_> = bsp let vertices: Vec<_> = bsp
.vertices .vertices
.iter() .iter()
.map(|vertex| <[f32; 3]>::from(vertex.position*0.01)) .map(|vertex|[vertex.position.x*VALVE_SCALE,vertex.position.z*VALVE_SCALE,vertex.position.y*VALVE_SCALE])
.collect(); .collect();
println!("num vertices={}",vertices.len()); let world_objects=bsp.models().map(|world_model|{
for world_model in bsp.models(){
let world_polygons:Vec<obj::SimplePolygon> = world_model let world_polygons:Vec<obj::SimplePolygon> = world_model
.faces() .faces()
.filter(|face| face.is_visible()) .filter(|face| face.is_visible())
@ -34,9 +31,7 @@ pub fn generate_indexed_models<R:std::io::Read+std::io::Seek>(input:&mut R)->Res
.map(obj::SimplePolygon) .map(obj::SimplePolygon)
.collect(); .collect();
println!("num world_polygons={}",world_polygons.len()); obj::Object {
let world_object = obj::Object {
name: "".to_string(), name: "".to_string(),
groups: vec![obj::Group { groups: vec![obj::Group {
name: "".to_string(), name: "".to_string(),
@ -44,25 +39,25 @@ pub fn generate_indexed_models<R:std::io::Read+std::io::Seek>(input:&mut R)->Res
material: None, material: None,
polys: world_polygons, polys: world_polygons,
}], }],
};
let obj_data = obj::ObjData {
position: vertices.clone(),//TODO: don't clone all vertices lmao
texture: vec![[0.0,0.0]],
normal: vec![[1.0,0.0,0.0]],
objects: vec![world_object],
material_libs: Vec::new(),
};
let mut new_indexed_models=crate::model::generate_indexed_model_list_from_obj(obj_data,glam::Vec4::ONE);
for indexed_model in &mut new_indexed_models{
indexed_model.instances.push(crate::model::ModelInstance{attributes:crate::model::CollisionAttributes::Decoration,..Default::default()});
} }
}).collect();
indexed_models.append(&mut new_indexed_models); let obj_data = obj::ObjData {
position: vertices,
texture: vec![[0.0,0.0]],
normal: vec![[1.0,0.0,0.0]],
objects: world_objects,
material_libs: Vec::new(),
};
let mut new_indexed_models=crate::model::generate_indexed_model_list_from_obj(obj_data,glam::Vec4::ONE);
for indexed_model in &mut new_indexed_models{
indexed_model.instances.push(crate::model::ModelInstance{attributes:crate::model::CollisionAttributes::Decoration,..Default::default()});
} }
indexed_models.append(&mut new_indexed_models);
Ok(crate::model::IndexedModelInstances{ Ok(crate::model::IndexedModelInstances{
textures:Vec::new(), textures:Vec::new(),
models:indexed_models, models:indexed_models,