blocksrey/strafe-client
1
Fork 0
forked from StrafesNET/strafe-client
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change model index_format based on number of vertices

Browse Source
This commit is contained in:
Quaternions 2023-10-30 16:31:17 -07:00
parent 8fcb4e5c6c
commit 953b17bc69
2 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/graphics.rs
View File

@ -8,17 +8,31 @@ pub struct ModelUpdate{
color:Option<glam::Vec4>, color:Option<glam::Vec4>,
} }
struct Entity { struct Entity{
index_count: u32, index_count:u32,
index_buf: wgpu::Buffer, index_buf:wgpu::Buffer,
}
fn create_entities<T:bytemuck::Pod>(device:&wgpu::Device,entities:&Vec<Vec<T>>)->Vec<Entity>{
entities.iter().map(|indices|{
let index_buf=device.create_buffer_init(&wgpu::util::BufferInitDescriptor{
label:Some("Index"),
contents:bytemuck::cast_slice(indices),
usage:wgpu::BufferUsages::INDEX,
});
Entity{
index_buf,
index_count:indices.len() as u32,
}
}).collect()
} }
struct ModelGraphics { struct ModelGraphics{
instances: Vec<ModelGraphicsInstance>, entities:Vec<Entity>,
vertex_buf: wgpu::Buffer, model_buf:wgpu::Buffer,
entities: Vec<Entity>, vertex_buf:wgpu::Buffer,
bind_group: wgpu::BindGroup, bind_group:wgpu::BindGroup,
model_buf: wgpu::Buffer, index_format:wgpu::IndexFormat,
instances:Vec<ModelGraphicsInstance>,
} }
pub struct GraphicsSamplers{ pub struct GraphicsSamplers{
@ -413,7 +427,6 @@ impl GraphicsState{
let models:Vec<ModelGraphicsSingleTexture>=deduplicated_models.into_iter().map(|model|{ let models:Vec<ModelGraphicsSingleTexture>=deduplicated_models.into_iter().map(|model|{
let mut vertices = Vec::new(); let mut vertices = Vec::new();
let mut index_from_vertex = std::collections::HashMap::new();//::<IndexedVertex,usize> let mut index_from_vertex = std::collections::HashMap::new();//::<IndexedVertex,usize>
let mut entities = Vec::new();
//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 group in model.groups { for group in model.groups {
@ -424,7 +437,7 @@ impl GraphicsState{
if let Some(&i)=index_from_vertex.get(&vertex_index){ if let Some(&i)=index_from_vertex.get(&vertex_index){
indices.push(i); indices.push(i);
}else{ }else{
let i=vertices.len() as u16; let i=vertices.len();
let vertex=&model.unique_vertices[vertex_index as usize]; let vertex=&model.unique_vertices[vertex_index as usize];
vertices.push(GraphicsVertex{ vertices.push(GraphicsVertex{
pos: model.unique_pos[vertex.pos as usize], pos: model.unique_pos[vertex.pos as usize],
@ -439,11 +452,14 @@ impl GraphicsState{
} }
} }
} }
entities.push(indices);
ModelGraphicsSingleTexture{ ModelGraphicsSingleTexture{
instances:model.instances, instances:model.instances,
entities:if (u16::MAX as usize)<vertices.len(){
crate::model_graphics::Entities::U32(vec![indices.into_iter().map(|vertex_id|vertex_id as u32).collect()])
}else{
crate::model_graphics::Entities::U16(vec![indices.into_iter().map(|vertex_id|vertex_id as u16).collect()])
},
vertices, vertices,
entities,
texture:model.texture, texture:model.texture,
} }
}).collect(); }).collect();
@ -499,17 +515,14 @@ impl GraphicsState{
self.models.push(ModelGraphics{ self.models.push(ModelGraphics{
instances:instances_chunk.to_vec(), instances:instances_chunk.to_vec(),
vertex_buf, vertex_buf,
entities: model.entities.iter().map(|indices|{ index_format:match &model.entities{
let index_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { crate::model_graphics::Entities::U32(_)=>wgpu::IndexFormat::Uint32,
label: Some("Index"), crate::model_graphics::Entities::U16(_)=>wgpu::IndexFormat::Uint16,
contents: bytemuck::cast_slice(&indices), },
usage: wgpu::BufferUsages::INDEX, entities:match &model.entities{
}); crate::model_graphics::Entities::U32(entities)=>create_entities(device,entities),
Entity { crate::model_graphics::Entities::U16(entities)=>create_entities(device,entities),
index_buf, },
index_count: indices.len() as u32,
}
}).collect(),
bind_group: model_bind_group, bind_group: model_bind_group,
model_buf, model_buf,
}); });
@ -952,9 +965,9 @@ impl GraphicsState{
rpass.set_bind_group(2, &model.bind_group, &[]); rpass.set_bind_group(2, &model.bind_group, &[]);
rpass.set_vertex_buffer(0, model.vertex_buf.slice(..)); rpass.set_vertex_buffer(0, model.vertex_buf.slice(..));
for entity in model.entities.iter() { for entity in model.entities.iter(){
rpass.set_index_buffer(entity.index_buf.slice(..), wgpu::IndexFormat::Uint16); rpass.set_index_buffer(entity.index_buf.slice(..),model.index_format);
rpass.draw_indexed(0..entity.index_count, 0, 0..model.instances.len() as u32); rpass.draw_indexed(0..entity.index_count,0,0..model.instances.len() as u32);
} }
} }

12
src/model_graphics.rs
View File

@ -21,11 +21,15 @@ pub struct IndexedModelGraphicsSingleTexture{
pub groups: Vec<IndexedGroupFixedTexture>, pub groups: Vec<IndexedGroupFixedTexture>,
pub instances:Vec<ModelGraphicsInstance>, pub instances:Vec<ModelGraphicsInstance>,
} }
pub enum Entities{
U32(Vec<Vec<u32>>),
U16(Vec<Vec<u16>>),
}
pub struct ModelGraphicsSingleTexture{ pub struct ModelGraphicsSingleTexture{
pub instances: Vec<ModelGraphicsInstance>, pub instances:Vec<ModelGraphicsInstance>,
pub vertices: Vec<GraphicsVertex>, pub vertices:Vec<GraphicsVertex>,
pub entities: Vec<Vec<u16>>, pub entities:Entities,
pub texture: Option<u32>, pub texture:Option<u32>,
} }
#[derive(Clone,PartialEq)] #[derive(Clone,PartialEq)]
pub struct ModelGraphicsColor4(glam::Vec4); pub struct ModelGraphicsColor4(glam::Vec4);