diff --git a/assets/shaders/custom.frag b/assets/shaders/custom_material.frag similarity index 100% rename from assets/shaders/custom.frag rename to assets/shaders/custom_material.frag diff --git a/assets/shaders/custom.vert b/assets/shaders/custom_material.vert similarity index 100% rename from assets/shaders/custom.vert rename to assets/shaders/custom_material.vert diff --git a/assets/shaders/custom_minimal.wgsl b/assets/shaders/custom_material_minimal.wgsl similarity index 100% rename from assets/shaders/custom_minimal.wgsl rename to assets/shaders/custom_material_minimal.wgsl diff --git a/assets/shaders/hot.frag b/assets/shaders/hot.frag deleted file mode 100644 index 18c41c8cd5c044..00000000000000 --- a/assets/shaders/hot.frag +++ /dev/null @@ -1,11 +0,0 @@ -#version 450 - -layout(location = 0) out vec4 o_Target; - -layout(set = 2, binding = 0) uniform MyMaterial_color { - vec4 color; -}; - -void main() { - o_Target = color * 0.5; -} diff --git a/assets/shaders/hot.vert b/assets/shaders/hot.vert deleted file mode 100644 index 1809b220dfd904..00000000000000 --- a/assets/shaders/hot.vert +++ /dev/null @@ -1,15 +0,0 @@ -#version 450 - -layout(location = 0) in vec3 Vertex_Position; - -layout(set = 0, binding = 0) uniform CameraViewProj { - mat4 ViewProj; -}; - -layout(set = 1, binding = 0) uniform Transform { - mat4 Model; -}; - -void main() { - gl_Position = ViewProj * Model * vec4(Vertex_Position, 1.0); -} diff --git a/assets/shaders/custom_instancing.wgsl b/assets/shaders/instancing.wgsl similarity index 100% rename from assets/shaders/custom_instancing.wgsl rename to assets/shaders/instancing.wgsl diff --git a/examples/shader/shader_instancing.rs b/examples/shader/shader_instancing.rs index 803c72399cb8d5..818c1f232569a3 100644 --- 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::().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::().unwrap(); diff --git a/examples/shader/shader_material_glsl.rs b/examples/shader/shader_material_glsl.rs index 1a48a118ec696a..1a94820bc6acca 100644 --- 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::().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::().unwrap(); diff --git a/examples/shader/shader_material_minimal.rs b/examples/shader/shader_material_minimal.rs index 28c6ae2b5e6044..a0b098896e407e 100644 --- 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::().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::().unwrap(); CustomPipeline {