Merge pull request #584 from rparrett/remove-font

StarArawn · Dec 23, 2024 · 1a4d7ef · 1a4d7ef
2 parents 56dc41b + bf7025e
commit 1a4d7ef
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 62 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -49,6 +49,7 @@ features = [
     "bevy_sprite",
     #"file_watcher",
     "multi_threaded",
+    "default_font",
     "webgl2",
 ]
 
@@ -68,6 +69,7 @@ features = [
     "bevy_text",
     "bevy_sprite",
     "multi_threaded",
+    "default_font",
     "webgl2",
 ]
 

diff --git a/assets/fonts/FiraSans-Bold.ttf b/assets/fonts/FiraSans-Bold.ttf
diff --git a/examples/frustum_cull_test.rs b/examples/frustum_cull_test.rs
@@ -39,9 +39,6 @@ pub struct TileHandleSquare(Handle<Image>);
 #[derive(Deref, Resource)]
 pub struct TileHandleIso(Handle<Image>);
 
-#[derive(Deref, Resource)]
-pub struct FontHandle(Handle<Font>);
-
 impl FromWorld for TileHandleHexCol {
     fn from_world(world: &mut World) -> Self {
         let asset_server = world.resource::<AssetServer>();
@@ -66,12 +63,6 @@ impl FromWorld for TileHandleSquare {
         Self(asset_server.load("bw-tile-square.png"))
     }
 }
-impl FromWorld for FontHandle {
-    fn from_world(world: &mut World) -> Self {
-        let asset_server = world.resource::<AssetServer>();
-        Self(asset_server.load("fonts/FiraSans-Bold.ttf"))
-    }
-}
 
 // Generates the initial tilemap, which is a square grid.
 fn spawn_tilemap(mut commands: Commands, tile_handle_square: Res<TileHandleSquare>) {
@@ -118,7 +109,6 @@ pub struct MapTypeLabel;
 // Generates the map type label: e.g. `Square { diagonal_neighbors: false }`
 fn spawn_map_type_label(
     mut commands: Commands,
-    font_handle: Res<FontHandle>,
     windows: Query<&Window>,
     map_type_q: Query<&TilemapType>,
 ) {
@@ -133,7 +123,6 @@ fn spawn_map_type_label(
             commands.spawn((
                 Text2d::new(format!("{map_type:?}")),
                 TextFont {
-                    font: font_handle.clone(),
                     font_size: 20.0,
                     ..default()
                 },
@@ -244,7 +233,6 @@ fn main() {
         .init_resource::<TileHandleHexCol>()
         .init_resource::<TileHandleHexRow>()
         .init_resource::<TileHandleSquare>()
-        .init_resource::<FontHandle>()
         .add_systems(
             Startup,
             (spawn_tilemap, apply_deferred, spawn_map_type_label).chain(),

diff --git a/examples/hex_neighbors.rs b/examples/hex_neighbors.rs
@@ -24,8 +24,6 @@ pub struct TileHandleHexRow(Handle<Image>);
 
 #[derive(Deref, Resource)]
 pub struct TileHandleHexCol(Handle<Image>);
-#[derive(Deref, Resource)]
-pub struct FontHandle(Handle<Font>);
 
 impl FromWorld for TileHandleHexCol {
     fn from_world(world: &mut World) -> Self {
@@ -39,12 +37,6 @@ impl FromWorld for TileHandleHexRow {
         Self(asset_server.load("bw-tile-hex-row.png"))
     }
 }
-impl FromWorld for FontHandle {
-    fn from_world(world: &mut World) -> Self {
-        let asset_server = world.resource::<AssetServer>();
-        Self(asset_server.load("fonts/FiraSans-Bold.ttf"))
-    }
-}
 
 // Generates the initial tilemap, which is a hex grid.
 fn spawn_tilemap(mut commands: Commands, tile_handle_hex_row: Res<TileHandleHexRow>) {
@@ -91,7 +83,6 @@ fn spawn_tile_labels(
     mut commands: Commands,
     tilemap_q: Query<(&Transform, &TilemapType, &TilemapGridSize, &TileStorage)>,
     tile_q: Query<&mut TilePos>,
-    font_handle: Res<FontHandle>,
 ) {
     for (map_transform, map_type, grid_size, tilemap_storage) in tilemap_q.iter() {
         for tile_entity in tilemap_storage.iter().flatten() {
@@ -103,7 +94,6 @@ fn spawn_tile_labels(
                 .spawn((
                     Text2d::new(format!("{}, {}", tile_pos.x, tile_pos.y)),
                     TextFont {
-                        font: font_handle.clone(),
                         font_size: 20.0,
                         ..default()
                     },
@@ -125,7 +115,6 @@ pub struct MapTypeLabel;
 // Generates the map type label: e.g. `Square { diagonal_neighbors: false }`
 fn spawn_map_type_label(
     mut commands: Commands,
-    font_handle: Res<FontHandle>,
     windows: Query<&Window>,
     map_type_q: Query<&TilemapType>,
 ) {
@@ -140,7 +129,6 @@ fn spawn_map_type_label(
             commands.spawn((
                 Text2d::new(format!("{map_type:?}")),
                 TextFont {
-                    font: font_handle.clone(),
                     font_size: 20.0,
                     ..default()
                 },
@@ -427,7 +415,6 @@ fn main() {
         .init_resource::<CursorPos>()
         .init_resource::<TileHandleHexCol>()
         .init_resource::<TileHandleHexRow>()
-        .init_resource::<FontHandle>()
         .add_systems(Startup, (spawn_tilemap, apply_deferred).chain().in_set(SpawnTilemapSet))
         .add_systems(Startup, (spawn_tile_labels, spawn_map_type_label).after(SpawnTilemapSet))
         .add_systems(First, (camera_movement, update_cursor_pos).chain())

diff --git a/examples/hex_neighbors_radius_chunks.rs b/examples/hex_neighbors_radius_chunks.rs
@@ -21,8 +21,6 @@ pub struct TileHandleHexRow(Handle<Image>);
 
 #[derive(Deref, Resource)]
 pub struct TileHandleHexCol(Handle<Image>);
-#[derive(Deref, Resource)]
-pub struct FontHandle(Handle<Font>);
 
 impl FromWorld for TileHandleHexCol {
     fn from_world(world: &mut World) -> Self {
@@ -36,12 +34,6 @@ impl FromWorld for TileHandleHexRow {
         Self(asset_server.load("bw-tile-hex-row.png"))
     }
 }
-impl FromWorld for FontHandle {
-    fn from_world(world: &mut World) -> Self {
-        let asset_server = world.resource::<AssetServer>();
-        Self(asset_server.load("fonts/FiraSans-Bold.ttf"))
-    }
-}
 
 #[derive(Deref, Component, Clone, Copy)]
 pub struct ChunkPos(IVec2);
@@ -324,7 +316,6 @@ fn spawn_tile_labels(
     mut commands: Commands,
     tilemap_q: Query<(&Transform, &TilemapType, &TilemapGridSize, &TileStorage)>,
     tile_q: Query<&TilePos>,
-    font_handle: Res<FontHandle>,
 ) {
     for (map_transform, map_type, grid_size, tilemap_storage) in tilemap_q.iter() {
         for tile_entity in tilemap_storage.iter().flatten() {
@@ -338,7 +329,6 @@ fn spawn_tile_labels(
                 .spawn((
                     Text2d(format!("{}, {}", hex_pos.x, hex_pos.y)),
                     TextFont {
-                        font: font_handle.clone(),
                         font_size: 20.0,
                         ..default()
                     },
@@ -533,7 +523,6 @@ fn main() {
         .init_resource::<HighlightRadius>()
         .init_resource::<TileHandleHexCol>()
         .init_resource::<TileHandleHexRow>()
-        .init_resource::<FontHandle>()
         .add_systems(Startup, (spawn_chunks, apply_deferred).chain().in_set(SpawnChunksSet))
         .add_systems(Startup, spawn_tile_labels.after(SpawnChunksSet))
         .add_systems(First, (camera_movement, update_cursor_pos).chain())

diff --git a/examples/hexagon_generation.rs b/examples/hexagon_generation.rs
@@ -22,9 +22,6 @@ pub struct TileHandleHexRow(Handle<Image>);
 #[derive(Deref, Resource)]
 pub struct TileHandleHexCol(Handle<Image>);
 
-#[derive(Deref, Resource)]
-pub struct FontHandle(Handle<Font>);
-
 impl FromWorld for TileHandleHexCol {
     fn from_world(world: &mut World) -> Self {
         let asset_server = world.resource::<AssetServer>();
@@ -37,12 +34,6 @@ impl FromWorld for TileHandleHexRow {
         Self(asset_server.load("bw-tile-hex-row.png"))
     }
 }
-impl FromWorld for FontHandle {
-    fn from_world(world: &mut World) -> Self {
-        let asset_server = world.resource::<AssetServer>();
-        Self(asset_server.load("fonts/FiraSans-Bold.ttf"))
-    }
-}
 
 // Generates the initial tilemap, which is a square grid.
 fn spawn_tilemap(mut commands: Commands, tile_handle_hex_row: Res<TileHandleHexRow>) {
@@ -94,7 +85,6 @@ pub struct MapTypeLabel;
 // Generates the map type label: e.g. `Square { diagonal_neighbors: false }`
 fn spawn_map_type_label(
     mut commands: Commands,
-    font_handle: Res<FontHandle>,
     windows: Query<&Window>,
     map_type_q: Query<&TilemapType>,
 ) {
@@ -109,7 +99,6 @@ fn spawn_map_type_label(
             commands.spawn((
                 Text2d::new(format!("{map_type:?}")),
                 TextFont {
-                    font: font_handle.clone(),
                     font_size: 20.0,
                     ..default()
                 },
@@ -219,7 +208,6 @@ fn main() {
         .add_plugins(TilemapPlugin)
         .init_resource::<TileHandleHexCol>()
         .init_resource::<TileHandleHexRow>()
-        .init_resource::<FontHandle>()
         .add_systems(
             Startup,
             (spawn_tilemap, apply_deferred, spawn_map_type_label).chain(),

diff --git a/examples/mouse_to_tile.rs b/examples/mouse_to_tile.rs
@@ -36,9 +36,6 @@ pub struct TileHandleSquare(Handle<Image>);
 #[derive(Deref, Resource)]
 pub struct TileHandleIso(Handle<Image>);
 
-#[derive(Deref, Resource)]
-pub struct FontHandle(Handle<Font>);
-
 impl FromWorld for TileHandleHexCol {
     fn from_world(world: &mut World) -> Self {
         let asset_server = world.resource::<AssetServer>();
@@ -63,12 +60,6 @@ impl FromWorld for TileHandleSquare {
         Self(asset_server.load("bw-tile-square.png"))
     }
 }
-impl FromWorld for FontHandle {
-    fn from_world(world: &mut World) -> Self {
-        let asset_server = world.resource::<AssetServer>();
-        Self(asset_server.load("fonts/FiraSans-Bold.ttf"))
-    }
-}
 
 // Generates the initial tilemap, which is a square grid.
 fn spawn_tilemap(mut commands: Commands, tile_handle_square: Res<TileHandleSquare>) {
@@ -115,7 +106,6 @@ fn spawn_tile_labels(
     mut commands: Commands,
     tilemap_q: Query<(&Transform, &TilemapType, &TilemapGridSize, &TileStorage)>,
     tile_q: Query<&mut TilePos>,
-    font_handle: Res<FontHandle>,
 ) {
     for (map_transform, map_type, grid_size, tilemap_storage) in tilemap_q.iter() {
         for tile_entity in tilemap_storage.iter().flatten() {
@@ -127,7 +117,6 @@ fn spawn_tile_labels(
                 .spawn((
                     Text2d::new(format!("{}, {}", tile_pos.x, tile_pos.y)),
                     TextFont {
-                        font: font_handle.clone(),
                         font_size: 20.0,
                         ..default()
                     },
@@ -149,7 +138,6 @@ pub struct MapTypeLabel;
 // Generates the map type label: e.g. `Square { diagonal_neighbors: false }`
 fn spawn_map_type_label(
     mut commands: Commands,
-    font_handle: Res<FontHandle>,
     windows: Query<&Window>,
     map_type_q: Query<&TilemapType>,
 ) {
@@ -164,7 +152,6 @@ fn spawn_map_type_label(
             commands.spawn((
                 Text2d::new(format!("{map_type:?}")),
                 TextFont {
-                    font: font_handle.clone(),
                     font_size: 20.0,
                     ..default()
                 },
@@ -379,7 +366,6 @@ fn main() {
         .init_resource::<TileHandleHexCol>()
         .init_resource::<TileHandleHexRow>()
         .init_resource::<TileHandleSquare>()
-        .init_resource::<FontHandle>()
         .add_plugins(TilemapPlugin)
         .add_systems(
             Startup,