add a default font

Cargo.toml

@@ -52,6 +52,7 @@ default = [
   "bevy_gizmos",
   "android_shared_stdcxx",
   "tonemapping_luts",
+  "default_font",
 ]
 
 # Force dynamic linking, which improves iterative compile times
@@ -225,6 +226,9 @@ accesskit_unix = ["bevy_internal/accesskit_unix"]
 # Enable assertions to check the validity of parameters passed to glam
 glam_assert = ["bevy_internal/glam_assert"]
 
+# Include a default font, containing only ASCII characters, at the cost of a 20kB binary size increase
+default_font = ["bevy_internal/default_font"]
+
 [dependencies]
 bevy_dylib = { path = "crates/bevy_dylib", version = "0.11.0-dev", default-features = false, optional = true }
 bevy_internal = { path = "crates/bevy_internal", version = "0.11.0-dev", default-features = false }

crates/bevy_internal/Cargo.toml

@@ -97,6 +97,8 @@ bevy_render = ["dep:bevy_render", "bevy_scene?/bevy_render"]
 # Enable assertions to check the validity of parameters passed to glam
 glam_assert = ["bevy_math/glam_assert"]
 
+default_font = ["bevy_text?/default_font"]
+
 [dependencies]
 # bevy
 bevy_a11y = { path = "../bevy_a11y", version = "0.11.0-dev" }

crates/bevy_text/Cargo.toml

@@ -10,6 +10,7 @@ keywords = ["bevy"]
 
 [features]
 subpixel_glyph_atlas = []
+default_font = []
 
 [dependencies]
 # bevy

crates/bevy_text/src/lib.rs

@@ -10,6 +10,8 @@ mod pipeline;
 mod text;
 mod text2d;
 
+#[cfg(feature = "default_font")]
+use bevy_reflect::TypeUuid;
 pub use error::*;
 pub use font::*;
 pub use font_atlas::*;
@@ -26,7 +28,11 @@ pub mod prelude {
 }
 
 use bevy_app::prelude::*;
+#[cfg(feature = "default_font")]
+use bevy_asset::load_internal_binary_asset;
 use bevy_asset::AddAsset;
+#[cfg(feature = "default_font")]
+use bevy_asset::HandleUntyped;
 use bevy_ecs::prelude::*;
 use bevy_render::{camera::CameraUpdateSystem, ExtractSchedule, RenderApp};
 use bevy_sprite::SpriteSystem;
@@ -67,6 +73,10 @@ pub enum YAxisOrientation {
     BottomToTop,
 }
 
+#[cfg(feature = "default_font")]
+pub const DEFAULT_FONT_HANDLE: HandleUntyped =
+    HandleUntyped::weak_from_u64(Font::TYPE_UUID, 1491772431825224042);
+
 impl Plugin for TextPlugin {
     fn build(&self, app: &mut App) {
         app.add_asset::<Font>()
@@ -98,5 +108,13 @@ impl Plugin for TextPlugin {
                 extract_text2d_sprite.after(SpriteSystem::ExtractSprites),
             );
         }
+
+        #[cfg(feature = "default_font")]
+        load_internal_binary_asset!(
+            app,
+            DEFAULT_FONT_HANDLE,
+            "FiraMono-subset.ttf",
+            |bytes: &[u8]| { Font::try_from_bytes(bytes.to_vec()).unwrap() }
+        );
     }
 }

crates/bevy_text/src/text.rs

@@ -6,6 +6,8 @@ use bevy_utils::default;
 use serde::{Deserialize, Serialize};
 
 use crate::Font;
+#[cfg(feature = "default_font")]
+use crate::DEFAULT_FONT_HANDLE;
 
 #[derive(Component, Debug, Clone, Reflect)]
 #[reflect(Component, Default)]
