StrafesNET/strafe-client
5
Fork 3
Code Issues 2 Pull Requests 1 Packages Projects Releases 1 Wiki Activity

make proper model data and stop passing device into add_obj

Browse Source
This commit is contained in:
Quaternions 2023-09-20 22:29:33 -07:00
parent 1878528a4f
commit 0135b17917
1 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/main.rs
View File

@ -17,11 +17,10 @@ struct Entity {
index_buf: wgpu::Buffer, index_buf: wgpu::Buffer,
} }
//temp?
struct ModelData { struct ModelData {
transforms: Vec<glam::Mat4>, transforms: Vec<glam::Mat4>,
vertex_buf: wgpu::Buffer, vertices: Vec<Vertex>,
entities: Vec<Entity>, entities: Vec<Vec<u16>>,
} }
struct ModelGraphics { struct ModelGraphics {
@ -171,11 +170,14 @@ fn get_transform_uniform_data(transforms:&Vec<glam::Mat4>) -> Vec<f32> {
raw raw
} }
fn add_obj(device:&wgpu::Device,modeldatas:& mut Vec<ModelData>,data:obj::ObjData){ fn generate_modeldatas(data:obj::ObjData) -> Vec<ModelData>{
let mut modeldatas=Vec::new();
let mut vertices = Vec::new(); let mut vertices = Vec::new();
let mut vertex_index = std::collections::HashMap::<obj::IndexTuple,u16>::new(); let mut vertex_index = std::collections::HashMap::<obj::IndexTuple,u16>::new();
for object in data.objects { for object in data.objects {
let mut entities = Vec::<Entity>::new(); vertices.clear();
vertex_index.clear();
let mut entities = Vec::new();
for group in object.groups { for group in object.groups {
let mut indices = Vec::new(); let mut indices = Vec::new();
for poly in group.polys { for poly in group.polys {
@ -197,27 +199,15 @@ fn add_obj(device:&wgpu::Device,modeldatas:& mut Vec<ModelData>,data:obj::ObjDat
} }
} }
} }
let index_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { entities.push(indices);
label: Some("Index"),
contents: bytemuck::cast_slice(&indices),
usage: wgpu::BufferUsages::INDEX,
});
entities.push(Entity {
index_buf,
index_count: indices.len() as u32,
});
} }
let vertex_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: Some("Vertex"),
contents: bytemuck::cast_slice(&vertices),
usage: wgpu::BufferUsages::VERTEX,
});
modeldatas.push(ModelData { modeldatas.push(ModelData {
transforms: vec![glam::Mat4::default()], transforms: vec![glam::Mat4::default()],
vertex_buf, vertices:vertices.clone(),
entities, entities,
}) });
} }
modeldatas
} }
impl strafe_client::framework::Example for GraphicsData { impl strafe_client::framework::Example for GraphicsData {
@ -233,7 +223,6 @@ impl strafe_client::framework::Example for GraphicsData {
device: &wgpu::Device, device: &wgpu::Device,
queue: &wgpu::Queue, queue: &wgpu::Queue,
) -> Self { ) -> Self {
let mut modeldatas = Vec::<ModelData>::new();
let ground=obj::ObjData{ let ground=obj::ObjData{
position: vec![[-1.0,0.0,-1.0],[1.0,0.0,-1.0],[1.0,0.0,1.0],[-1.0,0.0,1.0]], position: vec![[-1.0,0.0,-1.0],[1.0,0.0,-1.0],[1.0,0.0,1.0],[-1.0,0.0,1.0]],
texture: vec![[-10.0,-10.0],[10.0,-10.0],[10.0,10.0],[-10.0,10.0]], texture: vec![[-10.0,-10.0],[10.0,-10.0],[10.0,10.0],[-10.0,10.0]],
@ -254,10 +243,11 @@ impl strafe_client::framework::Example for GraphicsData {
}], }],
material_libs: Vec::new(), material_libs: Vec::new(),
}; };
add_obj(device,& mut modeldatas,obj::ObjData::load_buf(&include_bytes!("../models/teslacyberv3.0.obj")[..]).unwrap()); let mut modeldatas = Vec::<ModelData>::new();
add_obj(device,& mut modeldatas,obj::ObjData::load_buf(&include_bytes!("../models/suzanne.obj")[..]).unwrap()); modeldatas.append(&mut generate_modeldatas(obj::ObjData::load_buf(&include_bytes!("../models/teslacyberv3.0.obj")[..]).unwrap()));
add_obj(device,& mut modeldatas,obj::ObjData::load_buf(&include_bytes!("../models/teapot.obj")[..]).unwrap()); modeldatas.append(&mut generate_modeldatas(obj::ObjData::load_buf(&include_bytes!("../models/suzanne.obj")[..]).unwrap()));
add_obj(device,& mut modeldatas,ground); modeldatas.append(&mut generate_modeldatas(obj::ObjData::load_buf(&include_bytes!("../models/teapot.obj")[..]).unwrap()));
modeldatas.append(&mut generate_modeldatas(ground));
println!("models.len = {:?}", modeldatas.len()); println!("models.len = {:?}", modeldatas.len());
modeldatas[0].transforms[0]=glam::Mat4::from_translation(glam::vec3(10.,0.,-10.)); modeldatas[0].transforms[0]=glam::Mat4::from_translation(glam::vec3(10.,0.,-10.));
modeldatas[1].transforms[0]=glam::Mat4::from_translation(glam::vec3(10.,5.,10.)); modeldatas[1].transforms[0]=glam::Mat4::from_translation(glam::vec3(10.,5.,10.));
@ -533,11 +523,26 @@ impl strafe_client::framework::Example for GraphicsData {
], ],
label: Some(format!("ModelGraphics{}",i).as_str()), label: Some(format!("ModelGraphics{}",i).as_str()),
}); });
let vertex_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
label: Some("Vertex"),
contents: bytemuck::cast_slice(&modeldata.vertices),
usage: wgpu::BufferUsages::VERTEX,
});
//all of these are being moved here //all of these are being moved here
models.push(ModelGraphics{ models.push(ModelGraphics{
transforms: modeldata.transforms, transforms:modeldata.transforms,
vertex_buf:modeldata.vertex_buf, vertex_buf,
entities: modeldata.entities, entities: modeldata.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(),
bind_group: model_bind_group, bind_group: model_bind_group,
model_buf, model_buf,
}) })