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

lol idk #1

Open
Quaternions wants to merge 99 commits from StrafesNET/strafe-client:master into master
pull from: StrafesNET/strafe-client:master
merge into: Royiex:master
Conversation 0 Commits 99 Files Changed 29 +20 -16
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 62b5ba2b33 - Show all commits

16
src/graphics.rs
View File

@ -419,10 +419,8 @@ impl GraphicsState{
//this mut be combined in a more complex way if the models use different render patterns per group //this mut be combined in a more complex way if the models use different render patterns per group
let mut indices=Vec::new(); let mut indices=Vec::new();
for poly in model.polys.polys(){ for poly in model.polys.polys(){
for end_index in 2..poly.len(){ let mut poly_vertices=poly.iter()
for index in [0,end_index-1,end_index]{ .map(|&vertex_index|*index_from_vertex.entry(vertex_index).or_insert_with(||{
let vertex_index=poly[index];
indices.push(*index_from_vertex.entry(vertex_index).or_insert_with(||{
let i=vertices.len(); let i=vertices.len();
let vertex=&model.unique_vertices[vertex_index.get() as usize]; let vertex=&model.unique_vertices[vertex_index.get() as usize];
vertices.push(GraphicsVertex{ vertices.push(GraphicsVertex{
@ -433,8 +431,14 @@ impl GraphicsState{
}); });
i i
})); }));
}
} let a=poly_vertices.next().unwrap();
let mut b=poly_vertices.next().unwrap();
poly_vertices.for_each(|c|{
indices.extend([a,b,c]);
b=c;
});
} }
GraphicsMeshOwnedRenderConfig{ GraphicsMeshOwnedRenderConfig{
instances:model.instances, instances:model.instances,