Skip to content

Add command line option to choose a starting scene in the `testbed_*' examples #22223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
panpanpro888 wants to merge 4 commits into
base: main
Choose a base branch
from
+147 −3
Open

Add command line option to choose a starting scene in the `testbed_*' examples #22223

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f4fbe2
Add command line option to choose a starting scene in the `testbed_*`…
panpanpro888 Dec 21, 2025
2e7ee5c
Simplify match statement in examples/testbed/2d.rs
panpanpro888 Dec 22, 2025
7333185
Simplify match statement in examples/testbed/ui.rs
panpanpro888 Dec 22, 2025
f72982d
Simplify match statement examples/testbed/3d.rs
panpanpro888 Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 48 additions & 1 deletion examples/testbed/2d.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,22 @@

mod helpers;

use argh::FromArgs;
use bevy::prelude::*;
use helpers::Next;

#[derive(FromArgs)]
/// 2d testbed
pub struct Args {
#[argh(positional)]
scene: Option<Scene>,
}

fn main() {
let args: Args = argh::from_env();

let mut app = App::new();
app.add_plugins((DefaultPlugins,))
.init_state::<Scene>()
.add_systems(OnEnter(Scene::Shapes), shapes::setup)
.add_systems(OnEnter(Scene::Bloom), bloom::setup)
.add_systems(OnEnter(Scene::Text), text::setup)
Expand All @@ -20,6 +29,16 @@ fn main() {
.add_systems(Update, switch_scene)
.add_systems(Update, gizmos::draw_gizmos.run_if(in_state(Scene::Gizmos)));

match args.scene {
None => app.init_state::<Scene>(),
Some(Scene::Shapes) => app.insert_state(Scene::Shapes),
Some(Scene::Bloom) => app.insert_state(Scene::Bloom),
Some(Scene::Text) => app.insert_state(Scene::Text),
Some(Scene::Sprite) => app.insert_state(Scene::Sprite),
Some(Scene::SpriteSlicing) => app.insert_state(Scene::SpriteSlicing),
Some(Scene::Gizmos) => app.insert_state(Scene::Gizmos),
};

#[cfg(feature = "bevy_ci_testing")]
app.add_systems(Update, helpers::switch_scene_in_ci::<Scene>);

Expand All @@ -37,6 +56,34 @@ enum Scene {
Gizmos,
}

impl std::str::FromStr for Scene {
type Err = String;

fn from_str(s: &str) -> Result<Self, Self::Err> {
match s.to_lowercase().as_str() {
"shapes" => Ok(Scene::Shapes),
"bloom" => Ok(Scene::Bloom),
"text" => Ok(Scene::Text),
"sprite" => Ok(Scene::Sprite),
"spriteslicing" => Ok(Scene::SpriteSlicing),
"gizmos" => Ok(Scene::Gizmos),
_ => Err(format!(
"Scene '{}' doesn't exist. Available scenes:\n\t{}",
s,
[
"Shapes",
"Bloom",
"Text",
"Sprite",
"SpriteSlicing",
"Gizmos"
]
.join("\n\t")
)),
}
}
}

impl Next for Scene {
fn next(&self) -> Self {
match self {
Expand Down
49 changes: 48 additions & 1 deletion examples/testbed/3d.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,22 @@

mod helpers;

use argh::FromArgs;
use bevy::prelude::*;
use helpers::Next;

#[derive(FromArgs)]
/// 3d testbed
pub struct Args {
#[argh(positional)]
scene: Option<Scene>,
}

fn main() {
let args: Args = argh::from_env();

let mut app = App::new();
app.add_plugins((DefaultPlugins,))
.init_state::<Scene>()
.add_systems(OnEnter(Scene::Light), light::setup)
.add_systems(OnEnter(Scene::Bloom), bloom::setup)
.add_systems(OnEnter(Scene::Gltf), gltf::setup)
Expand All @@ -28,6 +37,16 @@ fn main() {
.run_if(in_state(Scene::GltfCoordinateConversion)),
);

match args.scene {
None => app.init_state::<Scene>(),
Some(Scene::Light) => app.insert_state(Scene::Light),
Some(Scene::Bloom) => app.insert_state(Scene::Bloom),
Some(Scene::Gltf) => app.insert_state(Scene::Gltf),
Some(Scene::Animation) => app.insert_state(Scene::Animation),
Some(Scene::Gizmos) => app.insert_state(Scene::Gizmos),
Some(Scene::GltfCoordinateConversion) => app.insert_state(Scene::GltfCoordinateConversion),
};

#[cfg(feature = "bevy_ci_testing")]
app.add_systems(Update, helpers::switch_scene_in_ci::<Scene>);

Expand All @@ -45,6 +64,34 @@ enum Scene {
GltfCoordinateConversion,
}

impl std::str::FromStr for Scene {
type Err = String;

fn from_str(s: &str) -> Result<Self, Self::Err> {
match s.to_lowercase().as_str() {
"light" => Ok(Scene::Light),
"bloom" => Ok(Scene::Bloom),
"gltf" => Ok(Scene::Gltf),
"animation" => Ok(Scene::Animation),
"gizmos" => Ok(Scene::Gizmos),
"gltfcoordinateconversion" => Ok(Scene::GltfCoordinateConversion),
_ => Err(format!(
"Scene '{}' doesn't exist. Available scenes:\n\t{}",
s,
[
"Light",
"Bloom",
"Gltf",
"Animation",
"Gizmos",
"GltfCoordinateConversion"
]
.join("\n\t")
)),
}
}
}

impl Next for Scene {
fn next(&self) -> Self {
match self {
Expand Down
76 changes: 75 additions & 1 deletion examples/testbed/ui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,20 @@

mod helpers;

use argh::FromArgs;
use bevy::prelude::*;
use helpers::Next;

#[derive(FromArgs)]
/// ui testbed
pub struct Args {
#[argh(positional)]
scene: Option<Scene>,
}

fn main() {
let args: Args = argh::from_env();

let mut app = App::new();
app.add_plugins(DefaultPlugins.set(WindowPlugin {
primary_window: Some(Window {
Expand All @@ -19,7 +29,6 @@ fn main() {
}),
..Default::default()
}))
.init_state::<Scene>()
.add_systems(OnEnter(Scene::Image), image::setup)
.add_systems(OnEnter(Scene::Text), text::setup)
.add_systems(OnEnter(Scene::Grid), grid::setup)
Expand All @@ -35,6 +44,25 @@ fn main() {
.add_systems(OnEnter(Scene::ViewportCoords), viewport_coords::setup)
.add_systems(Update, switch_scene);

match args.scene {
None => app.init_state::<Scene>(),
Some(Scene::Image) => app.insert_state(Scene::Image),
Some(Scene::Text) => app.insert_state(Scene::Text),
Some(Scene::Grid) => app.insert_state(Scene::Grid),
Some(Scene::Borders) => app.insert_state(Scene::Borders),
Some(Scene::BoxShadow) => app.insert_state(Scene::BoxShadow),
Some(Scene::TextWrap) => app.insert_state(Scene::TextWrap),
Some(Scene::Overflow) => app.insert_state(Scene::Overflow),
Some(Scene::Slice) => app.insert_state(Scene::Slice),
Some(Scene::LayoutRounding) => app.insert_state(Scene::LayoutRounding),
Some(Scene::LinearGradient) => app.insert_state(Scene::LinearGradient),
Some(Scene::RadialGradient) => app.insert_state(Scene::RadialGradient),
Some(Scene::Transformations) => app.insert_state(Scene::Transformations),
#[cfg(feature = "bevy_ui_debug")]
Some(Scene::DebugOutlines) => app.insert_state(Scene::DebugOutlines),
Some(Scene::ViewportCoords) => app.insert_state(Scene::ViewportCoords),
};

#[cfg(feature = "bevy_ui_debug")]
{
app.add_systems(OnEnter(Scene::DebugOutlines), debug_outlines::setup);
Expand Down Expand Up @@ -68,6 +96,52 @@ enum Scene {
ViewportCoords,
}

impl std::str::FromStr for Scene {
type Err = String;

fn from_str(s: &str) -> Result<Self, Self::Err> {
match s.to_lowercase().as_str() {
"image" => Ok(Scene::Image),
"text" => Ok(Scene::Text),
"grid" => Ok(Scene::Grid),
"borders" => Ok(Scene::Borders),
"boxshadow" => Ok(Scene::BoxShadow),
"textwrap" => Ok(Scene::TextWrap),
"overflow" => Ok(Scene::Overflow),
"slice" => Ok(Scene::Slice),
"layoutrounding" => Ok(Scene::LayoutRounding),
"lineargradient" => Ok(Scene::LinearGradient),
"radialgradient" => Ok(Scene::RadialGradient),
"transformations" => Ok(Scene::Transformations),
#[cfg(feature = "bevy_ui_debug")]
"debugoutlines" => Ok(Scene::DebugOutlines),
"viewportcoords" => Ok(Scene::ViewportCoords),
_ => Err(format!(
"Scene '{}' doesn't exist. Available scenes:\n\t{}",
s,
[
"Image",
"Text",
"Grid",
"Borders",
"BoxShadow",
"TextWrap",
"Overflow",
"Slice",
"LayoutRounding",
"LinearGradient",
"RadialGradient",
"Transformations",
#[cfg(feature = "bevy_ui_debug")]
"DebugOutlines",
"ViewportCoords",
]
.join("\n\t")
)),
}
}
}

impl Next for Scene {
fn next(&self) -> Self {
match self {
Expand Down