From d3689bc3784419c1c2dde5e8943253cb9048670c Mon Sep 17 00:00:00 2001 From: Rob Parrett Date: Wed, 24 Jan 2024 11:22:38 -0700 Subject: [PATCH 1/2] Fix examples using argh on the web --- examples/stress_tests/bevymark.rs | 3 +++ examples/stress_tests/many_buttons.rs | 4 ++++ examples/stress_tests/many_cubes.rs | 3 +++ examples/stress_tests/many_foxes.rs | 3 +++ examples/ui/text_wrap_debug.rs | 4 ++++ 5 files changed, 17 insertions(+) diff --git a/examples/stress_tests/bevymark.rs b/examples/stress_tests/bevymark.rs index 02278e6610ad9..2c918f79b2f43 100644 --- a/examples/stress_tests/bevymark.rs +++ b/examples/stress_tests/bevymark.rs @@ -94,7 +94,10 @@ impl FromStr for Mode { const FIXED_TIMESTEP: f32 = 0.2; fn main() { + #[cfg(not(target_arch = "wasm32"))] let args: Args = argh::from_env(); + #[cfg(target_arch = "wasm32")] + let args = Args::from_args(&[], &[]).unwrap(); App::new() .add_plugins(( diff --git a/examples/stress_tests/many_buttons.rs b/examples/stress_tests/many_buttons.rs index 64b69902ae649..2e3458e3c4eaf 100644 --- a/examples/stress_tests/many_buttons.rs +++ b/examples/stress_tests/many_buttons.rs @@ -42,7 +42,11 @@ struct Args { /// This example shows what happens when there is a lot of buttons on screen. fn main() { + #[cfg(not(target_arch = "wasm32"))] let args: Args = argh::from_env(); + #[cfg(target_arch = "wasm32")] + let args = Args::from_args(&[], &[]).unwrap(); + let mut app = App::new(); app.add_plugins(( diff --git a/examples/stress_tests/many_cubes.rs b/examples/stress_tests/many_cubes.rs index 1da8e18bbe1ec..5e28e8fa52d0c 100644 --- a/examples/stress_tests/many_cubes.rs +++ b/examples/stress_tests/many_cubes.rs @@ -66,7 +66,10 @@ impl FromStr for Layout { } fn main() { + #[cfg(not(target_arch = "wasm32"))] let args: Args = argh::from_env(); + #[cfg(target_arch = "wasm32")] + let args = Args::from_args(&[], &[]).unwrap(); App::new() .add_plugins(( diff --git a/examples/stress_tests/many_foxes.rs b/examples/stress_tests/many_foxes.rs index 8cdb350146aa8..ee0b030029d65 100644 --- a/examples/stress_tests/many_foxes.rs +++ b/examples/stress_tests/many_foxes.rs @@ -33,7 +33,10 @@ struct Foxes { } fn main() { + #[cfg(not(target_arch = "wasm32"))] let args: Args = argh::from_env(); + #[cfg(target_arch = "wasm32")] + let args = Args::from_args(&[], &[]).unwrap(); App::new() .add_plugins(( diff --git a/examples/ui/text_wrap_debug.rs b/examples/ui/text_wrap_debug.rs index 0bd928ebd3ffb..b6d6293cd7734 100644 --- a/examples/ui/text_wrap_debug.rs +++ b/examples/ui/text_wrap_debug.rs @@ -19,7 +19,11 @@ struct Args { } fn main() { + #[cfg(not(target_arch = "wasm32"))] let args: Args = argh::from_env(); + #[cfg(target_arch = "wasm32")] + let args = Args::from_args(&[], &[]).unwrap(); + let window = if let Some(scale_factor) = args.scale_factor { Window { resolution: WindowResolution::default().with_scale_factor_override(scale_factor), From db33fcc1961ee685861fa83624a42d1502a37412 Mon Sep 17 00:00:00 2001 From: Rob Parrett Date: Wed, 24 Jan 2024 11:39:02 -0700 Subject: [PATCH 2/2] Add comment --- examples/stress_tests/bevymark.rs | 1 + examples/stress_tests/many_buttons.rs | 1 + examples/stress_tests/many_cubes.rs | 1 + examples/stress_tests/many_foxes.rs | 1 + examples/ui/text_wrap_debug.rs | 1 + 5 files changed, 5 insertions(+) diff --git a/examples/stress_tests/bevymark.rs b/examples/stress_tests/bevymark.rs index 2c918f79b2f43..9a3ef143bed66 100644 --- a/examples/stress_tests/bevymark.rs +++ b/examples/stress_tests/bevymark.rs @@ -94,6 +94,7 @@ impl FromStr for Mode { const FIXED_TIMESTEP: f32 = 0.2; fn main() { + // `from_env` panics on the web #[cfg(not(target_arch = "wasm32"))] let args: Args = argh::from_env(); #[cfg(target_arch = "wasm32")] diff --git a/examples/stress_tests/many_buttons.rs b/examples/stress_tests/many_buttons.rs index 2e3458e3c4eaf..405f0c46a55ac 100644 --- a/examples/stress_tests/many_buttons.rs +++ b/examples/stress_tests/many_buttons.rs @@ -42,6 +42,7 @@ struct Args { /// This example shows what happens when there is a lot of buttons on screen. fn main() { + // `from_env` panics on the web #[cfg(not(target_arch = "wasm32"))] let args: Args = argh::from_env(); #[cfg(target_arch = "wasm32")] diff --git a/examples/stress_tests/many_cubes.rs b/examples/stress_tests/many_cubes.rs index 5e28e8fa52d0c..ebbee17032176 100644 --- a/examples/stress_tests/many_cubes.rs +++ b/examples/stress_tests/many_cubes.rs @@ -66,6 +66,7 @@ impl FromStr for Layout { } fn main() { + // `from_env` panics on the web #[cfg(not(target_arch = "wasm32"))] let args: Args = argh::from_env(); #[cfg(target_arch = "wasm32")] diff --git a/examples/stress_tests/many_foxes.rs b/examples/stress_tests/many_foxes.rs index ee0b030029d65..8311b494e4090 100644 --- a/examples/stress_tests/many_foxes.rs +++ b/examples/stress_tests/many_foxes.rs @@ -33,6 +33,7 @@ struct Foxes { } fn main() { + // `from_env` panics on the web #[cfg(not(target_arch = "wasm32"))] let args: Args = argh::from_env(); #[cfg(target_arch = "wasm32")] diff --git a/examples/ui/text_wrap_debug.rs b/examples/ui/text_wrap_debug.rs index b6d6293cd7734..657ba0dc76006 100644 --- a/examples/ui/text_wrap_debug.rs +++ b/examples/ui/text_wrap_debug.rs @@ -19,6 +19,7 @@ struct Args { } fn main() { + // `from_env` panics on the web #[cfg(not(target_arch = "wasm32"))] let args: Args = argh::from_env(); #[cfg(target_arch = "wasm32")]