Various CI fixes

bevyengine · Mar 31, 2021 · 0acc9c0 · 0acc9c0
1 parent a216ee7
commit 0acc9c0
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 23 deletions.
diff --git a/crates/bevy_ui/src/lib.rs b/crates/bevy_ui/src/lib.rs
@@ -87,9 +87,6 @@ impl Plugin for UiPlugin {
             )
             .add_system_to_stage(RenderStage::Draw, widget::draw_text_system.system());
 
-        #[cfg(feature = "bevy_default_assets")]
-        default_font::load_default_font(app);
-
         crate::render::add_ui_graph(app.world_mut());
     }
 }
diff --git a/examples/2d/text2d.rs b/examples/2d/text2d.rs
@@ -8,7 +8,7 @@ fn main() {
         .run();
 }
 
-fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
+fn setup(mut commands: Commands) {
     // 2d camera
     commands.spawn_bundle(OrthographicCameraBundle::new_2d());
     commands.spawn_bundle(Text2dBundle {

diff --git a/examples/ecs/state.rs b/examples/ecs/state.rs
@@ -29,11 +29,7 @@ struct MenuData {
     button_entity: Entity,
 }
 
-fn setup_menu(
-    mut commands: Commands,
-    asset_server: Res<AssetServer>,
-    button_materials: Res<ButtonMaterials>,
-) {
+fn setup_menu(mut commands: Commands, button_materials: Res<ButtonMaterials>) {
     // ui camera
     commands.spawn_bundle(UiCameraBundle::default());
     let button_entity = commands

diff --git a/examples/game/alien_cake_addict.rs b/examples/game/alien_cake_addict.rs
@@ -365,7 +365,6 @@ fn gameover_keyboard(mut state: ResMut<State<GameState>>, keyboard_input: Res<In
 // display the number of cake eaten before losing
 fn display_score(
     mut commands: Commands,
-    asset_server: Res<AssetServer>,
     game: Res<Game>,
     mut materials: ResMut<Assets<ColorMaterial>>,
 ) {

diff --git a/examples/tools/bevymark.rs b/examples/tools/bevymark.rs
@@ -52,7 +52,7 @@ fn main() {
         .run();
 }
 
-fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
+fn setup(mut commands: Commands) {
     commands.spawn_bundle(OrthographicCameraBundle::new_2d());
     commands.spawn_bundle(UiCameraBundle::default());
     commands.spawn_bundle(TextBundle {

diff --git a/examples/ui/button.rs b/examples/ui/button.rs
@@ -55,11 +55,7 @@ fn button_system(
     }
 }
 
-fn setup(
-    mut commands: Commands,
-    asset_server: Res<AssetServer>,
-    button_materials: Res<ButtonMaterials>,
-) {
+fn setup(mut commands: Commands, button_materials: Res<ButtonMaterials>) {
     // ui camera
     commands.spawn_bundle(UiCameraBundle::default());
     commands

diff --git a/examples/ui/font_atlas_debug.rs b/examples/ui/font_atlas_debug.rs
@@ -1,3 +1,4 @@
+use bevy::text::DEFAULT_FONT_HANDLE;
 use bevy::{prelude::*, text::FontAtlasSet};
 
 // TODO: This is now broken. See #1243
@@ -77,8 +78,8 @@ fn text_update_system(mut state: ResMut<State>, time: Res<Time>, mut query: Quer
     }
 }
 
-fn setup(mut commands: Commands, asset_server: Res<AssetServer>, mut state: ResMut<State>) {
-    state.handle = font_handle.clone();
+fn setup(mut commands: Commands, mut state: ResMut<State>) {
+    state.handle = DEFAULT_FONT_HANDLE.typed();
     commands.spawn_bundle(UiCameraBundle::default());
     commands.spawn_bundle(TextBundle {
         text: Text::with_section(

diff --git a/examples/window/scale_factor_override.rs b/examples/window/scale_factor_override.rs
@@ -15,11 +15,7 @@ fn main() {
         .run();
 }
 
-fn setup(
-    mut commands: Commands,
-    asset_server: Res<AssetServer>,
-    mut materials: ResMut<Assets<ColorMaterial>>,
-) {
+fn setup(mut commands: Commands, mut materials: ResMut<Assets<ColorMaterial>>) {
     // ui camera
     commands.spawn_bundle(UiCameraBundle::default());
     // root node