From c110b103679cda647fabe19d455d5c73b195d447 Mon Sep 17 00:00:00 2001 From: Rob Parrett Date: Thu, 20 Jun 2024 12:40:38 -0700 Subject: [PATCH] Use default window and font sizes in sprite_slice example (#13951) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Objective A couple issues with this example are evident from this screenshot of the example showcase: image - The images are misaligned, closer to the right edge of the screen - The example uses a custom window resolution with a different aspect ratio from the default, which results in black bars ## Solution - Use the default window size - Adjust positions so that things are centered This isn't really fixing a problem, but I also: - Used the default font size and adjusted the text labels and gaps so that everything still fits Which is how I got here in the first place (one less font size to adjust for the cosmic text PR). ## Before Screenshot 2024-06-20 at 12 23 10 PM ## After Screenshot 2024-06-20 at 12 23 30 PM --- examples/2d/sprite_slice.rs | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/examples/2d/sprite_slice.rs b/examples/2d/sprite_slice.rs index e24b8b53b6..7afb0c975c 100644 --- a/examples/2d/sprite_slice.rs +++ b/examples/2d/sprite_slice.rs @@ -4,13 +4,7 @@ use bevy::prelude::*; fn main() { App::new() - .add_plugins(DefaultPlugins.set(WindowPlugin { - primary_window: Some(Window { - resolution: (1350.0, 700.0).into(), - ..default() - }), - ..default() - })) + .add_plugins(DefaultPlugins) .add_systems(Startup, setup) .run(); } @@ -25,17 +19,12 @@ fn spawn_sprites( ) { let cases = [ // Reference sprite - ("Original texture", style.clone(), Vec2::splat(100.0), None), + ("Original", style.clone(), Vec2::splat(100.0), None), // Scaled regular sprite - ( - "Stretched texture", - style.clone(), - Vec2::new(100.0, 200.0), - None, - ), + ("Stretched", style.clone(), Vec2::new(100.0, 200.0), None), // Stretched Scaled sliced sprite ( - "Stretched and sliced", + "With Slicing", style.clone(), Vec2::new(100.0, 200.0), Some(ImageScaleMode::Sliced(TextureSlicer { @@ -46,7 +35,7 @@ fn spawn_sprites( ), // Scaled sliced sprite ( - "Sliced and Tiled", + "With Tiling", style.clone(), Vec2::new(100.0, 200.0), Some(ImageScaleMode::Sliced(TextureSlicer { @@ -58,7 +47,7 @@ fn spawn_sprites( ), // Scaled sliced sprite horizontally ( - "Sliced and Tiled", + "With Tiling", style.clone(), Vec2::new(300.0, 200.0), Some(ImageScaleMode::Sliced(TextureSlicer { @@ -70,7 +59,7 @@ fn spawn_sprites( ), // Scaled sliced sprite horizontally with max scale ( - "Sliced and Tiled with corner constraint", + "With Corners Constrained", style, Vec2::new(300.0, 200.0), Some(ImageScaleMode::Sliced(TextureSlicer { @@ -113,7 +102,6 @@ fn setup(mut commands: Commands, asset_server: Res) { let font = asset_server.load("fonts/FiraSans-Bold.ttf"); let style = TextStyle { font: font.clone(), - font_size: 16.0, ..default() }; @@ -127,7 +115,7 @@ fn setup(mut commands: Commands, asset_server: Res) { Vec3::new(-600.0, 200.0, 0.0), 200.0, style.clone(), - 50., + 40., ); spawn_sprites( @@ -136,6 +124,6 @@ fn setup(mut commands: Commands, asset_server: Res) { Vec3::new(-600.0, -200.0, 0.0), 80.0, style, - 50., + 40., ); }