2022-07-15 22:37:05 +00:00
|
|
|
//! Create a custom material to draw basic lines in 3D
|
|
|
|
|
|
|
|
use bevy::{
|
|
|
|
pbr::{MaterialPipeline, MaterialPipelineKey},
|
|
|
|
prelude::*,
|
|
|
|
reflect::TypeUuid,
|
|
|
|
render::{
|
|
|
|
mesh::{MeshVertexBufferLayout, PrimitiveTopology},
|
|
|
|
render_resource::{
|
|
|
|
AsBindGroup, PolygonMode, RenderPipelineDescriptor, ShaderRef,
|
|
|
|
SpecializedMeshPipelineError,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
App::new()
|
|
|
|
.add_plugins(DefaultPlugins)
|
|
|
|
.add_plugin(MaterialPlugin::<LineMaterial>::default())
|
2023-03-18 01:45:34 +00:00
|
|
|
.add_systems(Startup, setup)
|
2022-07-15 22:37:05 +00:00
|
|
|
.run();
|
|
|
|
}
|
|
|
|
|
|
|
|
fn setup(
|
|
|
|
mut commands: Commands,
|
|
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
|
|
mut materials: ResMut<Assets<LineMaterial>>,
|
|
|
|
) {
|
|
|
|
// Spawn a list of lines with start and end points for each lines
|
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(MaterialMeshBundle {
|
2022-07-15 22:37:05 +00:00
|
|
|
mesh: meshes.add(Mesh::from(LineList {
|
|
|
|
lines: vec![
|
|
|
|
(Vec3::ZERO, Vec3::new(1.0, 1.0, 0.0)),
|
|
|
|
(Vec3::new(1.0, 1.0, 0.0), Vec3::new(1.0, 0.0, 0.0)),
|
|
|
|
],
|
|
|
|
})),
|
|
|
|
transform: Transform::from_xyz(-1.5, 0.0, 0.0),
|
|
|
|
material: materials.add(LineMaterial {
|
|
|
|
color: Color::GREEN,
|
|
|
|
}),
|
|
|
|
..default()
|
|
|
|
});
|
|
|
|
|
|
|
|
// Spawn a line strip that goes from point to point
|
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(MaterialMeshBundle {
|
2022-07-15 22:37:05 +00:00
|
|
|
mesh: meshes.add(Mesh::from(LineStrip {
|
|
|
|
points: vec![
|
|
|
|
Vec3::ZERO,
|
|
|
|
Vec3::new(1.0, 1.0, 0.0),
|
|
|
|
Vec3::new(1.0, 0.0, 0.0),
|
|
|
|
],
|
|
|
|
})),
|
|
|
|
transform: Transform::from_xyz(0.5, 0.0, 0.0),
|
|
|
|
material: materials.add(LineMaterial { color: Color::BLUE }),
|
|
|
|
..default()
|
|
|
|
});
|
|
|
|
|
|
|
|
// camera
|
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(Camera3dBundle {
|
2022-07-15 22:37:05 +00:00
|
|
|
transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
|
|
|
|
..default()
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Default, AsBindGroup, TypeUuid, Debug, Clone)]
|
|
|
|
#[uuid = "050ce6ac-080a-4d8c-b6b5-b5bab7560d8f"]
|
|
|
|
struct LineMaterial {
|
|
|
|
#[uniform(0)]
|
|
|
|
color: Color,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Material for LineMaterial {
|
|
|
|
fn fragment_shader() -> ShaderRef {
|
|
|
|
"shaders/line_material.wgsl".into()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn specialize(
|
|
|
|
_pipeline: &MaterialPipeline<Self>,
|
|
|
|
descriptor: &mut RenderPipelineDescriptor,
|
|
|
|
_layout: &MeshVertexBufferLayout,
|
|
|
|
_key: MaterialPipelineKey<Self>,
|
|
|
|
) -> Result<(), SpecializedMeshPipelineError> {
|
|
|
|
// This is the important part to tell bevy to render this material as a line between vertices
|
|
|
|
descriptor.primitive.polygon_mode = PolygonMode::Line;
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// A list of lines with a start and end position
|
|
|
|
#[derive(Debug, Clone)]
|
|
|
|
pub struct LineList {
|
|
|
|
pub lines: Vec<(Vec3, Vec3)>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<LineList> for Mesh {
|
|
|
|
fn from(line: LineList) -> Self {
|
|
|
|
// This tells wgpu that the positions are list of lines
|
|
|
|
// where every pair is a start and end point
|
|
|
|
let mut mesh = Mesh::new(PrimitiveTopology::LineList);
|
|
|
|
|
2022-11-04 03:45:17 +00:00
|
|
|
let vertices: Vec<_> = line.lines.into_iter().flat_map(|(a, b)| [a, b]).collect();
|
2022-07-15 22:37:05 +00:00
|
|
|
mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, vertices);
|
|
|
|
mesh
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// A list of points that will have a line drawn between each consecutive points
|
|
|
|
#[derive(Debug, Clone)]
|
|
|
|
pub struct LineStrip {
|
|
|
|
pub points: Vec<Vec3>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl From<LineStrip> for Mesh {
|
|
|
|
fn from(line: LineStrip) -> Self {
|
|
|
|
// This tells wgpu that the positions are a list of points
|
|
|
|
// where a line will be drawn between each consecutive point
|
|
|
|
let mut mesh = Mesh::new(PrimitiveTopology::LineStrip);
|
|
|
|
|
2022-11-04 03:45:17 +00:00
|
|
|
mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, line.points);
|
2022-07-15 22:37:05 +00:00
|
|
|
mesh
|
|
|
|
}
|
|
|
|
}
|