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

Local 0.12 #4

Merged
merged 33 commits into from
Jan 10, 2024
Merged

Local 0.12 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f5bbc0e
chore: Release
github-actions[bot] Nov 4, 2023
48abb48
trigger CI
mockersf Nov 4, 2023
a31d782
Update split_screen example; replace `window_roots` with `camera_roots`
bardt Nov 8, 2023
c916f0f
Ui is painted to both left and right viewports
bardt Nov 10, 2023
0e83f9d
Independent panels rendering
bardt Nov 11, 2023
17c4b86
Propagate UiCamera to children
bardt Nov 11, 2023
9dcee10
Default to any active primary window camera
bardt Nov 11, 2023
3a4c50e
Layout based on camera scale factor
bardt Nov 11, 2023
1a56c16
Update camera target scale factor on window change
bardt Nov 11, 2023
f92ae56
Propagate UI camera on children change
bardt Nov 12, 2023
4e6c8e8
Relative cursor position
bardt Nov 12, 2023
fea5953
Resize viewport on scale factor change
bardt Nov 13, 2023
db34522
Restore initial ui_layout_system order
bardt Nov 14, 2023
bbcc1ac
Interactive UI in split screen example
bardt Nov 15, 2023
907647f
Revers button example, update cursor position example
bardt Nov 15, 2023
84a4476
Can layout without a camera
bardt Nov 16, 2023
f2474e0
Default to primary window itself, not a camera
bardt Nov 17, 2023
4f96816
Improve code formatting
bardt Nov 17, 2023
9436cc4
Code formatting in examples
bardt Nov 18, 2023
362ba7a
Remove redundant explicit ordering
bardt Nov 18, 2023
1a54c9c
Example of rendering UI to a texture
bardt Nov 24, 2023
66e727a
Pre-calculate camera layout into
bardt Nov 28, 2023
beeb2aa
Make layout system execution order closer to original
bardt Nov 28, 2023
d22e76d
Optimize UiCamera popagation
bardt Nov 29, 2023
445de0f
Fix `relative_cursor_position` example
bardt Nov 29, 2023
1c63529
Update examples/ui/render_ui_to_texture.rs
bardt Dec 3, 2023
705fdef
Default to a single camera if only one exists
bardt Dec 3, 2023
e8f35b9
Reduce number of iterations over nodes
bardt Dec 3, 2023
7b6ace4
Clippy fix
bardt Dec 3, 2023
87cc976
Fix imports in example
bardt Dec 3, 2023
496d702
Rename UiCamera to TargetCamera
bardt Dec 15, 2023
b6bbc15
remove 0.13 backport
robtfm Jan 9, 2024
7e2d731
fmt
robtfm Jan 9, 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
17 changes: 14 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy"
version = "0.12.0-dev"
version = "0.12.0"
edition = "2021"
categories = ["game-engines", "graphics", "gui", "rendering"]
description = "A refreshingly simple data-driven game engine and app framework"
Expand Down Expand Up @@ -276,8 +276,8 @@ file_watcher = ["bevy_internal/file_watcher"]
embedded_watcher = ["bevy_internal/embedded_watcher"]

[dependencies]
bevy_dylib = { path = "crates/bevy_dylib", version = "0.12.0-dev", default-features = false, optional = true }
bevy_internal = { path = "crates/bevy_internal", version = "0.12.0-dev", default-features = false }
bevy_dylib = { path = "crates/bevy_dylib", version = "0.12.0", default-features = false, optional = true }
bevy_internal = { path = "crates/bevy_internal", version = "0.12.0", default-features = false }

[dev-dependencies]
rand = "0.8.0"
Expand Down Expand Up @@ -2166,6 +2166,17 @@ description = "Showcases the RelativeCursorPosition component"
category = "UI (User Interface)"
wasm = true

[[example]]
name = "render_ui_to_texture"
path = "examples/ui/render_ui_to_texture.rs"
doc-scrape-examples = true

[package.metadata.example.render_ui_to_texture]
name = "Render UI to Texture"
description = "An example of rendering UI as a part of a 3D world"
category = "UI (User Interface)"
wasm = true

