mirror of
https://github.com/bevyengine/bevy
synced 2024-12-22 02:53:07 +00:00
f6b40a6e43
# Objective This PR aims to implement multiple configs for gizmos as discussed in #9187. ## Solution Configs for the new `GizmoConfigGroup`s are stored in a `GizmoConfigStore` resource and can be accesses using a type based key or iterated over. This type based key doubles as a standardized location where plugin authors can put their own configuration not covered by the standard `GizmoConfig` struct. For example the `AabbGizmoGroup` has a default color and toggle to show all AABBs. New configs can be registered using `app.init_gizmo_group::<T>()` during startup. When requesting the `Gizmos<T>` system parameter the generic type determines which config is used. The config structs are available through the `Gizmos` system parameter allowing for easy access while drawing your gizmos. Internally, resources and systems used for rendering (up to an including the extract system) are generic over the type based key and inserted on registering a new config. ## Alternatives The configs could be stored as components on entities with markers which would make better use of the ECS. I also implemented this approach ([here](https://github.com/jeliag/bevy/tree/gizmo-multiconf-comp)) and believe that the ergonomic benefits of a central config store outweigh the decreased use of the ECS. ## Unsafe Code Implementing system parameter by hand is unsafe but seems to be required to access the config store once and not on every gizmo draw function call. This is critical for performance. ~Is there a better way to do this?~ ## Future Work New gizmos (such as #10038, and ideas from #9400) will require custom configuration structs. Should there be a new custom config for every gizmo type, or should we group them together in a common configuration? (for example `EditorGizmoConfig`, or something more fine-grained) ## Changelog - Added `GizmoConfigStore` resource and `GizmoConfigGroup` trait - Added `init_gizmo_group` to `App` - Added early returns to gizmo drawing increasing performance when gizmos are disabled - Changed `GizmoConfig` and aabb gizmos to use new `GizmoConfigStore` - Changed `Gizmos` system parameter to use type based key to retrieve config - Changed resources and systems used for gizmo rendering to be generic over type based key - Changed examples (3d_gizmos, 2d_gizmos) to showcase new API ## Migration Guide - `GizmoConfig` is no longer a resource and has to be accessed through `GizmoConfigStore` resource. The default config group is `DefaultGizmoGroup`, but consider using your own custom config group if applicable. --------- Co-authored-by: Nicola Papale <nicopap@users.noreply.github.com>
117 lines
3.9 KiB
Rust
117 lines
3.9 KiB
Rust
//! Additional [`Gizmos`] Functions -- Arrows
|
|
//!
|
|
//! Includes the implementation of [`Gizmos::arrow`] and [`Gizmos::arrow_2d`],
|
|
//! and assorted support items.
|
|
|
|
use crate::prelude::{GizmoConfigGroup, Gizmos};
|
|
use bevy_math::{Quat, Vec2, Vec3};
|
|
use bevy_render::color::Color;
|
|
|
|
/// A builder returned by [`Gizmos::arrow`] and [`Gizmos::arrow_2d`]
|
|
pub struct ArrowBuilder<'a, 'w, 's, T: GizmoConfigGroup> {
|
|
gizmos: &'a mut Gizmos<'w, 's, T>,
|
|
start: Vec3,
|
|
end: Vec3,
|
|
color: Color,
|
|
tip_length: f32,
|
|
}
|
|
|
|
impl<T: GizmoConfigGroup> ArrowBuilder<'_, '_, '_, T> {
|
|
/// Change the length of the tips to be `length`.
|
|
/// The default tip length is [length of the arrow]/10.
|
|
///
|
|
/// # Example
|
|
/// ```
|
|
/// # use bevy_gizmos::prelude::*;
|
|
/// # use bevy_render::prelude::*;
|
|
/// # use bevy_math::prelude::*;
|
|
/// fn system(mut gizmos: Gizmos) {
|
|
/// gizmos.arrow(Vec3::ZERO, Vec3::ONE, Color::GREEN)
|
|
/// .with_tip_length(3.);
|
|
/// }
|
|
/// # bevy_ecs::system::assert_is_system(system);
|
|
/// ```
|
|
#[doc(alias = "arrow_head_length")]
|
|
pub fn with_tip_length(&mut self, length: f32) {
|
|
self.tip_length = length;
|
|
}
|
|
}
|
|
|
|
impl<T: GizmoConfigGroup> Drop for ArrowBuilder<'_, '_, '_, T> {
|
|
/// Draws the arrow, by drawing lines with the stored [`Gizmos`]
|
|
fn drop(&mut self) {
|
|
if !self.gizmos.enabled {
|
|
return;
|
|
}
|
|
// first, draw the body of the arrow
|
|
self.gizmos.line(self.start, self.end, self.color);
|
|
// now the hard part is to draw the head in a sensible way
|
|
// put us in a coordinate system where the arrow is pointing towards +x and ends at the origin
|
|
let pointing = (self.end - self.start).normalize();
|
|
let rotation = Quat::from_rotation_arc(Vec3::X, pointing);
|
|
let tips = [
|
|
Vec3::new(-1., 1., 0.),
|
|
Vec3::new(-1., 0., 1.),
|
|
Vec3::new(-1., -1., 0.),
|
|
Vec3::new(-1., 0., -1.),
|
|
];
|
|
// - extend the vectors so their length is `tip_length`
|
|
// - rotate the world so +x is facing in the same direction as the arrow
|
|
// - translate over to the tip of the arrow
|
|
let tips = tips.map(|v| rotation * (v.normalize() * self.tip_length) + self.end);
|
|
for v in tips {
|
|
// then actually draw the tips
|
|
self.gizmos.line(self.end, v, self.color);
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<'w, 's, T: GizmoConfigGroup> Gizmos<'w, 's, T> {
|
|
/// Draw an arrow in 3D, from `start` to `end`. Has four tips for convienent viewing from any direction.
|
|
///
|
|
/// This should be called for each frame the arrow needs to be rendered.
|
|
///
|
|
/// # Example
|
|
/// ```
|
|
/// # use bevy_gizmos::prelude::*;
|
|
/// # use bevy_render::prelude::*;
|
|
/// # use bevy_math::prelude::*;
|
|
/// fn system(mut gizmos: Gizmos) {
|
|
/// gizmos.arrow(Vec3::ZERO, Vec3::ONE, Color::GREEN);
|
|
/// }
|
|
/// # bevy_ecs::system::assert_is_system(system);
|
|
/// ```
|
|
pub fn arrow(&mut self, start: Vec3, end: Vec3, color: Color) -> ArrowBuilder<'_, 'w, 's, T> {
|
|
let length = (end - start).length();
|
|
ArrowBuilder {
|
|
gizmos: self,
|
|
start,
|
|
end,
|
|
color,
|
|
tip_length: length / 10.,
|
|
}
|
|
}
|
|
|
|
/// Draw an arrow in 2D (on the xy plane), from `start` to `end`.
|
|
///
|
|
/// This should be called for each frame the arrow needs to be rendered.
|
|
///
|
|
/// # Example
|
|
/// ```
|
|
/// # use bevy_gizmos::prelude::*;
|
|
/// # use bevy_render::prelude::*;
|
|
/// # use bevy_math::prelude::*;
|
|
/// fn system(mut gizmos: Gizmos) {
|
|
/// gizmos.arrow_2d(Vec2::ZERO, Vec2::X, Color::GREEN);
|
|
/// }
|
|
/// # bevy_ecs::system::assert_is_system(system);
|
|
/// ```
|
|
pub fn arrow_2d(
|
|
&mut self,
|
|
start: Vec2,
|
|
end: Vec2,
|
|
color: Color,
|
|
) -> ArrowBuilder<'_, 'w, 's, T> {
|
|
self.arrow(start.extend(0.), end.extend(0.), color)
|
|
}
|
|
}
|