Skip to content
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

Upgrade examples to bevy-inspector-egui 0.23 #281

Merged
merged 2 commits into from
Feb 21, 2024
Merged

Upgrade examples to bevy-inspector-egui 0.23 #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a275b07
Upgrade to bevy-inspector-egui 0.23
djeedai Feb 21, 2024
f397c51
Remove bevy-inspector-egui from deps
djeedai Feb 21, 2024
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
12 changes: 8 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ exclude = ["examples/*.gif", "examples/*.png", ".github", "release.md", "run_exa
autoexamples = false

[features]
default = ["2d", "3d", "gpu_tests"]
default = ["2d", "3d", "gpu_tests", "examples_world_inspector"]

# Enable support for rendering through a 2D camera (Camera2dBundle)
2d = []
Expand All @@ -29,6 +29,10 @@ gpu_tests = []

# Enable world inspector in examples, via bevy-inspector-egui.
# This has no effect on the crate itself, only affects examples.
# Unfortunately cargo doesn't allow example-only features.
# We don't force a dependency on the bevy-inspector-egui crate because:
# 1. dev-dependencies cannot be optional
# 2. there's a bunch of duplicate deps and dodgy licenses pulled
examples_world_inspector = []

[dependencies]
Expand Down Expand Up @@ -58,14 +62,14 @@ all-features = true
# Same versions as Bevy 0.13 (bevy_render)
wgpu = "0.19.1"

# For world inspector; required if "examples_world_inspector" is used.
bevy-inspector-egui = "0.23"

# For procedural texture generation in examples
noise = "0.8"

futures = "0.3"

# For world inspector
#bevy-inspector-egui = "0.21" # waiting for 0.13-compatible version

# Bug in 0.13, need explicit dependency
bevy_gizmos_macros = "0.13"
bevy_sprite = "0.13"
Expand Down
34 changes: 17 additions & 17 deletions run_examples.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
@echo on
echo Run all examples
REM 3D
cargo r --example firework --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example portal --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example expr --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example spawn --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example multicam --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example visibility --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example random --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example spawn_on_command --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example activate --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example force_field --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example init --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example lifetime --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example instancing --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example firework --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example portal --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example expr --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example spawn --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example multicam --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example visibility --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example random --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example spawn_on_command --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example activate --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example force_field --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example init --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example lifetime --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example instancing --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
REM 3D + PNG
cargo r --example gradient --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr bevy/png 3d"
cargo r --example circle --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr bevy/png 3d"
cargo r --example billboard --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr bevy/png 3d"
cargo r --example gradient --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr bevy/png 3d examples_world_inspector"
cargo r --example circle --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr bevy/png 3d examples_world_inspector"
cargo r --example billboard --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr bevy/png 3d examples_world_inspector"
REM 2D
cargo r --example 2d --no-default-features --features="bevy/bevy_winit bevy/bevy_sprite 2d"
cargo r --example 2d --no-default-features --features="bevy/bevy_winit bevy/bevy_sprite 2d examples_world_inspector"
34 changes: 17 additions & 17 deletions run_examples.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
echo Run all examples
# 3D
cargo r --example firework --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example portal --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example expr --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example spawn --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example multicam --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example visibility --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example random --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example spawn_on_command --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example activate --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example force_field --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example init --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example lifetime --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example instancing --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d"
cargo r --example firework --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example portal --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example expr --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example spawn --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example multicam --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example visibility --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example random --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example spawn_on_command --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example activate --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example force_field --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example init --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example lifetime --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
cargo r --example instancing --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr 3d examples_world_inspector"
# 3D + PNG
cargo r --example gradient --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr bevy/png 3d"
cargo r --example circle --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr bevy/png 3d"
cargo r --example billboard --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr bevy/png 3d"
cargo r --example gradient --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr bevy/png 3d examples_world_inspector"
cargo r --example circle --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr bevy/png 3d examples_world_inspector"
cargo r --example billboard --no-default-features --features="bevy/bevy_winit bevy/bevy_pbr bevy/png 3d examples_world_inspector"
# 2D
cargo r --example 2d --no-default-features --features="bevy/bevy_winit bevy/bevy_sprite 2d"
cargo r --example 2d --no-default-features --features="bevy/bevy_winit bevy/bevy_sprite 2d examples_world_inspector"
Loading