[[example]]
name = "size_constraints"
path = "examples/ui/size_constraints.rs"
Expand Down
8 changes: 4 additions & 4 deletions crates/bevy_a11y/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy_a11y"
version = "0.12.0-dev"
version = "0.12.0"
edition = "2021"
description = "Provides accessibility support for Bevy Engine"
homepage = "https://bevyengine.org"
Expand All @@ -10,8 +10,8 @@ keywords = ["bevy", "accessibility", "a11y"]

[dependencies]
# bevy
bevy_app = { path = "../bevy_app", version = "0.12.0-dev" }
bevy_derive = { path = "../bevy_derive", version = "0.12.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.12.0-dev" }
bevy_app = { path = "../bevy_app", version = "0.12.0" }
bevy_derive = { path = "../bevy_derive", version = "0.12.0" }
bevy_ecs = { path = "../bevy_ecs", version = "0.12.0" }

accesskit = "0.12"
24 changes: 12 additions & 12 deletions crates/bevy_animation/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy_animation"
version = "0.12.0-dev"
version = "0.12.0"
edition = "2021"
description = "Provides animation functionality for Bevy Engine"
homepage = "https://bevyengine.org"
Expand All @@ -10,14 +10,14 @@ keywords = ["bevy"]

[dependencies]
# bevy
bevy_app = { path = "../bevy_app", version = "0.12.0-dev" }
bevy_asset = { path = "../bevy_asset", version = "0.12.0-dev" }
bevy_core = { path = "../bevy_core", version = "0.12.0-dev" }
bevy_math = { path = "../bevy_math", version = "0.12.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.12.0-dev", features = ["bevy"] }
bevy_render = { path = "../bevy_render", version = "0.12.0-dev" }
bevy_time = { path = "../bevy_time", version = "0.12.0-dev" }
bevy_utils = { path = "../bevy_utils", version = "0.12.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.12.0-dev" }
bevy_transform = { path = "../bevy_transform", version = "0.12.0-dev" }
bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.12.0-dev" }
bevy_app = { path = "../bevy_app", version = "0.12.0" }
bevy_asset = { path = "../bevy_asset", version = "0.12.0" }
bevy_core = { path = "../bevy_core", version = "0.12.0" }
bevy_math = { path = "../bevy_math", version = "0.12.0" }
bevy_reflect = { path = "../bevy_reflect", version = "0.12.0", features = ["bevy"] }
bevy_render = { path = "../bevy_render", version = "0.12.0" }
bevy_time = { path = "../bevy_time", version = "0.12.0" }
bevy_utils = { path = "../bevy_utils", version = "0.12.0" }
bevy_ecs = { path = "../bevy_ecs", version = "0.12.0" }
bevy_transform = { path = "../bevy_transform", version = "0.12.0" }
bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.12.0" }
12 changes: 6 additions & 6 deletions crates/bevy_app/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy_app"
version = "0.12.0-dev"
version = "0.12.0"
edition = "2021"
description = "Provides core App functionality for Bevy Engine"
homepage = "https://bevyengine.org"
Expand All @@ -16,11 +16,11 @@ bevy_reflect = ["dep:bevy_reflect", "bevy_ecs/bevy_reflect"]

[dependencies]
# bevy
bevy_derive = { path = "../bevy_derive", version = "0.12.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.12.0-dev", default-features = false }
bevy_reflect = { path = "../bevy_reflect", version = "0.12.0-dev", optional = true }
bevy_utils = { path = "../bevy_utils", version = "0.12.0-dev" }
bevy_tasks = { path = "../bevy_tasks", version = "0.12.0-dev" }
bevy_derive = { path = "../bevy_derive", version = "0.12.0" }
bevy_ecs = { path = "../bevy_ecs", version = "0.12.0", default-features = false }
bevy_reflect = { path = "../bevy_reflect", version = "0.12.0", optional = true }
bevy_utils = { path = "../bevy_utils", version = "0.12.0" }
bevy_tasks = { path = "../bevy_tasks", version = "0.12.0" }

