From 691ba67150746ac6e0adad5007cd9cacdec955e4 Mon Sep 17 00:00:00 2001 From: r00ster Date: Tue, 12 Oct 2021 19:55:50 +0200 Subject: [PATCH 1/7] Add an example to draw a rectangle --- examples/2d/rect.rs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 examples/2d/rect.rs diff --git a/examples/2d/rect.rs b/examples/2d/rect.rs new file mode 100644 index 0000000000000..ea8b5ba31277d --- /dev/null +++ b/examples/2d/rect.rs @@ -0,0 +1,17 @@ +use bevy::prelude::*; + +fn main() { + App::new() + .add_plugins(DefaultPlugins) + .add_startup_system(setup) + .run(); +} + +fn setup(mut commands: Commands, mut materials: ResMut>) { + commands.spawn_bundle(OrthographicCameraBundle::new_2d()); + commands.spawn_bundle(SpriteBundle { + material: materials.add(Color::rgb(0.25, 0.25, 0.75).into()), + sprite: Sprite::new(Vec2::new(50., 50.)), + ..Default::default() + }); +} From a8f6a1746462d7388d48ac50fe7009eaf2666ff5 Mon Sep 17 00:00:00 2001 From: r00ster Date: Tue, 12 Oct 2021 19:58:58 +0200 Subject: [PATCH 2/7] Add rect.rs to README.md --- examples/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/README.md b/examples/README.md index 7796afdb16223..58e3b7d37a88d 100644 --- a/examples/README.md +++ b/examples/README.md @@ -85,6 +85,7 @@ Example | File | Description `contributors` | [`2d/contributors.rs`](./2d/contributors.rs) | Displays each contributor as a bouncy bevy-ball! `many_sprites` | [`2d/many_sprites.rs`](./2d/many_sprites.rs) | Displays many sprites in a grid arragement! Used for performance testing. `mesh` | [`2d/mesh.rs`](./2d/mesh.rs) | Renders a custom mesh +`rect` | [`2d/rect.rs`](./2d/rect.rs) | Renders a rectangle `sprite` | [`2d/sprite.rs`](./2d/sprite.rs) | Renders a sprite `sprite_sheet` | [`2d/sprite_sheet.rs`](./2d/sprite_sheet.rs) | Renders an animated sprite `text2d` | [`2d/text2d.rs`](./2d/text2d.rs) | Generates text in 2d From 384e487609f8807ddc27d5373987b216841e116e Mon Sep 17 00:00:00 2001 From: r00ster Date: Tue, 12 Oct 2021 20:17:38 +0200 Subject: [PATCH 3/7] Add it to Cargo.toml --- Cargo.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index 51565942113cd..a65a4007fade6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -112,6 +112,10 @@ path = "examples/2d/mesh.rs" name = "many_sprites" path = "examples/2d/many_sprites.rs" +[[example]] +name = "rect" +path = "examples/2d/rect.rs" + [[example]] name = "sprite" path = "examples/2d/sprite.rs" From f54a06ff7ccf00d307247ee4e965cf31d3504632 Mon Sep 17 00:00:00 2001 From: r00ster Date: Thu, 16 Dec 2021 17:00:07 +0100 Subject: [PATCH 4/7] Update the rectangle example --- examples/2d/rect.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/examples/2d/rect.rs b/examples/2d/rect.rs index ea8b5ba31277d..be5c59b30bb44 100644 --- a/examples/2d/rect.rs +++ b/examples/2d/rect.rs @@ -10,8 +10,13 @@ fn main() { fn setup(mut commands: Commands, mut materials: ResMut>) { commands.spawn_bundle(OrthographicCameraBundle::new_2d()); commands.spawn_bundle(SpriteBundle { - material: materials.add(Color::rgb(0.25, 0.25, 0.75).into()), - sprite: Sprite::new(Vec2::new(50., 50.)), - ..Default::default() + transform: Transform { + scale: Vec3::new(50.0, 50.0, 0.0), + ..Default::default() + }, + sprite: Sprite { + color: Color::rgb(0.25, 0.25, 0.75), + ..Default::default() + }, }); } From 05216f08aa7217e6ca0f01b73429449409e91d75 Mon Sep 17 00:00:00 2001 From: r00ster Date: Thu, 16 Dec 2021 17:30:31 +0100 Subject: [PATCH 5/7] Use `custom_size` --- examples/2d/rect.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/examples/2d/rect.rs b/examples/2d/rect.rs index be5c59b30bb44..fbd51e38cd0a4 100644 --- a/examples/2d/rect.rs +++ b/examples/2d/rect.rs @@ -10,12 +10,9 @@ fn main() { fn setup(mut commands: Commands, mut materials: ResMut>) { commands.spawn_bundle(OrthographicCameraBundle::new_2d()); commands.spawn_bundle(SpriteBundle { - transform: Transform { - scale: Vec3::new(50.0, 50.0, 0.0), - ..Default::default() - }, sprite: Sprite { color: Color::rgb(0.25, 0.25, 0.75), + custom_size: Some(Vec2::new(50.0, 50.0)), ..Default::default() }, }); From 5206754cf34143e0b7b6dd6643401d7521824499 Mon Sep 17 00:00:00 2001 From: r00ster Date: Thu, 16 Dec 2021 17:33:27 +0100 Subject: [PATCH 6/7] Format --- examples/2d/rect.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/2d/rect.rs b/examples/2d/rect.rs index fbd51e38cd0a4..e04c5d5705384 100644 --- a/examples/2d/rect.rs +++ b/examples/2d/rect.rs @@ -12,7 +12,7 @@ fn setup(mut commands: Commands, mut materials: ResMut>) { commands.spawn_bundle(SpriteBundle { sprite: Sprite { color: Color::rgb(0.25, 0.25, 0.75), - custom_size: Some(Vec2::new(50.0, 50.0)), + custom_size: Some(Vec2::new(50.0, 50.0)), ..Default::default() }, }); From 76455ded3e7746a197b0a51b4deb640d5d162998 Mon Sep 17 00:00:00 2001 From: r00ster Date: Thu, 16 Dec 2021 17:41:19 +0100 Subject: [PATCH 7/7] Another fixup --- examples/2d/rect.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/2d/rect.rs b/examples/2d/rect.rs index e04c5d5705384..3e93a6d3144e8 100644 --- a/examples/2d/rect.rs +++ b/examples/2d/rect.rs @@ -7,7 +7,7 @@ fn main() { .run(); } -fn setup(mut commands: Commands, mut materials: ResMut>) { +fn setup(mut commands: Commands) { commands.spawn_bundle(OrthographicCameraBundle::new_2d()); commands.spawn_bundle(SpriteBundle { sprite: Sprite { @@ -15,5 +15,6 @@ fn setup(mut commands: Commands, mut materials: ResMut>) { custom_size: Some(Vec2::new(50.0, 50.0)), ..Default::default() }, + ..Default::default() }); }