StrafesNET/strafe-project
7
Fork 4
Code Issues 18 Pull Requests Packages Projects Releases 2 Wiki Activity

type safe enough

Browse Source
This commit is contained in:
Rhys Lloyd
2025-12-16 11:21:11 -08:00
parent 261ac43d26
commit 8250e8e0d0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/graphics/src/graphics.rs
View File

@@ -206,9 +206,9 @@ impl GraphicsState{
if (u32::MAX as usize)<vertices.len(){
panic!("Model has too many vertices!");
}else if (u16::MAX as usize)<vertices.len(){
Indices::new(device,&$indices.into_iter().map(|vertex_idx|vertex_idx as u32).collect(),wgpu::IndexFormat::Uint32)
Indices::new(device,&$indices.into_iter().map(|vertex_idx|vertex_idx.get() as u32).collect(),wgpu::IndexFormat::Uint32)
}else{
Indices::new(device,&$indices.into_iter().map(|vertex_idx|vertex_idx as u16).collect(),wgpu::IndexFormat::Uint16)
Indices::new(device,&$indices.into_iter().map(|vertex_idx|vertex_idx.get() as u16).collect(),wgpu::IndexFormat::Uint16)
}
};
}
@@ -236,7 +236,7 @@ impl GraphicsState{
};
DebugGraphicsMesh{
verts:indices!(0..vertices.len()),
verts:indices!((0..vertices.len() as u32).map(strafesnet_physics::model::MeshVertId::new)),
submeshes,
vertex_buf,
}

8
engine/physics/src/model.rs
View File

@@ -448,16 +448,16 @@ impl PhysicsMeshView<'_>{
pub fn verts(&self)->&[MeshVertId]{
&self.topology.verts
}
pub fn edge_vert_ids_iter(&self)->impl Iterator<Item=[u32;2]>+'_{
pub fn edge_vert_ids_iter(&self)->impl Iterator<Item=[MeshVertId;2]>+'_{
self.topology.edge_topology.iter().map(|edge|{
edge.verts.map(|vert_id|self.topology.verts[vert_id.get() as usize].get())
edge.verts.map(|vert_id|self.topology.verts[vert_id.get() as usize])
})
}
pub fn face_vert_ids_iter(&self)->impl Iterator<Item=impl Iterator<Item=u32>>+'_{
pub fn face_vert_ids_iter(&self)->impl Iterator<Item=impl Iterator<Item=MeshVertId>>+'_{
self.topology.face_topology.iter().map(|face|{
face.edges.iter().map(|edge_id|{
let vert_id=self.topology.edge_topology[edge_id.as_undirected().get() as usize].verts[edge_id.parity() as usize];
self.topology.verts[vert_id.get() as usize].get()
self.topology.verts[vert_id.get() as usize]
})
})
}