fix derive macro

Author: mockersf

crates/bevy_crevice/bevy-crevice-derive/Cargo.toml

@@ -24,3 +24,4 @@ proc-macro = true
 syn = "1.0.40"
 quote = "1.0.7"
 proc-macro2 = "1.0.21"
+bevy_macro_utils = { path = "../../bevy_macro_utils", version = "0.5.0" }

crates/bevy_crevice/bevy-crevice-derive/src/glsl.rs

@@ -1,8 +1,16 @@
+use bevy_macro_utils::BevyManifest;
 use proc_macro2::{Literal, TokenStream};
 use quote::quote;
 use syn::{parse_quote, Data, DeriveInput, Fields, Path};
 
 pub fn emit(input: DeriveInput) -> TokenStream {
+    let bevy_prefix_path = BevyManifest::default()
+        .maybe_get_path(crate::BEVY_RENDER)
+        .unwrap_or_else(|| Path {
+            leading_colon: None,
+            segments: Default::default(),
+        });
+
     let fields = match &input.data {
         Data::Struct(data) => match &data.fields {
             Fields::Named(fields) => fields,
@@ -12,8 +20,8 @@ pub fn emit(input: DeriveInput) -> TokenStream {
         Data::Enum(_) | Data::Union(_) => panic!("Only structs are supported"),
     };
 
-    let base_trait_path: Path = parse_quote!(::bevy_crevice::glsl::Glsl);
-    let struct_trait_path: Path = parse_quote!(::bevy_crevice::glsl::GlslStruct);
+    let base_trait_path: Path = parse_quote!(#bevy_prefix_path::bevy_crevice::glsl::Glsl);
+    let struct_trait_path: Path = parse_quote!(#bevy_prefix_path::bevy_crevice::glsl::GlslStruct);
 
     let name = input.ident;
     let name_str = Literal::string(&name.to_string());
@@ -23,14 +31,14 @@ pub fn emit(input: DeriveInput) -> TokenStream {
     let glsl_fields = fields.named.iter().map(|field| {
         let field_ty = &field.ty;
         let field_name_str = Literal::string(&field.ident.as_ref().unwrap().to_string());
-        let field_as = quote! {<#field_ty as ::bevy_crevice::glsl::GlslArray>};
+        let field_as = quote! {<#field_ty as #bevy_prefix_path::bevy_crevice::glsl::GlslArray>};
 
         quote! {
             s.push_str("\t");
             s.push_str(#field_as::NAME);
             s.push_str(" ");
             s.push_str(#field_name_str);
-            <#field_as::ArraySize as ::bevy_crevice::glsl::DimensionList>::push_to_string(s);
+            <#field_as::ArraySize as #bevy_prefix_path::bevy_crevice::glsl::DimensionList>::push_to_string(s);
             s.push_str(";\n");
         }
     });

crates/bevy_crevice/bevy-crevice-derive/src/layout.rs

@@ -1,3 +1,4 @@
+use bevy_macro_utils::BevyManifest;
 use proc_macro2::{Span, TokenStream};
 use quote::{format_ident, quote};
 use syn::{parse_quote, Data, DeriveInput, Fields, Ident, Path, Type};
@@ -8,10 +9,17 @@ pub fn emit(
     mod_name: &'static str,
     min_struct_alignment: usize,
 ) -> TokenStream {
+    let bevy_prefix_path = BevyManifest::default()
+        .maybe_get_path(crate::BEVY_RENDER)
+        .unwrap_or_else(|| Path {
+            leading_colon: None,
+            segments: Default::default(),
+        });
+
     let mod_name = Ident::new(mod_name, Span::call_site());
     let trait_name = Ident::new(trait_name, Span::call_site());
 
-    let mod_path: Path = parse_quote!(::bevy_crevice::#mod_name);
+    let mod_path: Path = parse_quote!(#bevy_prefix_path::bevy_crevice::#mod_name);
     let trait_path: Path = parse_quote!(#mod_path::#trait_name);
 
     let as_trait_name = format_ident!("As{}", trait_name);
@@ -63,7 +71,7 @@ pub fn emit(
 
     let field_alignments = fields.iter().map(|field| layout_alignment_of_ty(&field.ty));
     let struct_alignment = quote! {
-        ::bevy_crevice::internal::max_arr([
+        #bevy_prefix_path::bevy_crevice::internal::max_arr([
             #min_struct_alignment,
             #(#field_alignments,)*
         ])
@@ -139,13 +147,13 @@ pub fn emit(
                     // We set our target alignment to the larger of the
                     // alignment due to the previous field and the alignment
                     // requirement of the next field.
-                    let alignment = ::bevy_crevice::internal::max(
+                    let alignment = #bevy_prefix_path::bevy_crevice::internal::max(
                         #next_field_or_self_alignment,
                         min_alignment,
                     );
 
                     // Using everything we've got, compute our padding amount.
-                    ::bevy_crevice::internal::align_offset(starting_offset, alignment)
+                    #bevy_prefix_path::bevy_crevice::internal::align_offset(starting_offset, alignment)
                 }
             }
         })
@@ -222,7 +230,7 @@ pub fn emit(
                     let size = ::core::mem::size_of::<Self>();
                     let align = <Self as #trait_path>::ALIGNMENT;
 
-                    let zeroed: Self = ::bevy_crevice::internal::bytemuck::Zeroable::zeroed();
+                    let zeroed: Self = #bevy_prefix_path::bevy_crevice::internal::bytemuck::Zeroable::zeroed();
 
                     #[derive(Debug)]
                     struct Field {
@@ -253,13 +261,13 @@ pub fn emit(
         #pad_fn_impls
         #struct_definition
 
-        unsafe impl #impl_generics ::bevy_crevice::internal::bytemuck::Zeroable for #generated_name #ty_generics #where_clause {}
-        unsafe impl #impl_generics ::bevy_crevice::internal::bytemuck::Pod for #generated_name #ty_generics #where_clause {}
+        unsafe impl #impl_generics #bevy_prefix_path::bevy_crevice::internal::bytemuck::Zeroable for #generated_name #ty_generics #where_clause {}
+        unsafe impl #impl_generics #bevy_prefix_path::bevy_crevice::internal::bytemuck::Pod for #generated_name #ty_generics #where_clause {}
 
         unsafe impl #impl_generics #mod_path::#trait_name for #generated_name #ty_generics #where_clause {
             const ALIGNMENT: usize = #struct_alignment;
             const PAD_AT_END: bool = true;
-            type Padded = #padded_path<Self, {::bevy_crevice::internal::align_offset(
+            type Padded = #padded_path<Self, {#bevy_prefix_path::bevy_crevice::internal::align_offset(
                     ::core::mem::size_of::<#generated_name>(),
                     #struct_alignment
                 )}>;
@@ -272,7 +280,7 @@ pub fn emit(
                 Self::Output {
                     #generated_struct_field_init
 
-                    ..::bevy_crevice::internal::bytemuck::Zeroable::zeroed()
+                    ..#bevy_prefix_path::bevy_crevice::internal::bytemuck::Zeroable::zeroed()
                 }
             }
 

crates/bevy_crevice/bevy-crevice-derive/src/lib.rs

@@ -28,3 +28,5 @@ pub fn derive_glsl_struct(input: CompilerTokenStream) -> CompilerTokenStream {
 
     CompilerTokenStream::from(expanded)
 }
+
+const BEVY_RENDER: &str = "bevy_render";

crates/bevy_macro_utils/src/lib.rs

@@ -30,7 +30,7 @@ impl Default for BevyManifest {
 }
 
 impl BevyManifest {
-    pub fn get_path(&self, name: &str) -> syn::Path {
+    pub fn maybe_get_path(&self, name: &str) -> Option<syn::Path> {
         const BEVY: &str = "bevy";
         const BEVY_INTERNAL: &str = "bevy_internal";
 
@@ -57,7 +57,9 @@ impl BevyManifest {
 
         deps.and_then(find_in_deps)
             .or_else(|| deps_dev.and_then(find_in_deps))
-            .unwrap_or_else(|| get_path(name))
+    }
+    pub fn get_path(&self, name: &str) -> syn::Path {
+        self.maybe_get_path(name).unwrap_or_else(|| get_path(name))
     }
 }