fuck them strings
This commit is contained in:
parent
7b38c71ceb
commit
a5473377a8
@ -24,13 +24,11 @@ pub struct Vertex {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub struct Material {
|
pub struct Material {
|
||||||
pub name: String,
|
|
||||||
pub diffuse_texture: texture::Texture,
|
pub diffuse_texture: texture::Texture,
|
||||||
pub bind_group: wgpu::BindGroup,
|
pub bind_group: wgpu::BindGroup,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct Mesh {
|
pub struct Mesh {
|
||||||
pub name: String,
|
|
||||||
pub vertex_buffer: wgpu::Buffer,
|
pub vertex_buffer: wgpu::Buffer,
|
||||||
pub index_buffer: wgpu::Buffer,
|
pub index_buffer: wgpu::Buffer,
|
||||||
pub num_elements: u32,
|
pub num_elements: u32,
|
||||||
@ -73,7 +71,6 @@ pub fn load_obj(
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
materials.push(Material {
|
materials.push(Material {
|
||||||
name: m.name,
|
|
||||||
diffuse_texture,
|
diffuse_texture,
|
||||||
bind_group,
|
bind_group,
|
||||||
})
|
})
|
||||||
@ -97,18 +94,17 @@ pub fn load_obj(
|
|||||||
}
|
}
|
||||||
|
|
||||||
let vertex_buffer = device.create_buffer_init(&(wgpu::util::BufferInitDescriptor {
|
let vertex_buffer = device.create_buffer_init(&(wgpu::util::BufferInitDescriptor {
|
||||||
label: Some(&(format!("{:?} Vertex Buffer", file_name))),
|
label: Some(&(format!("{:?} vertex buffer", file_name))),
|
||||||
contents: bytemuck::cast_slice(&(vertices)),
|
contents: bytemuck::cast_slice(&(vertices)),
|
||||||
usage: wgpu::BufferUsages::VERTEX,
|
usage: wgpu::BufferUsages::VERTEX,
|
||||||
}));
|
}));
|
||||||
let index_buffer = device.create_buffer_init(&(wgpu::util::BufferInitDescriptor {
|
let index_buffer = device.create_buffer_init(&(wgpu::util::BufferInitDescriptor {
|
||||||
label: Some(&(format!("{:?} Index Buffer", file_name))),
|
label: Some(&(format!("{:?} index buffer", file_name))),
|
||||||
contents: bytemuck::cast_slice(&(mesh.indices)),
|
contents: bytemuck::cast_slice(&(mesh.indices)),
|
||||||
usage: wgpu::BufferUsages::INDEX,
|
usage: wgpu::BufferUsages::INDEX,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
meshes.push(Mesh {
|
meshes.push(Mesh {
|
||||||
name: "x".to_string(),
|
|
||||||
vertex_buffer,
|
vertex_buffer,
|
||||||
index_buffer,
|
index_buffer,
|
||||||
num_elements: mesh.indices.len() as u32,
|
num_elements: mesh.indices.len() as u32,
|
||||||
|
Loading…
Reference in New Issue
Block a user