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

idiot

Browse Source
This commit is contained in:
Quaternions 2023-11-03 19:08:34 -07:00
parent ec9b720138
commit ab60fb2cf7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/model_physics.rs
View File

@ -91,7 +91,7 @@ impl EdgePool{
impl From<&crate::model::IndexedModel> for PhysicsMesh{ impl From<&crate::model::IndexedModel> for PhysicsMesh{
fn from(indexed_model:&crate::model::IndexedModel)->Self{ fn from(indexed_model:&crate::model::IndexedModel)->Self{
let verts=indexed_model.unique_pos.iter().map(|v|Vert(v.clone())).collect(); let verts=indexed_model.unique_pos.iter().map(|v|Vert(v.clone())).collect();
let mut vert_edges=vec![VertRefGuy::default();indexed_model.unique_pos.len()]; let mut vert_edges=vec![VertRefGuy::default();indexed_model.unique_vertices.len()];
let mut edge_pool=EdgePool::default(); let mut edge_pool=EdgePool::default();
let (faces,face_ref_guys):(Vec<Face>,Vec<FaceRefGuy>)=indexed_model.groups[0].polys.iter().enumerate().map(|(i,poly)|{ let (faces,face_ref_guys):(Vec<Face>,Vec<FaceRefGuy>)=indexed_model.groups[0].polys.iter().enumerate().map(|(i,poly)|{
let face_id=FaceId(i); let face_id=FaceId(i);
@ -99,8 +99,8 @@ impl From<&crate::model::IndexedModel> for PhysicsMesh{
let mut normal=Planar64Vec3::ZERO; let mut normal=Planar64Vec3::ZERO;
let len=poly.vertices.len(); let len=poly.vertices.len();
let face_edges=poly.vertices.iter().enumerate().map(|(i,&vert_id)|{ let face_edges=poly.vertices.iter().enumerate().map(|(i,&vert_id)|{
let vert0_id=vert_id as usize; let vert0_id=indexed_model.unique_vertices[vert_id as usize].pos as usize;
let vert1_id=poly.vertices[(i+1)%len] as usize; let vert1_id=indexed_model.unique_vertices[poly.vertices[(i+1)%len] as usize].pos as usize;
//https://www.khronos.org/opengl/wiki/Calculating_a_Surface_Normal (Newell's Method) //https://www.khronos.org/opengl/wiki/Calculating_a_Surface_Normal (Newell's Method)
let v0=indexed_model.unique_pos[vert0_id]; let v0=indexed_model.unique_pos[vert0_id];
let v1=indexed_model.unique_pos[vert1_id]; let v1=indexed_model.unique_pos[vert1_id];
@ -127,7 +127,7 @@ impl From<&crate::model::IndexedModel> for PhysicsMesh{
normal=normal/len as i64; normal=normal/len as i64;
let mut dot=Planar64::ZERO; let mut dot=Planar64::ZERO;
for &v in poly.vertices.iter(){ for &v in poly.vertices.iter(){
dot+=normal.dot(indexed_model.unique_pos[v as usize]); dot+=normal.dot(indexed_model.unique_pos[indexed_model.unique_vertices[v as usize].pos as usize]);
} }
(Face{normal,dot:dot/len as i64},FaceRefGuy(face_edges)) (Face{normal,dot:dot/len as i64},FaceRefGuy(face_edges))
}).unzip(); }).unzip();