2022-03-21 20:36:46 +00:00
|
|
|
//! Hierarchy and transform propagation stress test.
|
|
|
|
//!
|
|
|
|
//! Running this example:
|
|
|
|
//!
|
|
|
|
//! ```
|
2022-05-16 13:53:20 +00:00
|
|
|
//! cargo r --release --example transform_hierarchy <configuration name>
|
2022-03-21 20:36:46 +00:00
|
|
|
//! ```
|
|
|
|
//!
|
|
|
|
//! | Configuration | Description |
|
|
|
|
//! | -------------------- | ----------------------------------------------------------------- |
|
|
|
|
//! | `large_tree` | A fairly wide and deep tree. |
|
|
|
|
//! | `wide_tree` | A shallow but very wide tree. |
|
|
|
|
//! | `deep_tree` | A deep but not very wide tree. |
|
|
|
|
//! | `chain` | A chain. 2500 levels deep. |
|
|
|
|
//! | `update_leaves` | Same as `large_tree`, but only leaves are updated. |
|
|
|
|
//! | `update_shallow` | Same as `large_tree`, but only the first few levels are updated. |
|
|
|
|
//! | `humanoids_active` | 4000 active humanoid rigs. |
|
|
|
|
//! | `humanoids_inactive` | 4000 humanoid rigs. Only 10 are active. |
|
|
|
|
//! | `humanoids_mixed` | 2000 active and 2000 inactive humanoid rigs. |
|
|
|
|
|
|
|
|
use bevy::prelude::*;
|
|
|
|
use rand::Rng;
|
|
|
|
|
|
|
|
/// pre-defined test configurations with name
|
|
|
|
const CONFIGS: [(&str, Cfg); 9] = [
|
|
|
|
(
|
|
|
|
"large_tree",
|
|
|
|
Cfg {
|
|
|
|
test_case: TestCase::NonUniformTree {
|
|
|
|
depth: 18,
|
|
|
|
branch_width: 8,
|
|
|
|
},
|
|
|
|
update_filter: UpdateFilter {
|
|
|
|
probability: 0.5,
|
|
|
|
min_depth: 0,
|
|
|
|
max_depth: u32::MAX,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"wide_tree",
|
|
|
|
Cfg {
|
|
|
|
test_case: TestCase::Tree {
|
|
|
|
depth: 3,
|
|
|
|
branch_width: 500,
|
|
|
|
},
|
|
|
|
update_filter: UpdateFilter {
|
|
|
|
probability: 0.5,
|
|
|
|
min_depth: 0,
|
|
|
|
max_depth: u32::MAX,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"deep_tree",
|
|
|
|
Cfg {
|
|
|
|
test_case: TestCase::NonUniformTree {
|
|
|
|
depth: 25,
|
|
|
|
branch_width: 2,
|
|
|
|
},
|
|
|
|
update_filter: UpdateFilter {
|
|
|
|
probability: 0.5,
|
|
|
|
min_depth: 0,
|
|
|
|
max_depth: u32::MAX,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"chain",
|
|
|
|
Cfg {
|
|
|
|
test_case: TestCase::Tree {
|
|
|
|
depth: 2500,
|
|
|
|
branch_width: 1,
|
|
|
|
},
|
|
|
|
update_filter: UpdateFilter {
|
|
|
|
probability: 0.5,
|
|
|
|
min_depth: 0,
|
|
|
|
max_depth: u32::MAX,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"update_leaves",
|
|
|
|
Cfg {
|
|
|
|
test_case: TestCase::Tree {
|
|
|
|
depth: 18,
|
|
|
|
branch_width: 2,
|
|
|
|
},
|
|
|
|
update_filter: UpdateFilter {
|
|
|
|
probability: 0.5,
|
|
|
|
min_depth: 17,
|
|
|
|
max_depth: u32::MAX,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"update_shallow",
|
|
|
|
Cfg {
|
|
|
|
test_case: TestCase::Tree {
|
|
|
|
depth: 18,
|
|
|
|
branch_width: 2,
|
|
|
|
},
|
|
|
|
update_filter: UpdateFilter {
|
|
|
|
probability: 0.5,
|
|
|
|
min_depth: 0,
|
|
|
|
max_depth: 8,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"humanoids_active",
|
|
|
|
Cfg {
|
|
|
|
test_case: TestCase::Humanoids {
|
|
|
|
active: 4000,
|
|
|
|
inactive: 0,
|
|
|
|
},
|
|
|
|
update_filter: UpdateFilter {
|
|
|
|
probability: 1.0,
|
|
|
|
min_depth: 0,
|
|
|
|
max_depth: u32::MAX,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"humanoids_inactive",
|
|
|
|
Cfg {
|
|
|
|
test_case: TestCase::Humanoids {
|
|
|
|
active: 10,
|
|
|
|
inactive: 3990,
|
|
|
|
},
|
|
|
|
update_filter: UpdateFilter {
|
|
|
|
probability: 1.0,
|
|
|
|
min_depth: 0,
|
|
|
|
max_depth: u32::MAX,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"humanoids_mixed",
|
|
|
|
Cfg {
|
|
|
|
test_case: TestCase::Humanoids {
|
|
|
|
active: 2000,
|
|
|
|
inactive: 2000,
|
|
|
|
},
|
|
|
|
update_filter: UpdateFilter {
|
|
|
|
probability: 1.0,
|
|
|
|
min_depth: 0,
|
|
|
|
max_depth: u32::MAX,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
),
|
|
|
|
];
|
|
|
|
|
|
|
|
fn print_available_configs() {
|
|
|
|
println!("available configurations:");
|
|
|
|
for (name, _) in CONFIGS {
|
|
|
|
println!(" {name}");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
// parse cli argument and find the selected test configuration
|
|
|
|
let cfg: Cfg = match std::env::args().nth(1) {
|
|
|
|
Some(arg) => match CONFIGS.iter().find(|(name, _)| *name == arg) {
|
|
|
|
Some((name, cfg)) => {
|
|
|
|
println!("test configuration: {name}");
|
|
|
|
cfg.clone()
|
|
|
|
}
|
|
|
|
None => {
|
|
|
|
println!("test configuration \"{arg}\" not found.\n");
|
|
|
|
print_available_configs();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
},
|
|
|
|
None => {
|
|
|
|
println!("missing argument: <test configuration>\n");
|
|
|
|
print_available_configs();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
println!("\n{:#?}", cfg);
|
|
|
|
|
|
|
|
App::new()
|
|
|
|
.insert_resource(cfg)
|
|
|
|
.add_plugins(MinimalPlugins)
|
|
|
|
.add_plugin(TransformPlugin::default())
|
|
|
|
.add_startup_system(setup)
|
|
|
|
.add_system(update)
|
2022-05-31 01:38:07 +00:00
|
|
|
.run();
|
2022-03-21 20:36:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// test configuration
|
Make `Resource` trait opt-in, requiring `#[derive(Resource)]` V2 (#5577)
*This PR description is an edited copy of #5007, written by @alice-i-cecile.*
# Objective
Follow-up to https://github.com/bevyengine/bevy/pull/2254. The `Resource` trait currently has a blanket implementation for all types that meet its bounds.
While ergonomic, this results in several drawbacks:
* it is possible to make confusing, silent mistakes such as inserting a function pointer (Foo) rather than a value (Foo::Bar) as a resource
* it is challenging to discover if a type is intended to be used as a resource
* we cannot later add customization options (see the [RFC](https://github.com/bevyengine/rfcs/blob/main/rfcs/27-derive-component.md) for the equivalent choice for Component).
* dependencies can use the same Rust type as a resource in invisibly conflicting ways
* raw Rust types used as resources cannot preserve privacy appropriately, as anyone able to access that type can read and write to internal values
* we cannot capture a definitive list of possible resources to display to users in an editor
## Notes to reviewers
* Review this commit-by-commit; there's effectively no back-tracking and there's a lot of churn in some of these commits.
*ira: My commits are not as well organized :')*
* I've relaxed the bound on Local to Send + Sync + 'static: I don't think these concerns apply there, so this can keep things simple. Storing e.g. a u32 in a Local is fine, because there's a variable name attached explaining what it does.
* I think this is a bad place for the Resource trait to live, but I've left it in place to make reviewing easier. IMO that's best tackled with https://github.com/bevyengine/bevy/issues/4981.
## Changelog
`Resource` is no longer automatically implemented for all matching types. Instead, use the new `#[derive(Resource)]` macro.
## Migration Guide
Add `#[derive(Resource)]` to all types you are using as a resource.
If you are using a third party type as a resource, wrap it in a tuple struct to bypass orphan rules. Consider deriving `Deref` and `DerefMut` to improve ergonomics.
`ClearColor` no longer implements `Component`. Using `ClearColor` as a component in 0.8 did nothing.
Use the `ClearColorConfig` in the `Camera3d` and `Camera2d` components instead.
Co-authored-by: Alice <alice.i.cecile@gmail.com>
Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
Co-authored-by: devil-ira <justthecooldude@gmail.com>
Co-authored-by: Carter Anderson <mcanders1@gmail.com>
2022-08-08 21:36:35 +00:00
|
|
|
#[derive(Resource, Debug, Clone)]
|
2022-03-21 20:36:46 +00:00
|
|
|
struct Cfg {
|
|
|
|
/// which test case should be inserted
|
|
|
|
test_case: TestCase,
|
|
|
|
/// which entities should be updated
|
|
|
|
update_filter: UpdateFilter,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[allow(unused)]
|
|
|
|
#[derive(Debug, Clone)]
|
|
|
|
enum TestCase {
|
|
|
|
/// a uniform tree, exponentially growing with depth
|
|
|
|
Tree {
|
|
|
|
/// total depth
|
|
|
|
depth: u32,
|
|
|
|
/// number of children per node
|
|
|
|
branch_width: u32,
|
|
|
|
},
|
|
|
|
/// a non uniform tree (one side is deeper than the other)
|
|
|
|
/// creates significantly less nodes than `TestCase::Tree` with the same parameters
|
|
|
|
NonUniformTree {
|
|
|
|
/// the maximum depth
|
|
|
|
depth: u32,
|
|
|
|
/// max number of children per node
|
|
|
|
branch_width: u32,
|
|
|
|
},
|
|
|
|
/// one or multiple humanoid rigs
|
|
|
|
Humanoids {
|
|
|
|
/// number of active instances (uses the specified [`UpdateFilter`])
|
|
|
|
active: u32,
|
|
|
|
/// number of inactive instances (always inactive)
|
|
|
|
inactive: u32,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
/// a filter to restrict which nodes are updated
|
|
|
|
#[derive(Debug, Clone)]
|
|
|
|
struct UpdateFilter {
|
|
|
|
/// starting depth (inclusive)
|
|
|
|
min_depth: u32,
|
|
|
|
/// end depth (inclusive)
|
|
|
|
max_depth: u32,
|
|
|
|
/// probability of a node to get updated (evaluated at insertion time, not during update)
|
|
|
|
/// 0 (never) .. 1 (always)
|
|
|
|
probability: f32,
|
|
|
|
}
|
|
|
|
|
|
|
|
/// update component with some per-component value
|
|
|
|
#[derive(Component)]
|
|
|
|
struct Update(f32);
|
|
|
|
|
|
|
|
/// update positions system
|
|
|
|
fn update(time: Res<Time>, mut query: Query<(&mut Transform, &mut Update)>) {
|
2022-07-11 15:28:50 +00:00
|
|
|
for (mut t, mut u) in &mut query {
|
2022-03-21 20:36:46 +00:00
|
|
|
u.0 += time.delta_seconds() * 0.1;
|
|
|
|
set_translation(&mut t.translation, u.0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// set translation based on the angle `a`
|
|
|
|
fn set_translation(translation: &mut Vec3, a: f32) {
|
|
|
|
translation.x = a.cos() * 32.0;
|
|
|
|
translation.y = a.sin() * 32.0;
|
|
|
|
}
|
|
|
|
|
|
|
|
fn setup(mut commands: Commands, cfg: Res<Cfg>) {
|
2022-07-13 19:13:46 +00:00
|
|
|
warn!(include_str!("warning_string.txt"));
|
|
|
|
|
Camera Driven Rendering (#4745)
This adds "high level camera driven rendering" to Bevy. The goal is to give users more control over what gets rendered (and where) without needing to deal with render logic. This will make scenarios like "render to texture", "multiple windows", "split screen", "2d on 3d", "3d on 2d", "pass layering", and more significantly easier.
Here is an [example of a 2d render sandwiched between two 3d renders (each from a different perspective)](https://gist.github.com/cart/4fe56874b2e53bc5594a182fc76f4915):
![image](https://user-images.githubusercontent.com/2694663/168411086-af13dec8-0093-4a84-bdd4-d4362d850ffa.png)
Users can now spawn a camera, point it at a RenderTarget (a texture or a window), and it will "just work".
Rendering to a second window is as simple as spawning a second camera and assigning it to a specific window id:
```rust
// main camera (main window)
commands.spawn_bundle(Camera2dBundle::default());
// second camera (other window)
commands.spawn_bundle(Camera2dBundle {
camera: Camera {
target: RenderTarget::Window(window_id),
..default()
},
..default()
});
```
Rendering to a texture is as simple as pointing the camera at a texture:
```rust
commands.spawn_bundle(Camera2dBundle {
camera: Camera {
target: RenderTarget::Texture(image_handle),
..default()
},
..default()
});
```
Cameras now have a "render priority", which controls the order they are drawn in. If you want to use a camera's output texture as a texture in the main pass, just set the priority to a number lower than the main pass camera (which defaults to `0`).
```rust
// main pass camera with a default priority of 0
commands.spawn_bundle(Camera2dBundle::default());
commands.spawn_bundle(Camera2dBundle {
camera: Camera {
target: RenderTarget::Texture(image_handle.clone()),
priority: -1,
..default()
},
..default()
});
commands.spawn_bundle(SpriteBundle {
texture: image_handle,
..default()
})
```
Priority can also be used to layer to cameras on top of each other for the same RenderTarget. This is what "2d on top of 3d" looks like in the new system:
```rust
commands.spawn_bundle(Camera3dBundle::default());
commands.spawn_bundle(Camera2dBundle {
camera: Camera {
// this will render 2d entities "on top" of the default 3d camera's render
priority: 1,
..default()
},
..default()
});
```
There is no longer the concept of a global "active camera". Resources like `ActiveCamera<Camera2d>` and `ActiveCamera<Camera3d>` have been replaced with the camera-specific `Camera::is_active` field. This does put the onus on users to manage which cameras should be active.
Cameras are now assigned a single render graph as an "entry point", which is configured on each camera entity using the new `CameraRenderGraph` component. The old `PerspectiveCameraBundle` and `OrthographicCameraBundle` (generic on camera marker components like Camera2d and Camera3d) have been replaced by `Camera3dBundle` and `Camera2dBundle`, which set 3d and 2d default values for the `CameraRenderGraph` and projections.
```rust
// old 3d perspective camera
commands.spawn_bundle(PerspectiveCameraBundle::default())
// new 3d perspective camera
commands.spawn_bundle(Camera3dBundle::default())
```
```rust
// old 2d orthographic camera
commands.spawn_bundle(OrthographicCameraBundle::new_2d())
// new 2d orthographic camera
commands.spawn_bundle(Camera2dBundle::default())
```
```rust
// old 3d orthographic camera
commands.spawn_bundle(OrthographicCameraBundle::new_3d())
// new 3d orthographic camera
commands.spawn_bundle(Camera3dBundle {
projection: OrthographicProjection {
scale: 3.0,
scaling_mode: ScalingMode::FixedVertical,
..default()
}.into(),
..default()
})
```
Note that `Camera3dBundle` now uses a new `Projection` enum instead of hard coding the projection into the type. There are a number of motivators for this change: the render graph is now a part of the bundle, the way "generic bundles" work in the rust type system prevents nice `..default()` syntax, and changing projections at runtime is much easier with an enum (ex for editor scenarios). I'm open to discussing this choice, but I'm relatively certain we will all come to the same conclusion here. Camera2dBundle and Camera3dBundle are much clearer than being generic on marker components / using non-default constructors.
If you want to run a custom render graph on a camera, just set the `CameraRenderGraph` component:
```rust
commands.spawn_bundle(Camera3dBundle {
camera_render_graph: CameraRenderGraph::new(some_render_graph_name),
..default()
})
```
Just note that if the graph requires data from specific components to work (such as `Camera3d` config, which is provided in the `Camera3dBundle`), make sure the relevant components have been added.
Speaking of using components to configure graphs / passes, there are a number of new configuration options:
```rust
commands.spawn_bundle(Camera3dBundle {
camera_3d: Camera3d {
// overrides the default global clear color
clear_color: ClearColorConfig::Custom(Color::RED),
..default()
},
..default()
})
commands.spawn_bundle(Camera3dBundle {
camera_3d: Camera3d {
// disables clearing
clear_color: ClearColorConfig::None,
..default()
},
..default()
})
```
Expect to see more of the "graph configuration Components on Cameras" pattern in the future.
By popular demand, UI no longer requires a dedicated camera. `UiCameraBundle` has been removed. `Camera2dBundle` and `Camera3dBundle` now both default to rendering UI as part of their own render graphs. To disable UI rendering for a camera, disable it using the CameraUi component:
```rust
commands
.spawn_bundle(Camera3dBundle::default())
.insert(CameraUi {
is_enabled: false,
..default()
})
```
## Other Changes
* The separate clear pass has been removed. We should revisit this for things like sky rendering, but I think this PR should "keep it simple" until we're ready to properly support that (for code complexity and performance reasons). We can come up with the right design for a modular clear pass in a followup pr.
* I reorganized bevy_core_pipeline into Core2dPlugin and Core3dPlugin (and core_2d / core_3d modules). Everything is pretty much the same as before, just logically separate. I've moved relevant types (like Camera2d, Camera3d, Camera3dBundle, Camera2dBundle) into their relevant modules, which is what motivated this reorganization.
* I adapted the `scene_viewer` example (which relied on the ActiveCameras behavior) to the new system. I also refactored bits and pieces to be a bit simpler.
* All of the examples have been ported to the new camera approach. `render_to_texture` and `multiple_windows` are now _much_ simpler. I removed `two_passes` because it is less relevant with the new approach. If someone wants to add a new "layered custom pass with CameraRenderGraph" example, that might fill a similar niche. But I don't feel much pressure to add that in this pr.
* Cameras now have `target_logical_size` and `target_physical_size` fields, which makes finding the size of a camera's render target _much_ simpler. As a result, the `Assets<Image>` and `Windows` parameters were removed from `Camera::world_to_screen`, making that operation much more ergonomic.
* Render order ambiguities between cameras with the same target and the same priority now produce a warning. This accomplishes two goals:
1. Now that there is no "global" active camera, by default spawning two cameras will result in two renders (one covering the other). This would be a silent performance killer that would be hard to detect after the fact. By detecting ambiguities, we can provide a helpful warning when this occurs.
2. Render order ambiguities could result in unexpected / unpredictable render results. Resolving them makes sense.
## Follow Up Work
* Per-Camera viewports, which will make it possible to render to a smaller area inside of a RenderTarget (great for something like splitscreen)
* Camera-specific MSAA config (should use the same "overriding" pattern used for ClearColor)
* Graph Based Camera Ordering: priorities are simple, but they make complicated ordering constraints harder to express. We should consider adopting a "graph based" camera ordering model with "before" and "after" relationships to other cameras (or build it "on top" of the priority system).
* Consider allowing graphs to run subgraphs from any nest level (aka a global namespace for graphs). Right now the 2d and 3d graphs each need their own UI subgraph, which feels "fine" in the short term. But being able to share subgraphs between other subgraphs seems valuable.
* Consider splitting `bevy_core_pipeline` into `bevy_core_2d` and `bevy_core_3d` packages. Theres a shared "clear color" dependency here, which would need a new home.
2022-06-02 00:12:17 +00:00
|
|
|
let mut cam = Camera2dBundle::default();
|
2022-07-13 19:13:46 +00:00
|
|
|
|
2022-03-21 20:36:46 +00:00
|
|
|
cam.transform.translation.z = 100.0;
|
Spawn now takes a Bundle (#6054)
# Objective
Now that we can consolidate Bundles and Components under a single insert (thanks to #2975 and #6039), almost 100% of world spawns now look like `world.spawn().insert((Some, Tuple, Here))`. Spawning an entity without any components is an extremely uncommon pattern, so it makes sense to give spawn the "first class" ergonomic api. This consolidated api should be made consistent across all spawn apis (such as World and Commands).
## Solution
All `spawn` apis (`World::spawn`, `Commands:;spawn`, `ChildBuilder::spawn`, and `WorldChildBuilder::spawn`) now accept a bundle as input:
```rust
// before:
commands
.spawn()
.insert((A, B, C));
world
.spawn()
.insert((A, B, C);
// after
commands.spawn((A, B, C));
world.spawn((A, B, C));
```
All existing instances of `spawn_bundle` have been deprecated in favor of the new `spawn` api. A new `spawn_empty` has been added, replacing the old `spawn` api.
By allowing `world.spawn(some_bundle)` to replace `world.spawn().insert(some_bundle)`, this opened the door to removing the initial entity allocation in the "empty" archetype / table done in `spawn()` (and subsequent move to the actual archetype in `.insert(some_bundle)`).
This improves spawn performance by over 10%:
![image](https://user-images.githubusercontent.com/2694663/191627587-4ab2f949-4ccd-4231-80eb-80dd4d9ad6b9.png)
To take this measurement, I added a new `world_spawn` benchmark.
Unfortunately, optimizing `Commands::spawn` is slightly less trivial, as Commands expose the Entity id of spawned entities prior to actually spawning. Doing the optimization would (naively) require assurances that the `spawn(some_bundle)` command is applied before all other commands involving the entity (which would not necessarily be true, if memory serves). Optimizing `Commands::spawn` this way does feel possible, but it will require careful thought (and maybe some additional checks), which deserves its own PR. For now, it has the same performance characteristics of the current `Commands::spawn_bundle` on main.
**Note that 99% of this PR is simple renames and refactors. The only code that needs careful scrutiny is the new `World::spawn()` impl, which is relatively straightforward, but it has some new unsafe code (which re-uses battle tested BundlerSpawner code path).**
---
## Changelog
- All `spawn` apis (`World::spawn`, `Commands:;spawn`, `ChildBuilder::spawn`, and `WorldChildBuilder::spawn`) now accept a bundle as input
- All instances of `spawn_bundle` have been deprecated in favor of the new `spawn` api
- World and Commands now have `spawn_empty()`, which is equivalent to the old `spawn()` behavior.
## Migration Guide
```rust
// Old (0.8):
commands
.spawn()
.insert_bundle((A, B, C));
// New (0.9)
commands.spawn((A, B, C));
// Old (0.8):
commands.spawn_bundle((A, B, C));
// New (0.9)
commands.spawn((A, B, C));
// Old (0.8):
let entity = commands.spawn().id();
// New (0.9)
let entity = commands.spawn_empty().id();
// Old (0.8)
let entity = world.spawn().id();
// New (0.9)
let entity = world.spawn_empty();
```
2022-09-23 19:55:54 +00:00
|
|
|
commands.spawn(cam);
|
2022-03-21 20:36:46 +00:00
|
|
|
|
|
|
|
let result = match cfg.test_case {
|
|
|
|
TestCase::Tree {
|
|
|
|
depth,
|
|
|
|
branch_width,
|
|
|
|
} => {
|
|
|
|
let tree = gen_tree(depth, branch_width);
|
|
|
|
spawn_tree(&tree, &mut commands, &cfg.update_filter, default())
|
|
|
|
}
|
|
|
|
TestCase::NonUniformTree {
|
|
|
|
depth,
|
|
|
|
branch_width,
|
|
|
|
} => {
|
|
|
|
let tree = gen_non_uniform_tree(depth, branch_width);
|
|
|
|
spawn_tree(&tree, &mut commands, &cfg.update_filter, default())
|
|
|
|
}
|
|
|
|
TestCase::Humanoids { active, inactive } => {
|
|
|
|
let mut result = InsertResult::default();
|
|
|
|
let mut rng = rand::thread_rng();
|
|
|
|
|
|
|
|
for _ in 0..active {
|
|
|
|
result.combine(spawn_tree(
|
|
|
|
&HUMANOID_RIG,
|
|
|
|
&mut commands,
|
|
|
|
&cfg.update_filter,
|
|
|
|
Transform::from_xyz(
|
|
|
|
rng.gen::<f32>() * 500.0 - 250.0,
|
|
|
|
rng.gen::<f32>() * 500.0 - 250.0,
|
|
|
|
0.0,
|
|
|
|
),
|
|
|
|
));
|
|
|
|
}
|
|
|
|
|
|
|
|
for _ in 0..inactive {
|
|
|
|
result.combine(spawn_tree(
|
|
|
|
&HUMANOID_RIG,
|
|
|
|
&mut commands,
|
|
|
|
&UpdateFilter {
|
|
|
|
// force inactive by setting the probability < 0
|
|
|
|
probability: -1.0,
|
|
|
|
..cfg.update_filter
|
|
|
|
},
|
|
|
|
Transform::from_xyz(
|
|
|
|
rng.gen::<f32>() * 500.0 - 250.0,
|
|
|
|
rng.gen::<f32>() * 500.0 - 250.0,
|
|
|
|
0.0,
|
|
|
|
),
|
|
|
|
));
|
|
|
|
}
|
|
|
|
|
|
|
|
result
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
println!("\n{:#?}", result);
|
|
|
|
}
|
|
|
|
|
|
|
|
/// overview of the inserted hierarchy
|
|
|
|
#[derive(Default, Debug)]
|
|
|
|
struct InsertResult {
|
|
|
|
/// total number of nodes inserted
|
|
|
|
inserted_nodes: usize,
|
|
|
|
/// number of nodes that get updated each frame
|
|
|
|
active_nodes: usize,
|
|
|
|
/// maximum depth of the hierarchy tree
|
|
|
|
maximum_depth: usize,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl InsertResult {
|
|
|
|
fn combine(&mut self, rhs: Self) -> &mut Self {
|
|
|
|
self.inserted_nodes += rhs.inserted_nodes;
|
|
|
|
self.active_nodes += rhs.active_nodes;
|
|
|
|
self.maximum_depth = self.maximum_depth.max(rhs.maximum_depth);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// spawns a tree defined by a parent map (excluding root)
|
|
|
|
/// the parent map must be ordered (parent must exist before child)
|
|
|
|
fn spawn_tree(
|
|
|
|
parent_map: &[usize],
|
|
|
|
commands: &mut Commands,
|
|
|
|
update_filter: &UpdateFilter,
|
|
|
|
root_transform: Transform,
|
|
|
|
) -> InsertResult {
|
|
|
|
// total count (# of nodes + root)
|
|
|
|
let count = parent_map.len() + 1;
|
|
|
|
|
|
|
|
#[derive(Default, Clone, Copy)]
|
|
|
|
struct NodeInfo {
|
|
|
|
child_count: u32,
|
|
|
|
depth: u32,
|
|
|
|
}
|
|
|
|
|
|
|
|
// node index -> entity lookup list
|
|
|
|
let mut ents: Vec<Entity> = Vec::with_capacity(count);
|
|
|
|
let mut node_info: Vec<NodeInfo> = vec![default(); count];
|
|
|
|
for (i, &parent_idx) in parent_map.iter().enumerate() {
|
|
|
|
// assert spawn order (parent must be processed before child)
|
|
|
|
assert!(parent_idx <= i, "invalid spawn order");
|
|
|
|
node_info[parent_idx].child_count += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// insert root
|
2022-10-13 12:53:18 +00:00
|
|
|
ents.push(commands.spawn(TransformBundle::from(root_transform)).id());
|
2022-03-21 20:36:46 +00:00
|
|
|
|
|
|
|
let mut result = InsertResult::default();
|
|
|
|
let mut rng = rand::thread_rng();
|
|
|
|
// used to count through the number of children (used only for visual layout)
|
|
|
|
let mut child_idx: Vec<u16> = vec![0; count];
|
|
|
|
|
|
|
|
// insert children
|
|
|
|
for (current_idx, &parent_idx) in parent_map.iter().enumerate() {
|
|
|
|
let current_idx = current_idx + 1;
|
|
|
|
|
|
|
|
// separation factor to visually separate children (0..1)
|
|
|
|
let sep = child_idx[parent_idx] as f32 / node_info[parent_idx].child_count as f32;
|
|
|
|
child_idx[parent_idx] += 1;
|
|
|
|
|
|
|
|
// calculate and set depth
|
|
|
|
// this works because it's guaranteed that we have already iterated over the parent
|
|
|
|
let depth = node_info[parent_idx].depth + 1;
|
|
|
|
let info = &mut node_info[current_idx];
|
|
|
|
info.depth = depth;
|
|
|
|
|
|
|
|
// update max depth of tree
|
|
|
|
result.maximum_depth = result.maximum_depth.max(depth.try_into().unwrap());
|
|
|
|
|
|
|
|
// insert child
|
|
|
|
let child_entity = {
|
Spawn now takes a Bundle (#6054)
# Objective
Now that we can consolidate Bundles and Components under a single insert (thanks to #2975 and #6039), almost 100% of world spawns now look like `world.spawn().insert((Some, Tuple, Here))`. Spawning an entity without any components is an extremely uncommon pattern, so it makes sense to give spawn the "first class" ergonomic api. This consolidated api should be made consistent across all spawn apis (such as World and Commands).
## Solution
All `spawn` apis (`World::spawn`, `Commands:;spawn`, `ChildBuilder::spawn`, and `WorldChildBuilder::spawn`) now accept a bundle as input:
```rust
// before:
commands
.spawn()
.insert((A, B, C));
world
.spawn()
.insert((A, B, C);
// after
commands.spawn((A, B, C));
world.spawn((A, B, C));
```
All existing instances of `spawn_bundle` have been deprecated in favor of the new `spawn` api. A new `spawn_empty` has been added, replacing the old `spawn` api.
By allowing `world.spawn(some_bundle)` to replace `world.spawn().insert(some_bundle)`, this opened the door to removing the initial entity allocation in the "empty" archetype / table done in `spawn()` (and subsequent move to the actual archetype in `.insert(some_bundle)`).
This improves spawn performance by over 10%:
![image](https://user-images.githubusercontent.com/2694663/191627587-4ab2f949-4ccd-4231-80eb-80dd4d9ad6b9.png)
To take this measurement, I added a new `world_spawn` benchmark.
Unfortunately, optimizing `Commands::spawn` is slightly less trivial, as Commands expose the Entity id of spawned entities prior to actually spawning. Doing the optimization would (naively) require assurances that the `spawn(some_bundle)` command is applied before all other commands involving the entity (which would not necessarily be true, if memory serves). Optimizing `Commands::spawn` this way does feel possible, but it will require careful thought (and maybe some additional checks), which deserves its own PR. For now, it has the same performance characteristics of the current `Commands::spawn_bundle` on main.
**Note that 99% of this PR is simple renames and refactors. The only code that needs careful scrutiny is the new `World::spawn()` impl, which is relatively straightforward, but it has some new unsafe code (which re-uses battle tested BundlerSpawner code path).**
---
## Changelog
- All `spawn` apis (`World::spawn`, `Commands:;spawn`, `ChildBuilder::spawn`, and `WorldChildBuilder::spawn`) now accept a bundle as input
- All instances of `spawn_bundle` have been deprecated in favor of the new `spawn` api
- World and Commands now have `spawn_empty()`, which is equivalent to the old `spawn()` behavior.
## Migration Guide
```rust
// Old (0.8):
commands
.spawn()
.insert_bundle((A, B, C));
// New (0.9)
commands.spawn((A, B, C));
// Old (0.8):
commands.spawn_bundle((A, B, C));
// New (0.9)
commands.spawn((A, B, C));
// Old (0.8):
let entity = commands.spawn().id();
// New (0.9)
let entity = commands.spawn_empty().id();
// Old (0.8)
let entity = world.spawn().id();
// New (0.9)
let entity = world.spawn_empty();
```
2022-09-23 19:55:54 +00:00
|
|
|
let mut cmd = commands.spawn_empty();
|
2022-03-21 20:36:46 +00:00
|
|
|
|
|
|
|
// check whether or not to update this node
|
|
|
|
let update = (rng.gen::<f32>() <= update_filter.probability)
|
|
|
|
&& (depth >= update_filter.min_depth && depth <= update_filter.max_depth);
|
|
|
|
|
|
|
|
if update {
|
|
|
|
cmd.insert(Update(sep));
|
|
|
|
result.active_nodes += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
let transform = {
|
|
|
|
let mut translation = Vec3::ZERO;
|
|
|
|
// use the same placement fn as the `update` system
|
|
|
|
// this way the entities won't be all at (0, 0, 0) when they don't have an `Update` component
|
|
|
|
set_translation(&mut translation, sep);
|
|
|
|
Transform::from_translation(translation)
|
|
|
|
};
|
|
|
|
|
|
|
|
// only insert the components necessary for the transform propagation
|
2022-10-13 12:53:18 +00:00
|
|
|
cmd.insert(TransformBundle::from(transform));
|
2022-03-21 20:36:46 +00:00
|
|
|
|
|
|
|
cmd.id()
|
|
|
|
};
|
|
|
|
|
|
|
|
commands
|
|
|
|
.get_or_spawn(ents[parent_idx])
|
|
|
|
.add_child(child_entity);
|
|
|
|
|
|
|
|
ents.push(child_entity);
|
|
|
|
}
|
|
|
|
|
|
|
|
result.inserted_nodes = ents.len();
|
|
|
|
result
|
|
|
|
}
|
|
|
|
|
|
|
|
/// generate a tree `depth` levels deep, where each node has `branch_width` children
|
|
|
|
fn gen_tree(depth: u32, branch_width: u32) -> Vec<usize> {
|
|
|
|
// calculate the total count of branches
|
|
|
|
let mut count: usize = 0;
|
|
|
|
for i in 0..(depth - 1) {
|
|
|
|
count += TryInto::<usize>::try_into(branch_width.pow(i)).unwrap();
|
|
|
|
}
|
|
|
|
|
|
|
|
// the tree is built using this pattern:
|
|
|
|
// 0, 0, 0, ... 1, 1, 1, ... 2, 2, 2, ... (count - 1)
|
|
|
|
(0..count)
|
|
|
|
.flat_map(|i| std::iter::repeat(i).take(branch_width.try_into().unwrap()))
|
|
|
|
.collect()
|
|
|
|
}
|
|
|
|
|
|
|
|
/// recursive part of [`gen_non_uniform_tree`]
|
|
|
|
fn add_children_non_uniform(
|
|
|
|
tree: &mut Vec<usize>,
|
|
|
|
parent: usize,
|
|
|
|
mut curr_depth: u32,
|
|
|
|
max_branch_width: u32,
|
|
|
|
) {
|
|
|
|
for _ in 0..max_branch_width {
|
|
|
|
tree.push(parent);
|
|
|
|
|
|
|
|
curr_depth = curr_depth.checked_sub(1).unwrap();
|
|
|
|
if curr_depth == 0 {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
add_children_non_uniform(tree, tree.len(), curr_depth, max_branch_width);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// generate a tree that has more nodes on one side that the other
|
|
|
|
/// the deepest hierarchy path is `max_depth` and the widest branches have `max_branch_width` children
|
|
|
|
fn gen_non_uniform_tree(max_depth: u32, max_branch_width: u32) -> Vec<usize> {
|
|
|
|
let mut tree = Vec::new();
|
|
|
|
add_children_non_uniform(&mut tree, 0, max_depth, max_branch_width);
|
|
|
|
tree
|
|
|
|
}
|
|
|
|
|
|
|
|
/// parent map for a decently complex humanoid rig (based on mixamo rig)
|
|
|
|
const HUMANOID_RIG: [usize; 67] = [
|
|
|
|
// (0: root)
|
|
|
|
0, // 1: hips
|
|
|
|
1, // 2: spine
|
|
|
|
2, // 3: spine 1
|
|
|
|
3, // 4: spine 2
|
|
|
|
4, // 5: neck
|
|
|
|
5, // 6: head
|
|
|
|
6, // 7: head top
|
|
|
|
6, // 8: left eye
|
|
|
|
6, // 9: right eye
|
|
|
|
4, // 10: left shoulder
|
|
|
|
10, // 11: left arm
|
|
|
|
11, // 12: left forearm
|
|
|
|
12, // 13: left hand
|
|
|
|
13, // 14: left hand thumb 1
|
|
|
|
14, // 15: left hand thumb 2
|
|
|
|
15, // 16: left hand thumb 3
|
|
|
|
16, // 17: left hand thumb 4
|
|
|
|
13, // 18: left hand index 1
|
|
|
|
18, // 19: left hand index 2
|
|
|
|
19, // 20: left hand index 3
|
|
|
|
20, // 21: left hand index 4
|
|
|
|
13, // 22: left hand middle 1
|
|
|
|
22, // 23: left hand middle 2
|
|
|
|
23, // 24: left hand middle 3
|
|
|
|
24, // 25: left hand middle 4
|
|
|
|
13, // 26: left hand ring 1
|
|
|
|
26, // 27: left hand ring 2
|
|
|
|
27, // 28: left hand ring 3
|
|
|
|
28, // 29: left hand ring 4
|
|
|
|
13, // 30: left hand pinky 1
|
|
|
|
30, // 31: left hand pinky 2
|
|
|
|
31, // 32: left hand pinky 3
|
|
|
|
32, // 33: left hand pinky 4
|
|
|
|
4, // 34: right shoulder
|
|
|
|
34, // 35: right arm
|
|
|
|
35, // 36: right forearm
|
|
|
|
36, // 37: right hand
|
|
|
|
37, // 38: right hand thumb 1
|
|
|
|
38, // 39: right hand thumb 2
|
|
|
|
39, // 40: right hand thumb 3
|
|
|
|
40, // 41: right hand thumb 4
|
|
|
|
37, // 42: right hand index 1
|
|
|
|
42, // 43: right hand index 2
|
|
|
|
43, // 44: right hand index 3
|
|
|
|
44, // 45: right hand index 4
|
|
|
|
37, // 46: right hand middle 1
|
|
|
|
46, // 47: right hand middle 2
|
|
|
|
47, // 48: right hand middle 3
|
|
|
|
48, // 49: right hand middle 4
|
|
|
|
37, // 50: right hand ring 1
|
|
|
|
50, // 51: right hand ring 2
|
|
|
|
51, // 52: right hand ring 3
|
|
|
|
52, // 53: right hand ring 4
|
|
|
|
37, // 54: right hand pinky 1
|
|
|
|
54, // 55: right hand pinky 2
|
|
|
|
55, // 56: right hand pinky 3
|
|
|
|
56, // 57: right hand pinky 4
|
|
|
|
1, // 58: left upper leg
|
|
|
|
58, // 59: left leg
|
|
|
|
59, // 60: left foot
|
|
|
|
60, // 61: left toe base
|
|
|
|
61, // 62: left toe end
|
|
|
|
1, // 63: right upper leg
|
|
|
|
63, // 64: right leg
|
|
|
|
64, // 65: right foot
|
|
|
|
65, // 66: right toe base
|
|
|
|
66, // 67: right toe end
|
|
|
|
];
|