diff --git a/src/main.rs b/src/main.rs index dc846669..59faf74b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -24,7 +24,7 @@ struct ModelData { entities: Vec, } -struct Model { +struct ModelGraphics { transform: glam::Mat4, vertex_buf: wgpu::Buffer, entities: Vec, @@ -122,7 +122,7 @@ pub struct Skybox { ground_pipeline: wgpu::RenderPipeline, main_bind_group: wgpu::BindGroup, camera_buf: wgpu::Buffer, - models: Vec, + models: Vec, depth_view: wgpu::TextureView, staging_belt: wgpu::util::StagingBelt, } @@ -316,6 +316,35 @@ impl strafe_client::framework::Example for Skybox { usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST, }); + //drain the modeldata vec so entities can be /moved/ to models.entities + let mut models = Vec::::with_capacity(modeldatas.len()); + for (i,modeldata) in modeldatas.drain(..).enumerate() { + let model_uniforms = get_transform_uniform_data(&modeldata.transform); + let model_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { + label: Some(format!("ModelGraphics{}",i).as_str()), + contents: bytemuck::cast_slice(&model_uniforms), + usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST, + }); + let model_bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor { + layout: &model_bind_group_layout, + entries: &[ + wgpu::BindGroupEntry { + binding: 0, + resource: model_buf.as_entire_binding(), + }, + ], + label: Some(format!("ModelGraphics{}",i).as_str()), + }); + //all of these are being moved here + models.push(ModelGraphics{ + transform: modeldata.transform, + vertex_buf:modeldata.vertex_buf, + entities: modeldata.entities, + bind_group: model_bind_group, + model_buf, + }) + } + let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor { label: None, bind_group_layouts: &[&main_bind_group_layout, &model_bind_group_layout], @@ -511,35 +540,6 @@ impl strafe_client::framework::Example for Skybox { label: Some("Camera"), }); - //drain the modeldata vec so entities can be /moved/ to models.entities - let mut models = Vec::::with_capacity(modeldatas.len()); - for (i,modeldata) in modeldatas.drain(..).enumerate() { - let model_uniforms = get_transform_uniform_data(&modeldata.transform); - let model_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor { - label: Some(format!("Model{}",i).as_str()), - contents: bytemuck::cast_slice(&model_uniforms), - usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST, - }); - let model_bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor { - layout: &model_bind_group_layout, - entries: &[ - wgpu::BindGroupEntry { - binding: 0, - resource: model_buf.as_entire_binding(), - }, - ], - label: Some(format!("Model{}",i).as_str()), - }); - //all of these are being moved here - models.push(Model{ - transform: modeldata.transform, - vertex_buf:modeldata.vertex_buf, - entities: modeldata.entities, - bind_group: model_bind_group, - model_buf, - }) - } - let depth_view = Self::create_depth_texture(config, device); Skybox {