Skip to content

Commit 5452393

Browse files
BenjaminBrienenBenjaminBrienen
committed
move bounds
1 parent 06f9e5e commit 5452393

File tree

106 files changed

+1864
-1475
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+1864
-1475
lines changed

‎Cargo.toml

+111-111
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,34 @@ keywords = ["game", "engine", "gamedev", "graphics", "bevy"]
1010
license = "MIT OR Apache-2.0"
1111
repository = "https://github.com/bevyengine/bevy"
1212
documentation = "https://docs.rs/bevy"
13-
rust-version = "1.85.0"
13+
rust-version = "1.86.0"
1414

1515
[workspace]
1616
resolver = "2"
1717
members = [
18-
# All of Bevy's official crates are within the `crates` folder!
19-
"crates/*",
20-
# Several crates with macros have "compile fail" tests nested inside them, also known as UI
21-
# tests, that verify diagnostic output does not accidentally change.
22-
# TODO: Use a glob pattern once they are fixed in `dependabot-core`
23-
# TODO: See https://github.com/bevyengine/bevy/issues/17876 for context.
24-
"crates/bevy_derive/compile_fail",
25-
"crates/bevy_ecs/compile_fail",
26-
"crates/bevy_reflect/compile_fail",
27-
# Examples of compiling Bevy for mobile platforms.
28-
"examples/mobile",
29-
# Examples of using Bevy on no_std platforms.
30-
"examples/no_std/*",
31-
# Benchmarks
32-
"benches",
33-
# Internal tools that are not published.
34-
"tools/*",
35-
# Bevy's error codes. This is a crate so we can automatically check all of the code blocks.
36-
"errors",
18+
# All of Bevy's official crates are within the `crates` folder!
19+
"crates/*",
20+
# Several crates with macros have "compile fail" tests nested inside them, also known as UI
21+
# tests, that verify diagnostic output does not accidentally change.
22+
# TODO: Use a glob pattern once they are fixed in `dependabot-core`
23+
# TODO: See https://github.com/bevyengine/bevy/issues/17876 for context.
24+
"crates/bevy_derive/compile_fail",
25+
"crates/bevy_ecs/compile_fail",
26+
"crates/bevy_reflect/compile_fail",
27+
# Examples of compiling Bevy for mobile platforms.
28+
"examples/mobile",
29+
# Examples of using Bevy on no_std platforms.
30+
"examples/no_std/*",
31+
# Benchmarks
32+
"benches",
33+
# Internal tools that are not published.
34+
"tools/*",
35+
# Bevy's error codes. This is a crate so we can automatically check all of the code blocks.
36+
"errors",
3737
]
3838
exclude = [
39-
# Integration tests are not part of the workspace
40-
"tests-integration",
39+
# Integration tests are not part of the workspace
40+
"tests-integration",
4141
]
4242

4343
[workspace.lints.clippy]
@@ -124,66 +124,66 @@ unused_qualifications = "warn"
124124

125125
[features]
126126
default = [
127-
"std",
128-
"async_executor",
129-
"android-game-activity",
130-
"android_shared_stdcxx",
131-
"animation",
132-
"bevy_asset",
133-
"bevy_audio",
134-
"bevy_color",
135-
"bevy_core_pipeline",
136-
"bevy_anti_aliasing",
137-
"bevy_gilrs",
138-
"bevy_gizmos",
139-
"bevy_gltf",
140-
"bevy_input_focus",
141-
"bevy_log",
142-
"bevy_mesh_picking_backend",
143-
"bevy_pbr",
144-
"bevy_picking",
145-
"bevy_render",
146-
"bevy_scene",
147-
"bevy_sprite",
148-
"bevy_sprite_picking_backend",
149-
"bevy_state",
150-
"bevy_text",
151-
"bevy_ui",
152-
"bevy_ui_picking_backend",
153-
"bevy_window",
154-
"bevy_winit",
155-
"custom_cursor",
156-
"default_font",
157-
"hdr",
158-
"multi_threaded",
159-
"png",
160-
"smaa_luts",
161-
"sysinfo_plugin",
162-
"tonemapping_luts",
163-
"vorbis",
164-
"webgl2",
165-
"x11",
127+
"std",
128+
"async_executor",
129+
"android-game-activity",
130+
"android_shared_stdcxx",
131+
"animation",
132+
"bevy_asset",
133+
"bevy_audio",
134+
"bevy_color",
135+
"bevy_core_pipeline",
136+
"bevy_anti_aliasing",
137+
"bevy_gilrs",
138+
"bevy_gizmos",
139+
"bevy_gltf",
140+
"bevy_input_focus",
141+
"bevy_log",
142+
"bevy_mesh_picking_backend",
143+
"bevy_pbr",
144+
"bevy_picking",
145+
"bevy_render",
146+
"bevy_scene",
147+
"bevy_sprite",
148+
"bevy_sprite_picking_backend",
149+
"bevy_state",
150+
"bevy_text",
151+
"bevy_ui",
152+
"bevy_ui_picking_backend",
153+
"bevy_window",
154+
"bevy_winit",
155+
"custom_cursor",
156+
"default_font",
157+
"hdr",
158+
"multi_threaded",
159+
"png",
160+
"smaa_luts",
161+
"sysinfo_plugin",
162+
"tonemapping_luts",
163+
"vorbis",
164+
"webgl2",
165+
"x11",
166166
]
167167