@@ -167,6 +169,9 @@ pub struct TextStyle {
 impl Default for TextStyle {
     fn default() -> Self {
         Self {
+            #[cfg(feature = "default_font")]
+            font: DEFAULT_FONT_HANDLE.typed(),
+            #[cfg(not(feature = "default_font"))]
             font: Default::default(),
             font_size: 12.0,
             color: Color::WHITE,

docs/cargo_features.md

@@ -27,6 +27,7 @@ The default feature set enables most of the expected features of a game engine,
 |bevy_text|Provides text functionality|
 |bevy_ui|A custom ECS-driven UI framework|
 |bevy_winit|winit window and input backend|
+|default_font|Include a default font, containing only ASCII characters, at the cost of a 20kB binary size increase|
 |filesystem_watcher|Enable watching file system for asset hot reload|
 |hdr|HDR image format support|
 |ktx2|KTX2 compressed texture support|

examples/2d/bloom_2d.rs

@@ -72,9 +72,9 @@ fn setup(
         TextBundle::from_section(
             "",
             TextStyle {
-                font: asset_server.load("fonts/FiraMono-Medium.ttf"),
                 font_size: 18.0,
                 color: Color::WHITE,
+                ..default()
             },
         )
         .with_style(Style {

examples/3d/3d_gizmos.rs

@@ -15,7 +15,6 @@ fn setup(
     mut commands: Commands,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
-    asset_server: Res<AssetServer>,
 ) {
     commands.spawn(Camera3dBundle {
         transform: Transform::from_xyz(0., 1.5, 6.).looking_at(Vec3::ZERO, Vec3::Y),
@@ -48,9 +47,9 @@ fn setup(
     commands.spawn(TextBundle::from_section(
         "Press 't' to toggle drawing gizmos on top of everything else in the scene",
         TextStyle {
-            font: asset_server.load("fonts/FiraMono-Medium.ttf"),
             font_size: 24.,
             color: Color::WHITE,
+            ..default()
         },
     ));
 }

examples/3d/anti_aliasing.rs

@@ -329,9 +329,9 @@ fn setup(
         TextBundle::from_section(
             "",
             TextStyle {
-                font: asset_server.load("fonts/FiraMono-Medium.ttf"),
                 font_size: 20.0,
                 color: Color::BLACK,
+                ..default()
             },
         )
         .with_style(Style {

examples/3d/atmospheric_fog.rs

@@ -93,13 +93,13 @@ fn setup_terrain_scene(
     ));
 }
 
-fn setup_instructions(mut commands: Commands, asset_server: Res<AssetServer>) {
+fn setup_instructions(mut commands: Commands) {
     commands.spawn((TextBundle::from_section(
         "Press Spacebar to Toggle Atmospheric Fog.\nPress S to Toggle Directional Light Fog Influence.",
         TextStyle {
-            font: asset_server.load("fonts/FiraMono-Medium.ttf"),
             font_size: 15.0,
             color: Color::WHITE,
+            ..default()
         },
     )
     .with_style(Style {

examples/3d/blend_modes.rs

@@ -34,7 +34,6 @@ fn setup(
     mut commands: Commands,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
-    asset_server: Res<AssetServer>,
 ) {
     let base_color = Color::rgba(0.9, 0.2, 0.3, 1.0);
     let icosphere_mesh = meshes.add(
@@ -186,15 +185,15 @@ fn setup(
 
     // Controls Text
     let text_style = TextStyle {
-        font: asset_server.load("fonts/FiraMono-Medium.ttf"),
         font_size: 18.0,
         color: Color::BLACK,
+        ..default()
     };
 
     let label_text_style = TextStyle {
-        font: asset_server.load("fonts/FiraMono-Medium.ttf"),
         font_size: 25.0,
         color: Color::ORANGE,
+        ..default()
     };
 
     commands.spawn(

examples/3d/bloom_3d.rs

@@ -25,7 +25,6 @@ fn setup_scene(
     mut commands: Commands,
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
-    asset_server: Res<AssetServer>,
 ) {
     commands.spawn((
         Camera3dBundle {
@@ -96,9 +95,9 @@ fn setup_scene(
         TextBundle::from_section(
             "",
             TextStyle {
-                font: asset_server.load("fonts/FiraMono-Medium.ttf"),
                 font_size: 18.0,
                 color: Color::BLACK,
+                ..default()
             },
         )
         .with_style(Style {

examples/3d/fog.rs

@@ -137,13 +137,13 @@ fn setup_pyramid_scene(
     });
 }
 
-fn setup_instructions(mut commands: Commands, asset_server: Res<AssetServer>) {
+fn setup_instructions(mut commands: Commands) {
     commands.spawn((TextBundle::from_section(
         "",
         TextStyle {
-            font: asset_server.load("fonts/FiraMono-Medium.ttf"),
             font_size: 15.0,
             color: Color::WHITE,
+            ..default()
         },
     )
     .with_style(Style {

examples/3d/parallax_mapping.rs

@@ -315,9 +315,9 @@ fn setup(
     commands.spawn(background_cube_bundle(Vec3::new(0., 0., -45.)));
 
     let style = TextStyle {
-        font: asset_server.load("fonts/FiraMono-Medium.ttf"),
         font_size: 18.0,
         color: Color::WHITE,
+        ..default()
     };
 
     commands.spawn(

examples/3d/pbr.rs

@@ -78,9 +78,9 @@ fn setup(
         TextBundle::from_section(
             "Perceptual Roughness",
             TextStyle {
-                font: asset_server.load("fonts/FiraMono-Medium.ttf"),
                 font_size: 36.0,
                 color: Color::WHITE,
+                ..default()
             },
         )
         .with_style(Style {
@@ -95,9 +95,9 @@ fn setup(
         text: Text::from_section(
             "Metallic",
             TextStyle {
-                font: asset_server.load("fonts/FiraMono-Medium.ttf"),
                 font_size: 36.0,
                 color: Color::WHITE,
+                ..default()
             },
         ),
         style: Style {
@@ -117,9 +117,9 @@ fn setup(
         TextBundle::from_section(
             "Loading Environment Map...",
             TextStyle {
-                font: asset_server.load("fonts/FiraMono-Medium.ttf"),
                 font_size: 36.0,
                 color: Color::RED,
+                ..default()
             },
         )
         .with_style(Style {

examples/3d/tonemapping.rs

@@ -75,9 +75,9 @@ fn setup(
         TextBundle::from_section(
             "",
             TextStyle {
-                font: asset_server.load("fonts/FiraMono-Medium.ttf"),
                 font_size: 18.0,
                 color: Color::WHITE,
+                ..default()
             },
         )
         .with_style(Style {
@@ -243,7 +243,6 @@ fn setup_image_viewer_scene(
     mut meshes: ResMut<Assets<Mesh>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
     camera_transform: Res<CameraTransform>,
-    asset_server: Res<AssetServer>,
 ) {
     let mut transform = camera_transform.0;
     transform.translation += transform.forward();
@@ -273,9 +272,9 @@ fn setup_image_viewer_scene(
             TextBundle::from_section(
                 "Drag and drop an HDR or EXR file",
                 TextStyle {
-                    font: asset_server.load("fonts/FiraMono-Medium.ttf"),
                     font_size: 36.0,
                     color: Color::BLACK,
+                    ..default()
                 },
             )
             .with_text_alignment(TextAlignment::Center)

examples/async_tasks/external_source_external_thread.rs

@@ -19,10 +19,7 @@ fn main() {
 struct StreamReceiver(Receiver<u32>);
 struct StreamEvent(u32);
 
-#[derive(Resource, Deref)]
-struct LoadedFont(Handle<Font>);
-
-fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
+fn setup(mut commands: Commands) {
     commands.spawn(Camera2dBundle::default());
 
     let (tx, rx) = bounded::<u32>(10);
@@ -40,7 +37,6 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
     });
 
     commands.insert_resource(StreamReceiver(rx));
-    commands.insert_resource(LoadedFont(asset_server.load("fonts/FiraSans-Bold.ttf")));
 }
 
 // This system reads from the receiver and sends events to Bevy
@@ -50,15 +46,11 @@ fn read_stream(receiver: Res<StreamReceiver>, mut events: EventWriter<StreamEven
     }
 }
 
-fn spawn_text(
-    mut commands: Commands,
-    mut reader: EventReader<StreamEvent>,
-    loaded_font: Res<LoadedFont>,
-) {
+fn spawn_text(mut commands: Commands, mut reader: EventReader<StreamEvent>) {
     let text_style = TextStyle {
-        font: loaded_font.clone(),
         font_size: 20.0,
         color: Color::WHITE,
+        ..default()
     };
 
     for (per_frame, event) in reader.iter().enumerate() {

examples/ecs/apply_system_buffers.rs

@@ -63,7 +63,7 @@ struct AppleCount;
 struct OrangeCount;
 
 // Setup the counters in the UI.
-fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
+fn setup(mut commands: Commands) {
     commands.spawn(Camera2dBundle::default());
 
     commands
@@ -82,9 +82,9 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                 TextBundle::from_section(
                     "Apple: nothing counted yet".to_string(),
                     TextStyle {
-                        font: asset_server.load("fonts/FiraSans-Bold.ttf"),
                         font_size: 80.0,
                         color: Color::ORANGE,
+                        ..default()
                     },
                 ),
                 AppleCount,
@@ -93,9 +93,9 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                 TextBundle::from_section(
                     "Orange: nothing counted yet".to_string(),
                     TextStyle {
-                        font: asset_server.load("fonts/FiraSans-Bold.ttf"),
                         font_size: 80.0,
                         color: Color::ORANGE,
+                        ..default()
                     },
                 ),
                 OrangeCount,

examples/ecs/state.rs

@@ -48,7 +48,7 @@ fn setup(mut commands: Commands) {
     commands.spawn(Camera2dBundle::default());
 }
 
-fn setup_menu(mut commands: Commands, asset_server: Res<AssetServer>) {
+fn setup_menu(mut commands: Commands) {
     let button_entity = commands
         .spawn(NodeBundle {
             style: Style {
@@ -78,9 +78,9 @@ fn setup_menu(mut commands: Commands, asset_server: Res<AssetServer>) {
                     parent.spawn(TextBundle::from_section(
                         "Play",
                         TextStyle {
-                            font: asset_server.load("fonts/FiraSans-Bold.ttf"),
                             font_size: 40.0,
                             color: Color::rgb(0.9, 0.9, 0.9),
+                            ..default()
                         },
                     ));
                 });