Enable use of ExtractResource derive macro within bevy_render itself

bevyengine · Mar 28, 2022 · 16cf4e7 · 16cf4e7
1 parent 29a5535
commit 16cf4e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/crates/bevy_render/macros/src/lib.rs b/crates/bevy_render/macros/src/lib.rs
@@ -4,7 +4,10 @@ use bevy_macro_utils::BevyManifest;
 use proc_macro::TokenStream;
 
 pub(crate) fn bevy_render_path() -> syn::Path {
-    BevyManifest::default().get_path("bevy_render")
+    BevyManifest::default()
+        .maybe_get_path("bevy_render")
+        // NOTE: If the derivation is within bevy_render, then we need to return 'crate'
+        .unwrap_or_else(|| BevyManifest::parse_str("crate"))
 }
 
 #[proc_macro_derive(ExtractResource)]

diff --git a/crates/bevy_render/src/view/mod.rs b/crates/bevy_render/src/view/mod.rs
@@ -44,7 +44,7 @@ impl Plugin for ViewPlugin {
     }
 }
 
-#[derive(Clone)]
+#[derive(Clone, ExtractResource)]
 /// Configuration resource for [Multi-Sample Anti-Aliasing](https://en.wikipedia.org/wiki/Multisample_anti-aliasing).
 ///
 /// # Example
@@ -72,12 +72,6 @@ impl Default for Msaa {
     }
 }
 
-impl ExtractResource for Msaa {
-    fn extract_resource(res: &Self) -> Self {
-        res.clone()
-    }
-}
-
 #[derive(Component)]
 pub struct ExtractedView {
     pub projection: Mat4,