168168
# Recommended defaults for no_std applications
169169
default_no_std = ["libm", "critical-section", "bevy_color", "bevy_state"]
170170

171171
# Provides an implementation for picking meshes
172172
bevy_mesh_picking_backend = [
173-
"bevy_picking",
174-
"bevy_internal/bevy_mesh_picking_backend",
173+
"bevy_picking",
174+
"bevy_internal/bevy_mesh_picking_backend",
175175
]
176176

177177
# Provides an implementation for picking sprites
178178
bevy_sprite_picking_backend = [
179-
"bevy_picking",
180-
"bevy_internal/bevy_sprite_picking_backend",
179+
"bevy_picking",
180+
"bevy_internal/bevy_sprite_picking_backend",
181181
]
182182

183183
# Provides an implementation for picking UI
184184
bevy_ui_picking_backend = [
185-
"bevy_picking",
186-
"bevy_internal/bevy_ui_picking_backend",
185+
"bevy_picking",
186+
"bevy_internal/bevy_ui_picking_backend",
187187
]
188188

189189
# Provides a debug overlay for bevy UI
@@ -209,16 +209,16 @@ bevy_color = ["bevy_internal/bevy_color"]
209209

210210
# Provides cameras and other basic render pipeline features
211211
bevy_core_pipeline = [
212-
"bevy_internal/bevy_core_pipeline",
213-
"bevy_asset",
214-
"bevy_render",
212+
"bevy_internal/bevy_core_pipeline",
213+
"bevy_asset",
214+
"bevy_render",
215215
]
216216

217217
# Provides various anti aliasing solutions
218218
bevy_anti_aliasing = [
219-
"bevy_internal/bevy_anti_aliasing",
220-
"bevy_asset",
221-
"bevy_render",
219+
"bevy_internal/bevy_anti_aliasing",
220+
"bevy_asset",
221+
"bevy_render",
222222
]
223223

224224
# Adds gamepad support
@@ -229,11 +229,11 @@ bevy_gltf = ["bevy_internal/bevy_gltf", "bevy_asset", "bevy_scene", "bevy_pbr"]
229229

230230
# Adds PBR rendering
231231
bevy_pbr = [
232-
"bevy_internal/bevy_pbr",
233-
"bevy_asset",
234-
"bevy_render",
235-
"bevy_core_pipeline",
236-
"bevy_anti_aliasing",
232+
"bevy_internal/bevy_pbr",
233+
"bevy_asset",
234+
"bevy_render",
235+
"bevy_core_pipeline",
236+
"bevy_anti_aliasing",
237237
]
238238

239239
# Provides picking functionality
@@ -247,24 +247,24 @@ bevy_scene = ["bevy_internal/bevy_scene", "bevy_asset"]
247247

