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

grab normals

Browse Source
This commit is contained in:
Quaternions 2024-01-08 19:54:29 -08:00
parent 0416f002ac
commit 8565669166
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/load_bsp.rs
View File

@ -22,7 +22,7 @@ pub fn generate_indexed_models<R:std::io::Read+std::io::Seek>(input:&mut R)->Res
//non-deduplicated //non-deduplicated
let mut spam_pos=Vec::new(); let mut spam_pos=Vec::new();
let mut spam_tex=Vec::new(); let mut spam_tex=Vec::new();
let mut spam_normal=vec![[0.0,1.0,0.0]]; let mut spam_normal=Vec::new();
let mut spam_vertices=Vec::new(); let mut spam_vertices=Vec::new();
let groups=world_model.faces() let groups=world_model.faces()
.filter(|face| face.is_visible())//TODO: look at this .filter(|face| face.is_visible())//TODO: look at this
@ -32,6 +32,11 @@ pub fn generate_indexed_models<R:std::io::Read+std::io::Seek>(input:&mut R)->Res
let (s,t)=(glam::Vec3A::from_slice(&face_texture.texture_transforms_u[0..3]),glam::Vec3A::from_slice(&face_texture.texture_transforms_v[0..3])); let (s,t)=(glam::Vec3A::from_slice(&face_texture.texture_transforms_u[0..3]),glam::Vec3A::from_slice(&face_texture.texture_transforms_v[0..3]));
let (s0,t0)=(face_texture.texture_transforms_u[3],face_texture.texture_transforms_v[3]); let (s0,t0)=(face_texture.texture_transforms_u[3],face_texture.texture_transforms_v[3]);
//normal
let normal=face.normal();
let normal_idx=spam_normal.len() as u32;
spam_normal.push(crate::integer::Planar64Vec3::try_from([normal.x,normal.z,normal.y]).unwrap());
crate::model::IndexedGroup{ crate::model::IndexedGroup{
texture:None, texture:None,
polys:vec![crate::model::IndexedPolygon{vertices:face.vertex_indexes().map(|vertex_index|{ polys:vec![crate::model::IndexedPolygon{vertices:face.vertex_indexes().map(|vertex_index|{
@ -48,7 +53,7 @@ pub fn generate_indexed_models<R:std::io::Read+std::io::Seek>(input:&mut R)->Res
spam_vertices.push(crate::model::IndexedVertex{ spam_vertices.push(crate::model::IndexedVertex{
pos: pos_idx as u32, pos: pos_idx as u32,
tex: tex_idx as u32, tex: tex_idx as u32,
normal: 0, normal: normal_idx,
color: 0, color: 0,
}); });
i i
@ -58,7 +63,7 @@ pub fn generate_indexed_models<R:std::io::Read+std::io::Seek>(input:&mut R)->Res
crate::model::IndexedModel{ crate::model::IndexedModel{
unique_pos:spam_pos.into_iter().map(|v|crate::integer::Planar64Vec3::try_from(v).unwrap()).collect(), unique_pos:spam_pos.into_iter().map(|v|crate::integer::Planar64Vec3::try_from(v).unwrap()).collect(),
unique_tex:spam_tex.into_iter().map(|v|crate::model::TextureCoordinate::from_array(v)).collect(), unique_tex:spam_tex.into_iter().map(|v|crate::model::TextureCoordinate::from_array(v)).collect(),
unique_normal:spam_normal.into_iter().map(|v|crate::integer::Planar64Vec3::try_from(v).unwrap()).collect(), unique_normal:spam_normal,
unique_color:vec![glam::Vec4::ONE], unique_color:vec![glam::Vec4::ONE],
unique_vertices:spam_vertices, unique_vertices:spam_vertices,
groups, groups,