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

rewrite model generation to use indexed rendering

Browse Source
This commit is contained in:
Quaternions 2023-09-07 16:03:51 -07:00
parent e28e94e4c9
commit 5e235b97df
1 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/main.rs
View File

@ -254,7 +254,6 @@ impl strafe_client::framework::Example for Skybox {
continue; continue;
} }
//simply draw a box //simply draw a box
let mut vertices = Vec::new();
let face_data = [ let face_data = [
[0.0f32, 0., 1.], [0.0f32, 0., 1.],
[0.0f32, 0., -1.], [0.0f32, 0., -1.],
@ -263,6 +262,12 @@ impl strafe_client::framework::Example for Skybox {
[0.0f32, 1., 0.], [0.0f32, 1., 0.],
[0.0f32, -1., 0.], [0.0f32, -1., 0.],
]; ];
let texture_data = [
[1.0f32, 0.],
[0.0f32, 0.],
[0.0f32, 1.],
[1.0f32, 1.],
];
let vertex_data = [ let vertex_data = [
// top (0, 0, 1) // top (0, 0, 1)
[-1.0f32, -1., 1.], [-1.0f32, -1., 1.],
@ -295,42 +300,61 @@ impl strafe_client::framework::Example for Skybox {
[-1.0f32, -1., -1.], [-1.0f32, -1., -1.],
[1.0f32, -1., -1.], [1.0f32, -1., -1.],
]; ];
let mut indices = Vec::new();
let mut vertices = Vec::new();
let mut vertex_index = std::collections::HashMap::<usize,u16>::new();
for face in 0..6 { for face in 0..6 {
for end_index in 2..4 { for end_index in 2..4 {
for &index in &[0, end_index - 1, end_index] { for &index in &[0, end_index - 1, end_index] {
vertices.push(Vertex { let vert = face*4+index;
pos: vertex_data[face*4+index], let unique_id=vert * 1<<0 + index * 1<<8 + face * 1<<16;
normal: face_data[face], if let Some(&i)=vertex_index.get(&unique_id){
}) indices.push(i as u16);
}else{
let i=vertices.len() as u16;
vertices.push(Vertex {
pos: vertex_data[vert],
texture: texture_data[index],
normal: face_data[face],
});
vertex_index.insert(unique_id,i);
indices.push(i);
}
} }
} }
} }
let index_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: Some("Index"),
contents: bytemuck::cast_slice(&indices),
usage: wgpu::BufferUsages::INDEX,
});
let mut entities = Vec::<Entity>::new();
entities.push(Entity {
index_buf,
index_count: indices.len() as u32,
});
let vertex_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { let vertex_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: Some("Vertex"), label: Some("Vertex"),
contents: bytemuck::cast_slice(&vertices), contents: bytemuck::cast_slice(&vertices),
usage: wgpu::BufferUsages::VERTEX, usage: wgpu::BufferUsages::VERTEX,
}); });
let mut entities = Vec::<Entity>::new();
entities.push(Entity {
vertex_count: vertices.len() as u32,
vertex_buf,
});
modeldatas.push(ModelData { modeldatas.push(ModelData {
transform: glam::Affine3A::from_translation( transform: glam::Mat4::from_translation(
glam::Vec3::new(cf.position.x,cf.position.y-13f32,cf.position.z) glam::Vec3::new(cf.position.x,cf.position.y-13f32,cf.position.z)
) )
* glam::Affine3A::from_mat3( * glam::Mat4::from_mat3(
glam::Mat3::from_cols( glam::Mat3::from_cols(
glam::Vec3::new(cf.orientation.x.x,cf.orientation.x.y,cf.orientation.x.z), glam::Vec3::new(cf.orientation.x.x,cf.orientation.x.y,cf.orientation.x.z),
glam::Vec3::new(cf.orientation.y.x,cf.orientation.y.y,cf.orientation.y.z), glam::Vec3::new(cf.orientation.y.x,cf.orientation.y.y,cf.orientation.y.z),
glam::Vec3::new(cf.orientation.z.x,cf.orientation.z.y,cf.orientation.z.z), glam::Vec3::new(cf.orientation.z.x,cf.orientation.z.y,cf.orientation.z.z),
), ),
) )
* glam::Affine3A::from_scale( * glam::Mat4::from_scale(
glam::Vec3::new(size.x,size.y,size.z)/2.0 glam::Vec3::new(size.x,size.y,size.z)/2.0
), ),
vertex_buf,
entities, entities,
}) });
} }
} }
}, },