248248
# Provides sprite functionality
249249
bevy_sprite = [
250-
"bevy_internal/bevy_sprite",
251-
"bevy_render",
252-
"bevy_core_pipeline",
253-
"bevy_color",
254-
"bevy_anti_aliasing",
250+
"bevy_internal/bevy_sprite",
251+
"bevy_render",
252+
"bevy_core_pipeline",
253+
"bevy_color",
254+
"bevy_anti_aliasing",
255255
]
256256

257257
# Provides text functionality
258258
bevy_text = ["bevy_internal/bevy_text", "bevy_asset", "bevy_sprite"]
259259

260260
# A custom ECS-driven UI framework
261261
bevy_ui = [
262-
"bevy_internal/bevy_ui",
263-
"bevy_core_pipeline",
264-
"bevy_text",
265-
"bevy_sprite",
266-
"bevy_color",
267-
"bevy_anti_aliasing",
262+
"bevy_internal/bevy_ui",
263+
"bevy_core_pipeline",
264+
"bevy_text",
265+
"bevy_sprite",
266+
"bevy_color",
267+
"bevy_anti_aliasing",
268268
]
269269

270270
# Windowing layer
@@ -308,9 +308,9 @@ trace_tracy = ["trace", "bevy_internal/trace_tracy"]
308308

309309
# Tracing support, with memory profiling, exposing a port for Tracy
310310
trace_tracy_memory = [
311-
"trace",
312-
"bevy_internal/trace_tracy",
313-
"bevy_internal/trace_tracy_memory",
311+
"trace",
312+
"bevy_internal/trace_tracy",
313+
"bevy_internal/trace_tracy_memory",
314314
]
315315

316316
# Tracing support
@@ -468,7 +468,7 @@ pbr_transmission_textures = ["bevy_internal/pbr_transmission_textures"]
468468

469469
# Enable support for multi-layer material textures in the `StandardMaterial`, at the risk of blowing past the global, per-shader texture limit on older/lower-end GPUs
470470
pbr_multi_layer_material_textures = [
471-
"bevy_internal/pbr_multi_layer_material_textures",
471+
"bevy_internal/pbr_multi_layer_material_textures",
472472
]
473473

474474
# Enable support for anisotropy texture in the `StandardMaterial`, at the risk of blowing past the global, per-shader texture limit on older/lower-end GPUs
@@ -1367,17 +1367,17 @@ description = "Meshlet rendering for dense high-poly scenes (experimental)"
13671367
category = "3D Rendering"
13681368
wasm = false
13691369
setup = [
1370-
[
1371-
"mkdir",
1372-
"-p",
1373-
"assets/external/models",
1374-
],
1375-
[
1376-
"curl",
1377-
"-o",
1378-
"assets/external/models/bunny.meshlet_mesh",
1379-
"https://raw.githubusercontent.com/JMS55/bevy_meshlet_asset/7a7c14138021f63904b584d5f7b73b695c7f4bbf/bunny.meshlet_mesh",
1380-
],
1370+
[
1371+
"mkdir",
1372+
"-p",
1373+
"assets/external/models",
1374+
],
1375+
[
1376+
"curl",
1377+
"-o",
1378+
"assets/external/models/bunny.meshlet_mesh",
1379+
"https://raw.githubusercontent.com/JMS55/bevy_meshlet_asset/7a7c14138021f63904b584d5f7b73b695c7f4bbf/bunny.meshlet_mesh",
1380+
],
13811381
]
13821382

13831383
[[example]]
@@ -4183,13 +4183,13 @@ panic = "abort"
41834183
# with `--cfg docsrs` (and thus fail to compile) we use a different cfg.
41844184
rustc-args = ["--cfg", "docsrs_dep"]
41854185
rustdoc-args = [
4186-
"-Zunstable-options",
4187-
"--generate-link-to-definition",
4188-
# Embed tags to the top of documentation pages for common Bevy traits
4189-
# that are implemented by the current type, like `Component` or `Resource`.
4190-
# This makes it easier to see at a glance what types are used for.
4191-
"--html-after-content",
4192-
"docs-rs/trait-tags.html",
4186+
"-Zunstable-options",
4187+
"--generate-link-to-definition",
4188+
# Embed tags to the top of documentation pages for common Bevy traits
4189+
# that are implemented by the current type, like `Component` or `Resource`.
4190+
# This makes it easier to see at a glance what types are used for.
4191+
"--html-after-content",
4192+
"docs-rs/trait-tags.html",
41934193
]
41944194
all-features = true
41954195
cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"]

