forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a typo in shader_defs example (#3762)

Browse Source 
# Objective

As in title, I'm already looking through these files so may as well rename `pipline` to `pipeline`
This commit is contained in:
luke.biel 2022-01-24 23:44:08 +00:00
parent 514754d650
commit 6d76229c38
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/shader/shader_defs.rs
View File

@ -82,7 +82,7 @@ fn setup(mut commands: Commands, mut meshes: ResMut<Assets<Mesh>>) {
} }
struct IsRedPipeline { struct IsRedPipeline {
mesh_pipline: MeshPipeline, mesh_pipeline: MeshPipeline,
shader: Handle<Shader>, shader: Handle<Shader>,
} }
@ -92,7 +92,7 @@ impl FromWorld for IsRedPipeline {
let mesh_pipeline = world.get_resource::<MeshPipeline>().unwrap(); let mesh_pipeline = world.get_resource::<MeshPipeline>().unwrap();
let shader = asset_server.load("shaders/shader_defs.wgsl"); let shader = asset_server.load("shaders/shader_defs.wgsl");
IsRedPipeline { IsRedPipeline {
mesh_pipline: mesh_pipeline.clone(), mesh_pipeline: mesh_pipeline.clone(),
shader, shader,
} }
} }
@ -106,15 +106,15 @@ impl SpecializedPipeline for IsRedPipeline {
if is_red.0 { if is_red.0 {
shader_defs.push("IS_RED".to_string()); shader_defs.push("IS_RED".to_string());
} }
let mut descriptor = self.mesh_pipline.specialize(pbr_pipeline_key); let mut descriptor = self.mesh_pipeline.specialize(pbr_pipeline_key);
descriptor.vertex.shader = self.shader.clone(); descriptor.vertex.shader = self.shader.clone();
descriptor.vertex.shader_defs = shader_defs.clone(); descriptor.vertex.shader_defs = shader_defs.clone();
let fragment = descriptor.fragment.as_mut().unwrap(); let fragment = descriptor.fragment.as_mut().unwrap();
fragment.shader = self.shader.clone(); fragment.shader = self.shader.clone();
fragment.shader_defs = shader_defs; fragment.shader_defs = shader_defs;
descriptor.layout = Some(vec![ descriptor.layout = Some(vec![
self.mesh_pipline.view_layout.clone(), self.mesh_pipeline.view_layout.clone(),
self.mesh_pipline.mesh_layout.clone(), self.mesh_pipeline.mesh_layout.clone(),
]); ]);
descriptor descriptor
} }