# other
serde = { version = "1.0", features = ["derive"], optional = true }
Expand Down
20 changes: 10 additions & 10 deletions crates/bevy_asset/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy_asset"
version = "0.12.0-dev"
version = "0.12.0"
edition = "2021"
description = "Provides asset functionality for Bevy Engine"
homepage = "https://bevyengine.org"
Expand All @@ -18,13 +18,13 @@ asset_processor = []
watch = []

[dependencies]
bevy_app = { path = "../bevy_app", version = "0.12.0-dev" }
bevy_asset_macros = { path = "macros", version = "0.12.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.12.0-dev" }
bevy_log = { path = "../bevy_log", version = "0.12.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.12.0-dev" }
bevy_tasks = { path = "../bevy_tasks", version = "0.12.0-dev" }
bevy_utils = { path = "../bevy_utils", version = "0.12.0-dev" }
bevy_app = { path = "../bevy_app", version = "0.12.0" }
bevy_asset_macros = { path = "macros", version = "0.12.0" }
bevy_ecs = { path = "../bevy_ecs", version = "0.12.0" }
bevy_log = { path = "../bevy_log", version = "0.12.0" }
bevy_reflect = { path = "../bevy_reflect", version = "0.12.0" }
bevy_tasks = { path = "../bevy_tasks", version = "0.12.0" }
bevy_utils = { path = "../bevy_utils", version = "0.12.0" }

async-broadcast = "0.5"
async-fs = "1.5"
Expand All @@ -41,7 +41,7 @@ thiserror = "1.0"
notify-debouncer-full = { version = "0.3.1", optional = true }

[target.'cfg(target_os = "android")'.dependencies]
bevy_winit = { path = "../bevy_winit", version = "0.12.0-dev" }
bevy_winit = { path = "../bevy_winit", version = "0.12.0" }

