clean up shader assets

bevyengine · Dec 17, 2021 · 82a28ae · 82a28ae
1 parent ed20b33
commit 82a28ae
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 30 deletions.
diff --git a/assets/shaders/custom.frag → assets/shaders/custom_material.frag b/assets/shaders/custom.frag → assets/shaders/custom_material.frag
diff --git a/assets/shaders/custom.vert → assets/shaders/custom_material.vert b/assets/shaders/custom.vert → assets/shaders/custom_material.vert
diff --git a/assets/shaders/custom_minimal.wgsl → assets/shaders/custom_material_minimal.wgsl b/assets/shaders/custom_minimal.wgsl → assets/shaders/custom_material_minimal.wgsl
diff --git a/assets/shaders/hot.frag b/assets/shaders/hot.frag
diff --git a/assets/shaders/hot.vert b/assets/shaders/hot.vert
diff --git a/assets/shaders/custom_instancing.wgsl → assets/shaders/instancing.wgsl b/assets/shaders/custom_instancing.wgsl → assets/shaders/instancing.wgsl
diff --git a/examples/shader/shader_instancing.rs b/examples/shader/shader_instancing.rs
@@ -154,7 +154,7 @@ impl FromWorld for CustomPipeline {
         let world = world.cell();
         let asset_server = world.get_resource::<AssetServer>().unwrap();
         asset_server.watch_for_changes().unwrap();
-        let shader = asset_server.load("shaders/custom_instancing.wgsl");
+        let shader = asset_server.load("shaders/instancing.wgsl");
 
         let mesh_pipeline = world.get_resource::<MeshPipeline>().unwrap();
 

diff --git a/examples/shader/shader_material_glsl.rs b/examples/shader/shader_material_glsl.rs
@@ -111,8 +111,8 @@ impl FromWorld for CustomPipeline {
     fn from_world(world: &mut World) -> Self {
         let world = world.cell();
         let asset_server = world.get_resource::<AssetServer>().unwrap();
-        let shader_vert = asset_server.load("shaders/custom.vert");
-        let shader_frag = asset_server.load("shaders/custom.frag");
+        let shader_vert = asset_server.load("shaders/custom_material.vert");
+        let shader_frag = asset_server.load("shaders/custom_material.frag");
 
         let mesh_pipeline = world.get_resource::<MeshPipeline>().unwrap();
 

diff --git a/examples/shader/shader_material_minimal.rs b/examples/shader/shader_material_minimal.rs
@@ -110,7 +110,7 @@ impl FromWorld for CustomPipeline {
     fn from_world(world: &mut World) -> Self {
         let world = world.cell();
         let asset_server = world.get_resource::<AssetServer>().unwrap();
-        let shader = asset_server.load("shaders/custom_minimal.wgsl");
+        let shader = asset_server.load("shaders/custom_material_minimal.wgsl");
         let mesh_pipeline = world.get_resource::<MeshPipeline>().unwrap();
 
         CustomPipeline {