‎benches/benches/bevy_reflect/list.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fn list_apply<M, LBase, LPatch, F1, F2, F3>(
4747
) where
4848
M: Measurement,
4949
LBase: List,
50-
LPatch: List,
50+
LPatch: List + Send + Sync,
5151
F1: Fn(usize) -> F2,
5252
F2: Fn() -> LBase,
5353
F3: Fn(usize) -> LPatch,

‎benches/benches/bevy_reflect/map.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fn map_apply<M, MBase, MPatch, F1, F2, F3>(
5353
) where
5454
M: Measurement,
5555
MBase: Map,
56-
MPatch: Map,
56+
MPatch: Map + Send + Sync,
5757
F1: Fn(usize) -> F2,
5858
F2: Fn() -> MBase,
5959
F3: Fn(usize) -> MPatch,

‎benches/benches/bevy_reflect/struct.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ fn concrete_struct_apply(criterion: &mut Criterion) {
7373

7474
// Use functions that produce trait objects of varying concrete types as the
7575
// input to the benchmark.
76-
let inputs: &[fn() -> (Box<dyn Struct>, Box<dyn PartialReflect>)] = &[
76+
let inputs: &[fn() -> (Box<dyn Struct>, Box<dyn PartialReflect + Send + Sync>)] = &[
7777
|| (Box::new(Struct16::default()), Box::new(Struct16::default())),
7878
|| (Box::new(Struct32::default()), Box::new(Struct32::default())),
7979
|| (Box::new(Struct64::default()), Box::new(Struct64::default())),
@@ -243,7 +243,7 @@ fn dynamic_struct_to_dynamic_struct(criterion: &mut Criterion) {
243243
fn dynamic_struct_apply(criterion: &mut Criterion) {
244244
let mut group = create_group(criterion, bench!("dynamic_struct_apply"));
245245

246-
let patches: &[(fn() -> Box<dyn PartialReflect>, usize)] = &[
246+
let patches: &[(fn() -> Box<dyn PartialReflect + Send + Sync>, usize)] = &[
247247
(|| Box::new(Struct16::default()), 16),
248248
(|| Box::new(Struct32::default()), 32),
249249
(|| Box::new(Struct64::default()), 64),
@@ -612,12 +612,12 @@ struct Struct128 {
612612
}
613613

614614
#[derive(Clone, Default, Reflect)]
615-
struct GenericStruct1<T: Reflect + Default> {
615+
struct GenericStruct1<T: Reflect + Send + Sync + Default> {
616616
field_0: T,
617617
}
618618

619619
#[derive(Clone, Default, Reflect)]
620-
struct GenericStruct16<T: Reflect + Default> {
620+
struct GenericStruct16<T: Reflect + Send + Sync + Default> {
621621
field_0: T,
622622
field_1: T,
623623
field_2: T,
@@ -637,7 +637,7 @@ struct GenericStruct16<T: Reflect + Default> {
637637
}
638638

639639
#[derive(Clone, Default, Reflect)]
640-
struct GenericStruct32<T: Reflect + Default> {
640+
struct GenericStruct32<T: Reflect + Send + Sync + Default> {
641641
field_0: T,
642642
field_1: T,
643643
field_2: T,
@@ -673,7 +673,7 @@ struct GenericStruct32<T: Reflect + Default> {
673673
}
674674

675675
#[derive(Clone, Default, Reflect)]
676-
struct GenericStruct64<T: Reflect + Default> {
676+
struct GenericStruct64<T: Reflect + Send + Sync + Default> {
677677
field_0: T,
678678
field_1: T,
679679
field_2: T,
@@ -741,7 +741,7 @@ struct GenericStruct64<T: Reflect + Default> {
741741
}
742742

743743
#[derive(Clone, Default, Reflect)]
744-
struct GenericStruct128<T: Reflect + Default> {
744+
struct GenericStruct128<T: Reflect + Send + Sync + Default> {
745745
field_0: T,
746746
field_1: T,
747747
field_2: T,

0 commit comments

Comments
 (0)