[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen = { version = "0.2" }
Expand All @@ -50,4 +50,4 @@ wasm-bindgen-futures = "0.4"
js-sys = "0.3"

[dev-dependencies]
bevy_core = { path = "../bevy_core", version = "0.12.0-dev" }
bevy_core = { path = "../bevy_core", version = "0.12.0" }
4 changes: 2 additions & 2 deletions crates/bevy_asset/macros/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy_asset_macros"
version = "0.12.0-dev"
version = "0.12.0"
edition = "2021"
description = "Derive implementations for bevy_asset"
homepage = "https://bevyengine.org"
Expand All @@ -12,7 +12,7 @@ keywords = ["bevy"]
proc-macro = true

[dependencies]
bevy_macro_utils = { path = "../../bevy_macro_utils", version = "0.12.0-dev" }
bevy_macro_utils = { path = "../../bevy_macro_utils", version = "0.12.0" }

syn = "2.0"
proc-macro2 = "1.0"
Expand Down
18 changes: 9 additions & 9 deletions crates/bevy_audio/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy_audio"
version = "0.12.0-dev"
version = "0.12.0"
edition = "2021"
description = "Provides audio functionality for Bevy Engine"
homepage = "https://bevyengine.org"
Expand All @@ -10,14 +10,14 @@ keywords = ["bevy"]

[dependencies]
# bevy
bevy_app = { path = "../bevy_app", version = "0.12.0-dev" }
bevy_asset = { path = "../bevy_asset", version = "0.12.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.12.0-dev" }
bevy_math = { path = "../bevy_math", version = "0.12.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.12.0-dev", features = ["bevy"] }
bevy_transform = { path = "../bevy_transform", version = "0.12.0-dev" }
bevy_derive = { path = "../bevy_derive", version = "0.12.0-dev" }
bevy_utils = { path = "../bevy_utils", version = "0.12.0-dev" }
bevy_app = { path = "../bevy_app", version = "0.12.0" }
bevy_asset = { path = "../bevy_asset", version = "0.12.0" }
bevy_ecs = { path = "../bevy_ecs", version = "0.12.0" }
bevy_math = { path = "../bevy_math", version = "0.12.0" }
bevy_reflect = { path = "../bevy_reflect", version = "0.12.0", features = ["bevy"] }
bevy_transform = { path = "../bevy_transform", version = "0.12.0" }
bevy_derive = { path = "../bevy_derive", version = "0.12.0" }
bevy_utils = { path = "../bevy_utils", version = "0.12.0" }

# other
rodio = { version = "0.17", default-features = false }
Expand Down
14 changes: 7 additions & 7 deletions crates/bevy_core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy_core"
version = "0.12.0-dev"
version = "0.12.0"
edition = "2021"
description = "Provides core functionality for Bevy Engine"
homepage = "https://bevyengine.org"
Expand All @@ -11,12 +11,12 @@ keywords = ["bevy"]

[dependencies]
# bevy
bevy_app = { path = "../bevy_app", version = "0.12.0-dev", features = ["bevy_reflect"] }
bevy_ecs = { path = "../bevy_ecs", version = "0.12.0-dev", features = ["bevy_reflect"] }
bevy_math = { path = "../bevy_math", version = "0.12.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.12.0-dev", features = ["bevy"] }
bevy_tasks = { path = "../bevy_tasks", version = "0.12.0-dev" }
bevy_utils = { path = "../bevy_utils", version = "0.12.0-dev" }
bevy_app = { path = "../bevy_app", version = "0.12.0", features = ["bevy_reflect"] }
bevy_ecs = { path = "../bevy_ecs", version = "0.12.0", features = ["bevy_reflect"] }
bevy_math = { path = "../bevy_math", version = "0.12.0" }
bevy_reflect = { path = "../bevy_reflect", version = "0.12.0", features = ["bevy"] }
bevy_tasks = { path = "../bevy_tasks", version = "0.12.0" }
bevy_utils = { path = "../bevy_utils", version = "0.12.0" }

# other
bytemuck = "1.5"
Expand Down
24 changes: 12 additions & 12 deletions crates/bevy_core_pipeline/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy_core_pipeline"
version = "0.12.0-dev"
version = "0.12.0"
edition = "2021"
authors = [
"Bevy Contributors <[email protected]>",
Expand All @@ -19,17 +19,17 @@ tonemapping_luts = ["bevy_render/ktx2", "bevy_render/zstd"]

[dependencies]
# bevy
bevy_app = { path = "../bevy_app", version = "0.12.0-dev" }
bevy_asset = { path = "../bevy_asset", version = "0.12.0-dev" }
bevy_core = { path = "../bevy_core", version = "0.12.0-dev" }
bevy_derive = { path = "../bevy_derive", version = "0.12.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.12.0-dev" }
bevy_log = { path = "../bevy_log", version = "0.12.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.12.0-dev" }
bevy_render = { path = "../bevy_render", version = "0.12.0-dev" }
bevy_transform = { path = "../bevy_transform", version = "0.12.0-dev" }
bevy_math = { path = "../bevy_math", version = "0.12.0-dev" }
bevy_utils = { path = "../bevy_utils", version = "0.12.0-dev" }
bevy_app = { path = "../bevy_app", version = "0.12.0" }
bevy_asset = { path = "../bevy_asset", version = "0.12.0" }
bevy_core = { path = "../bevy_core", version = "0.12.0" }
bevy_derive = { path = "../bevy_derive", version = "0.12.0" }
bevy_ecs = { path = "../bevy_ecs", version = "0.12.0" }
bevy_log = { path = "../bevy_log", version = "0.12.0" }
bevy_reflect = { path = "../bevy_reflect", version = "0.12.0" }
bevy_render = { path = "../bevy_render", version = "0.12.0" }
bevy_transform = { path = "../bevy_transform", version = "0.12.0" }
bevy_math = { path = "../bevy_math", version = "0.12.0" }
bevy_utils = { path = "../bevy_utils", version = "0.12.0" }

serde = { version = "1", features = ["derive"] }
bitflags = "2.3"
Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy_derive"
version = "0.12.0-dev"
version = "0.12.0"
edition = "2021"
description = "Provides derive implementations for Bevy Engine"
homepage = "https://bevyengine.org"
Expand All @@ -12,7 +12,7 @@ keywords = ["bevy"]
proc-macro = true

[dependencies]
bevy_macro_utils = { path = "../bevy_macro_utils", version = "0.12.0-dev" }
bevy_macro_utils = { path = "../bevy_macro_utils", version = "0.12.0" }

quote = "1.0"
syn = { version = "2.0", features = ["full"] }
14 changes: 7 additions & 7 deletions crates/bevy_diagnostic/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy_diagnostic"
version = "0.12.0-dev"
version = "0.12.0"
edition = "2021"
description = "Provides diagnostic functionality for Bevy Engine"
homepage = "https://bevyengine.org"
Expand All @@ -14,12 +14,12 @@ dynamic_linking = []

[dependencies]
# bevy
bevy_app = { path = "../bevy_app", version = "0.12.0-dev" }
bevy_core = { path = "../bevy_core", version = "0.12.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.12.0-dev" }
bevy_log = { path = "../bevy_log", version = "0.12.0-dev" }
bevy_time = { path = "../bevy_time", version = "0.12.0-dev" }
bevy_utils = { path = "../bevy_utils", version = "0.12.0-dev" }
bevy_app = { path = "../bevy_app", version = "0.12.0" }
bevy_core = { path = "../bevy_core", version = "0.12.0" }
bevy_ecs = { path = "../bevy_ecs", version = "0.12.0" }
bevy_log = { path = "../bevy_log", version = "0.12.0" }
bevy_time = { path = "../bevy_time", version = "0.12.0" }
bevy_utils = { path = "../bevy_utils", version = "0.12.0" }

# MacOS
[target.'cfg(all(target_os="macos"))'.dependencies]
Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_dylib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy_dylib"
version = "0.12.0-dev"
version = "0.12.0"
edition = "2021"
description = "Force the Bevy Engine to be dynamically linked for faster linking"
homepage = "https://bevyengine.org"
Expand All @@ -12,4 +12,4 @@ keywords = ["bevy"]
crate-type = ["dylib"]

[dependencies]
bevy_internal = { path = "../bevy_internal", version = "0.12.0-dev", default-features = false }
bevy_internal = { path = "../bevy_internal", version = "0.12.0", default-features = false }
4 changes: 2 additions & 2 deletions crates/bevy_dynamic_plugin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy_dynamic_plugin"
version = "0.12.0-dev"
version = "0.12.0"
edition = "2021"
description = "Provides dynamic plugin loading capabilities for non-wasm platforms"
homepage = "https://bevyengine.org"
Expand All @@ -10,7 +10,7 @@ keywords = ["bevy"]

[dependencies]
# bevy
bevy_app = { path = "../bevy_app", version = "0.12.0-dev" }
bevy_app = { path = "../bevy_app", version = "0.12.0" }

# other
libloading = { version = "0.8" }
Expand Down
12 changes: 6 additions & 6 deletions crates/bevy_ecs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy_ecs"
version = "0.12.0-dev"
version = "0.12.0"
edition = "2021"
description = "Bevy Engine's entity component system"
homepage = "https://bevyengine.org"
Expand All @@ -15,11 +15,11 @@ multi-threaded = ["bevy_tasks/multi-threaded"]
default = ["bevy_reflect"]

[dependencies]
bevy_ptr = { path = "../bevy_ptr", version = "0.12.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.12.0-dev", optional = true }
bevy_tasks = { path = "../bevy_tasks", version = "0.12.0-dev" }
bevy_utils = { path = "../bevy_utils", version = "0.12.0-dev" }
bevy_ecs_macros = { path = "macros", version = "0.12.0-dev" }
bevy_ptr = { path = "../bevy_ptr", version = "0.12.0" }
bevy_reflect = { path = "../bevy_reflect", version = "0.12.0", optional = true }
bevy_tasks = { path = "../bevy_tasks", version = "0.12.0" }
bevy_utils = { path = "../bevy_utils", version = "0.12.0" }
bevy_ecs_macros = { path = "macros", version = "0.12.0" }

async-channel = "1.4"
event-listener = "2.5"
Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_ecs/macros/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bevy_ecs_macros"
version = "0.12.0-dev"
version = "0.12.0"
description = "Bevy ECS Macros"
edition = "2021"
license = "MIT OR Apache-2.0"
Expand All @@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0"
proc-macro = true

[dependencies]
bevy_macro_utils = { path = "../../bevy_macro_utils", version = "0.12.0-dev" }
bevy_macro_utils = { path = "../../bevy_macro_utils", version = "0.12.0" }

syn = "2.0"
quote = "1.0"
Expand Down
Loading
Loading