milestone: polygons on screen
This commit is contained in:
parent
1d2afcc364
commit
bf1d7cb20f
@ -7,12 +7,62 @@ pub fn generate_indexed_models<R:std::io::Read+std::io::Seek>(input:&mut R)->Res
|
|||||||
Err(e)=>println!("load_bsp::generate_indexed_models read_to_end failed: {:?}",e),
|
Err(e)=>println!("load_bsp::generate_indexed_models read_to_end failed: {:?}",e),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
match vbsp::Bsp::read(s.as_slice()){
|
match vbsp::Bsp::read(s.as_slice()){
|
||||||
Ok(bsp)=>{
|
Ok(bsp)=>{
|
||||||
let mut spawn_point=crate::integer::Planar64Vec3::ZERO;
|
let mut spawn_point=crate::integer::Planar64Vec3::ZERO;
|
||||||
|
|
||||||
let mut indexed_models=Vec::new();
|
let mut indexed_models=Vec::new();
|
||||||
|
|
||||||
|
let vertices: Vec<_> = bsp
|
||||||
|
.vertices
|
||||||
|
.iter()
|
||||||
|
.map(|vertex| <[f32; 3]>::from(vertex.position*0.01))
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
println!("num vertices={}",vertices.len());
|
||||||
|
|
||||||
|
for world_model in bsp.models(){
|
||||||
|
|
||||||
|
let world_polygons:Vec<obj::SimplePolygon> = world_model
|
||||||
|
.faces()
|
||||||
|
.filter(|face| face.is_visible())
|
||||||
|
.map(|face| {
|
||||||
|
face.vertex_indexes()
|
||||||
|
.map(|vertex_index| obj::IndexTuple(vertex_index as usize, Some(0), Some(0)))
|
||||||
|
.collect()
|
||||||
|
})
|
||||||
|
.map(obj::SimplePolygon)
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
println!("num world_polygons={}",world_polygons.len());
|
||||||
|
|
||||||
|
let world_object = obj::Object {
|
||||||
|
name: "".to_string(),
|
||||||
|
groups: vec![obj::Group {
|
||||||
|
name: "".to_string(),
|
||||||
|
index: 0,
|
||||||
|
material: None,
|
||||||
|
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()});
|
||||||
|
}
|
||||||
|
|
||||||
|
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,
|
||||||
|
Loading…
Reference in New Issue
Block a user