Skip to content

Commit fa38ce5

Browse files
Merge pull request #1016 from mitchmindtree/bevy_nannou_derive-nannou-dep
fix: change `bevy_nannou_derive` to only expect the presence of `bevy_nannou`, not the `nannou` crate
2 parents a88f731 + bc13742 commit fa38ce5

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

bevy_nannou_derive/src/lib.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ pub fn shader_model(attr: TokenStream, item: TokenStream) -> TokenStream {
1515

1616
let vertex_shader_impl = vertex_shader
1717
.map(|path| quote! { #path.into() })
18-
.unwrap_or_else(|| quote! { ::nannou::prelude::ShaderRef::Default });
18+
.unwrap_or_else(|| quote! { ::bevy_nannou::prelude::ShaderRef::Default });
1919

2020
let fragment_shader_impl = fragment_shader
2121
.map(|path| quote! { #path.into() })
22-
.unwrap_or_else(|| quote! { ::nannou::prelude::ShaderRef::Default });
22+
.unwrap_or_else(|| quote! { ::bevy_nannou::prelude::ShaderRef::Default });
2323

2424
// Add derive attributes
2525
input
@@ -29,12 +29,12 @@ pub fn shader_model(attr: TokenStream, item: TokenStream) -> TokenStream {
2929
let expanded = quote! {
3030
#input
3131

32-
impl #impl_generics ::nannou::prelude::render::ShaderModel for #name #ty_generics #where_clause {
33-
fn vertex_shader() -> ::nannou::prelude::ShaderRef {
32+
impl #impl_generics ::bevy_nannou::prelude::render::ShaderModel for #name #ty_generics #where_clause {
33+
fn vertex_shader() -> ::bevy_nannou::prelude::ShaderRef {
3434
#vertex_shader_impl
3535
}
3636

37-
fn fragment_shader() -> ::nannou::prelude::ShaderRef {
37+
fn fragment_shader() -> ::bevy_nannou::prelude::ShaderRef {
3838
#fragment_shader_impl
3939
}
4040
}

0 commit comments

Comments
 (0)