From c6d7402318cdd28ab33b5efa4cf3d2627b271f8b Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Sun, 22 Mar 2020 01:33:53 -0700 Subject: [PATCH] add bevy_derive to prelude --- examples/custom_shader.rs | 2 -- examples/plugin_loading/example_plugin/Cargo.toml | 1 - examples/plugin_loading/example_plugin/src/lib.rs | 1 - src/lib.rs | 2 +- src/prelude.rs | 1 + 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/examples/custom_shader.rs b/examples/custom_shader.rs index 08c92a96a4..b6016a9093 100644 --- a/examples/custom_shader.rs +++ b/examples/custom_shader.rs @@ -1,7 +1,5 @@ use bevy::prelude::*; -use bevy_derive::Uniforms; - #[derive(Uniforms, Default)] struct MyMaterial { pub color: Color, diff --git a/examples/plugin_loading/example_plugin/Cargo.toml b/examples/plugin_loading/example_plugin/Cargo.toml index b233aaa1fa..b4c4c61004 100644 --- a/examples/plugin_loading/example_plugin/Cargo.toml +++ b/examples/plugin_loading/example_plugin/Cargo.toml @@ -9,7 +9,6 @@ crate-type = ["cdylib"] [dependencies] bevy = { path = "../../../../bevy" } -bevy_derive = { path = "../../../bevy_derive" } [profile.release] debug = true \ No newline at end of file diff --git a/examples/plugin_loading/example_plugin/src/lib.rs b/examples/plugin_loading/example_plugin/src/lib.rs index 873f397c26..221a459650 100644 --- a/examples/plugin_loading/example_plugin/src/lib.rs +++ b/examples/plugin_loading/example_plugin/src/lib.rs @@ -1,5 +1,4 @@ use bevy::{prelude::*, plugin::AppPlugin}; -use bevy_derive::RegisterAppPlugin; #[derive(RegisterAppPlugin)] pub struct ExamplePlugin; diff --git a/src/lib.rs b/src/lib.rs index 8fd6b7cd4f..f3920838c2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -13,4 +13,4 @@ pub mod ui; pub use bevy_transform as transform; pub use glam as math; pub use legion; -pub use once_cell; +pub use once_cell; \ No newline at end of file diff --git a/src/prelude.rs b/src/prelude.rs index 1f527b1988..051324a40b 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -24,3 +24,4 @@ pub use legion::{ }, }; pub use math::{Mat3, Mat4, Quat, Vec2, Vec3, Vec4}; +pub use bevy_derive::*; \ No newline at end of file