mirror of
https://github.com/bevyengine/bevy
synced 2024-11-10 07:04:33 +00:00
74cecb27bb
# Objective
Previously, our cubic spline constructors would produce
`CubicCurve`/`RationalCurve` output with no data when they themselves
didn't hold enough control points to produce a well-formed curve.
Attempting to sample the resulting empty "curves" (e.g. by calling
`CubicCurve::position`) would crash the program (😓).
The objectives of this PR are:
1. Ensure that the curve output of `bevy_math`'s spline constructions
are never invalid as data.
2. Provide a type-level guarantee that `CubicCurve` and `RationalCurve`
actually function as curves.
## Solution
This has a few pieces. Firstly, the curve generator traits
`CubicGenerator`, `CyclicCubicGenerator`, and `RationalGenerator` are
now fallible — they have associated error types, and the
curve-generation functions are allowed to fail:
```rust
/// Implement this on cubic splines that can generate a cubic curve from their spline parameters.
pub trait CubicGenerator<P: VectorSpace> {
/// An error type indicating why construction might fail.
type Error;
/// Build a [`CubicCurve`] by computing the interpolation coefficients for each curve segment.
fn to_curve(&self) -> Result<CubicCurve<P>, Self::Error>;
}
```
All existing spline constructions use this together with errors that
indicate when they didn't have the right control data and provide curves
which have at least one segment whenever they return an `Ok` variant.
Next, `CubicCurve` and `RationalCurve` have been blessed with a
guarantee that their internal array of segments (`segments`) is never
empty. In particular, this field is no longer public, so that invalid
curves cannot be built using struct instantiation syntax. To compensate
for this shortfall for users (in particular library authors who might
want to implement their own generators), there is a new method
`from_segments` on these for constructing a curve from a list of
segments, failing if the list is empty:
```rust
/// Create a new curve from a collection of segments. If the collection of segments is empty,
/// a curve cannot be built and `None` will be returned instead.
pub fn from_segments(segments: impl Into<Vec<CubicSegment<P>>>) -> Option<Self> { //... }
```
All existing methods on `CyclicCurve` and `CubicCurve` maintain the
invariant, so the direct construction of invalid values by users is
impossible.
## Testing
Run unit tests from `bevy_math::cubic_splines`. Additionally, run the
`cubic_splines` example and try to get it to crash using small numbers
of control points: it uses the fallible constructors directly, so if
invalid data is ever constructed, it is basically guaranteed to crash.
---
## Migration Guide
The `to_curve` method on Bevy's cubic splines is now fallible (returning
a `Result`), meaning that any existing calls will need to be updated by
handling the possibility of an error variant.
Similarly, any custom implementation of `CubicGenerator` or
`RationalGenerator` will need to be amended to include an `Error` type
and be made fallible itself.
Finally, the fields of `CubicCurve` and `RationalCurve` are now private,
so any direct constructions of these structs from segments will need to
be replaced with the new `CubicCurve::from_segments` and
`RationalCurve::from_segments` methods.
---
## Design
The main thing to justify here is the choice for the curve internals to
remain the same. After all, if they were able to cause crashes in the
first place, it's worth wondering why safeguards weren't put in place on
the types themselves to prevent that.
My view on this is that the problem was really that the internals of
these methods implicitly relied on the assumption that the value they
were operating on was *actually a curve*, when this wasn't actually
guaranteed. Now, it's possible to make a bunch of small changes inside
the curve struct methods to account for that, but I think that's worse
than just guaranteeing that the data is valid upstream — sampling is
about as hot a code path as we're going to get in this area, and hitting
an additional branch every time it happens just to check that the struct
contains valid data is probably a waste of resources.
Another way of phrasing this is that even if we're only interested in
solving the crashes, the curve's validity needs to be checked at some
point, and it's almost certainly better to do this once at the point of
construction than every time the curve is sampled.
In cases where the control data is supplied dynamically, users would
already have to deal with empty curve outputs basically not working.
Anecdotally, I ran into this while writing the `cubic_splines` example,
and I think the diff illustrates the improvement pretty nicely — the
code no longer has to anticipate whether the output will be good or not;
it just has to handle the `Result`.
The cost of all this, of course, is that we have to guarantee that the
new invariant is actually maintained whenever we extend the API.
However, for the most part, I don't expect users to want to do much
surgery on the internals of their curves anyway.
435 lines
14 KiB
Rust
435 lines
14 KiB
Rust
//! This example exhibits different available modes of constructing cubic Bezier curves.
|
|
|
|
use bevy::{
|
|
app::{App, Startup, Update},
|
|
color::*,
|
|
ecs::system::Commands,
|
|
gizmos::gizmos::Gizmos,
|
|
input::{mouse::MouseButtonInput, ButtonState},
|
|
math::{cubic_splines::*, vec2},
|
|
prelude::*,
|
|
};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.add_systems(Startup, setup)
|
|
.add_systems(
|
|
Update,
|
|
(
|
|
handle_keypress,
|
|
handle_mouse_move,
|
|
handle_mouse_press,
|
|
draw_edit_move,
|
|
update_curve,
|
|
update_spline_mode_text,
|
|
update_cycling_mode_text,
|
|
draw_curve,
|
|
draw_control_points,
|
|
)
|
|
.chain(),
|
|
)
|
|
.run();
|
|
}
|
|
|
|
fn setup(mut commands: Commands) {
|
|
// Initialize the modes with their defaults:
|
|
let spline_mode = SplineMode::default();
|
|
commands.insert_resource(spline_mode);
|
|
let cycling_mode = CyclingMode::default();
|
|
commands.insert_resource(cycling_mode);
|
|
|
|
// Starting data for [`ControlPoints`]:
|
|
let default_points = vec![
|
|
vec2(-500., -200.),
|
|
vec2(-250., 250.),
|
|
vec2(250., 250.),
|
|
vec2(500., -200.),
|
|
];
|
|
|
|
let default_tangents = vec![
|
|
vec2(0., 200.),
|
|
vec2(200., 0.),
|
|
vec2(0., -200.),
|
|
vec2(-200., 0.),
|
|
];
|
|
|
|
let default_control_data = ControlPoints {
|
|
points_and_tangents: default_points.into_iter().zip(default_tangents).collect(),
|
|
};
|
|
|
|
let curve = form_curve(&default_control_data, spline_mode, cycling_mode);
|
|
commands.insert_resource(curve);
|
|
commands.insert_resource(default_control_data);
|
|
|
|
// Mouse tracking information:
|
|
commands.insert_resource(MousePosition::default());
|
|
commands.insert_resource(MouseEditMove::default());
|
|
|
|
commands.spawn(Camera2dBundle::default());
|
|
|
|
// The instructions and modes are rendered on the left-hand side in a column.
|
|
let instructions_text = "Click and drag to add control points and their tangents\n\
|
|
R: Remove the last control point\n\
|
|
S: Cycle the spline construction being used\n\
|
|
C: Toggle cyclic curve construction";
|
|
let spline_mode_text = format!("Spline: {}", spline_mode);
|
|
let cycling_mode_text = format!("{}", cycling_mode);
|
|
let style = TextStyle::default();
|
|
|
|
commands
|
|
.spawn(NodeBundle {
|
|
style: Style {
|
|
position_type: PositionType::Absolute,
|
|
top: Val::Px(12.0),
|
|
left: Val::Px(12.0),
|
|
flex_direction: FlexDirection::Column,
|
|
row_gap: Val::Px(20.0),
|
|
..default()
|
|
},
|
|
..default()
|
|
})
|
|
.with_children(|parent| {
|
|
parent.spawn(TextBundle::from_section(instructions_text, style.clone()));
|
|
parent.spawn((
|
|
SplineModeText,
|
|
TextBundle::from_section(spline_mode_text, style.clone()),
|
|
));
|
|
parent.spawn((
|
|
CyclingModeText,
|
|
TextBundle::from_section(cycling_mode_text, style.clone()),
|
|
));
|
|
});
|
|
}
|
|
|
|
// -----------------------------------
|
|
// Curve-related Resources and Systems
|
|
// -----------------------------------
|
|
|
|
/// The current spline mode, which determines the spline method used in conjunction with the
|
|
/// control points.
|
|
#[derive(Clone, Copy, Resource, Default)]
|
|
enum SplineMode {
|
|
#[default]
|
|
Hermite,
|
|
Cardinal,
|
|
B,
|
|
}
|
|
|
|
impl std::fmt::Display for SplineMode {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
match self {
|
|
SplineMode::Hermite => f.write_str("Hermite"),
|
|
SplineMode::Cardinal => f.write_str("Cardinal"),
|
|
SplineMode::B => f.write_str("B"),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// The current cycling mode, which determines whether the control points should be interpolated
|
|
/// cylically (to make a loop).
|
|
#[derive(Clone, Copy, Resource, Default)]
|
|
enum CyclingMode {
|
|
#[default]
|
|
NotCyclic,
|
|
Cyclic,
|
|
}
|
|
|
|
impl std::fmt::Display for CyclingMode {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
match self {
|
|
CyclingMode::NotCyclic => f.write_str("Not Cyclic"),
|
|
CyclingMode::Cyclic => f.write_str("Cyclic"),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// The curve presently being displayed. This is optional because there may not be enough control
|
|
/// points to actually generate a curve.
|
|
#[derive(Clone, Default, Resource)]
|
|
struct Curve(Option<CubicCurve<Vec2>>);
|
|
|
|
/// The control points used to generate a curve. The tangent components are only used in the case of
|
|
/// Hermite interpolation.
|
|
#[derive(Clone, Resource)]
|
|
struct ControlPoints {
|
|
points_and_tangents: Vec<(Vec2, Vec2)>,
|
|
}
|
|
|
|
/// This system is responsible for updating the [`Curve`] when the [control points] or active modes
|
|
/// change.
|
|
///
|
|
/// [control points]: ControlPoints
|
|
fn update_curve(
|
|
control_points: Res<ControlPoints>,
|
|
spline_mode: Res<SplineMode>,
|
|
cycling_mode: Res<CyclingMode>,
|
|
mut curve: ResMut<Curve>,
|
|
) {
|
|
if !control_points.is_changed() && !spline_mode.is_changed() && !cycling_mode.is_changed() {
|
|
return;
|
|
}
|
|
|
|
*curve = form_curve(&control_points, *spline_mode, *cycling_mode);
|
|
}
|
|
|
|
/// This system uses gizmos to draw the current [`Curve`] by breaking it up into a large number
|
|
/// of line segments.
|
|
fn draw_curve(curve: Res<Curve>, mut gizmos: Gizmos) {
|
|
let Some(ref curve) = curve.0 else {
|
|
return;
|
|
};
|
|
// Scale resolution with curve length so it doesn't degrade as the length increases.
|
|
let resolution = 100 * curve.segments().len();
|
|
gizmos.linestrip(
|
|
curve.iter_positions(resolution).map(|pt| pt.extend(0.0)),
|
|
Color::srgb(1.0, 1.0, 1.0),
|
|
);
|
|
}
|
|
|
|
/// This system uses gizmos to draw the current [control points] as circles, displaying their
|
|
/// tangent vectors as arrows in the case of a Hermite spline.
|
|
///
|
|
/// [control points]: ControlPoints
|
|
fn draw_control_points(
|
|
control_points: Res<ControlPoints>,
|
|
spline_mode: Res<SplineMode>,
|
|
mut gizmos: Gizmos,
|
|
) {
|
|
for &(point, tangent) in &control_points.points_and_tangents {
|
|
gizmos.circle_2d(point, 10.0, Color::srgb(0.0, 1.0, 0.0));
|
|
|
|
if matches!(*spline_mode, SplineMode::Hermite) {
|
|
gizmos.arrow_2d(point, point + tangent, Color::srgb(1.0, 0.0, 0.0));
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Helper function for generating a [`Curve`] from [control points] and selected modes.
|
|
///
|
|
/// [control points]: ControlPoints
|
|
fn form_curve(
|
|
control_points: &ControlPoints,
|
|
spline_mode: SplineMode,
|
|
cycling_mode: CyclingMode,
|
|
) -> Curve {
|
|
let (points, tangents): (Vec<_>, Vec<_>) =
|
|
control_points.points_and_tangents.iter().copied().unzip();
|
|
|
|
match spline_mode {
|
|
SplineMode::Hermite => {
|
|
let spline = CubicHermite::new(points, tangents);
|
|
Curve(match cycling_mode {
|
|
CyclingMode::NotCyclic => spline.to_curve().ok(),
|
|
CyclingMode::Cyclic => spline.to_curve_cyclic().ok(),
|
|
})
|
|
}
|
|
SplineMode::Cardinal => {
|
|
let spline = CubicCardinalSpline::new_catmull_rom(points);
|
|
Curve(match cycling_mode {
|
|
CyclingMode::NotCyclic => spline.to_curve().ok(),
|
|
CyclingMode::Cyclic => spline.to_curve_cyclic().ok(),
|
|
})
|
|
}
|
|
SplineMode::B => {
|
|
let spline = CubicBSpline::new(points);
|
|
Curve(match cycling_mode {
|
|
CyclingMode::NotCyclic => spline.to_curve().ok(),
|
|
CyclingMode::Cyclic => spline.to_curve_cyclic().ok(),
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
// --------------------
|
|
// Text-related Components and Systems
|
|
// --------------------
|
|
|
|
/// Marker component for the text node that displays the current [`SplineMode`].
|
|
#[derive(Component)]
|
|
struct SplineModeText;
|
|
|
|
/// Marker component for the text node that displays the current [`CyclingMode`].
|
|
#[derive(Component)]
|
|
struct CyclingModeText;
|
|
|
|
fn update_spline_mode_text(
|
|
spline_mode: Res<SplineMode>,
|
|
mut spline_mode_text: Query<&mut Text, With<SplineModeText>>,
|
|
) {
|
|
if !spline_mode.is_changed() {
|
|
return;
|
|
}
|
|
|
|
let new_text = format!("Spline: {}", *spline_mode);
|
|
|
|
for mut spline_mode_text in spline_mode_text.iter_mut() {
|
|
if let Some(section) = spline_mode_text.sections.first_mut() {
|
|
section.value.clone_from(&new_text);
|
|
}
|
|
}
|
|
}
|
|
|
|
fn update_cycling_mode_text(
|
|
cycling_mode: Res<CyclingMode>,
|
|
mut cycling_mode_text: Query<&mut Text, With<CyclingModeText>>,
|
|
) {
|
|
if !cycling_mode.is_changed() {
|
|
return;
|
|
}
|
|
|
|
let new_text = format!("{}", *cycling_mode);
|
|
|
|
for mut cycling_mode_text in cycling_mode_text.iter_mut() {
|
|
if let Some(section) = cycling_mode_text.sections.first_mut() {
|
|
section.value.clone_from(&new_text);
|
|
}
|
|
}
|
|
}
|
|
|
|
// -----------------------------------
|
|
// Input-related Resources and Systems
|
|
// -----------------------------------
|
|
|
|
/// A small state machine which tracks a click-and-drag motion used to create new control points.
|
|
/// When the user is not doing a click-and-drag motion, the `start` field is `None`. When the user
|
|
/// presses the left mouse button, the location of that press is temporarily stored in the field.
|
|
#[derive(Clone, Default, Resource)]
|
|
struct MouseEditMove {
|
|
start: Option<Vec2>,
|
|
}
|
|
|
|
/// The current mouse position, if known.
|
|
#[derive(Clone, Default, Resource)]
|
|
struct MousePosition(Option<Vec2>);
|
|
|
|
/// Update the current cursor position and track it in the [`MousePosition`] resource.
|
|
fn handle_mouse_move(
|
|
mut cursor_events: EventReader<CursorMoved>,
|
|
mut mouse_position: ResMut<MousePosition>,
|
|
) {
|
|
if let Some(cursor_event) = cursor_events.read().last() {
|
|
mouse_position.0 = Some(cursor_event.position);
|
|
}
|
|
}
|
|
|
|
/// This system handles updating the [`MouseEditMove`] resource, orchestrating the logical part
|
|
/// of the click-and-drag motion which actually creates new control points.
|
|
fn handle_mouse_press(
|
|
mut button_events: EventReader<MouseButtonInput>,
|
|
mouse_position: Res<MousePosition>,
|
|
mut edit_move: ResMut<MouseEditMove>,
|
|
mut control_points: ResMut<ControlPoints>,
|
|
camera: Query<(&Camera, &GlobalTransform)>,
|
|
) {
|
|
let Some(mouse_pos) = mouse_position.0 else {
|
|
return;
|
|
};
|
|
|
|
// Handle click and drag behavior
|
|
for button_event in button_events.read() {
|
|
if button_event.button != MouseButton::Left {
|
|
continue;
|
|
}
|
|
|
|
match button_event.state {
|
|
ButtonState::Pressed => {
|
|
if edit_move.start.is_some() {
|
|
// If the edit move already has a start, press event should do nothing.
|
|
continue;
|
|
}
|
|
// This press represents the start of the edit move.
|
|
edit_move.start = Some(mouse_pos);
|
|
}
|
|
|
|
ButtonState::Released => {
|
|
// Release is only meaningful if we started an edit move.
|
|
let Some(start) = edit_move.start else {
|
|
continue;
|
|
};
|
|
|
|
let Ok((camera, camera_transform)) = camera.get_single() else {
|
|
continue;
|
|
};
|
|
|
|
// Convert the starting point and end point (current mouse pos) into world coords:
|
|
let Some(point) = camera.viewport_to_world_2d(camera_transform, start) else {
|
|
continue;
|
|
};
|
|
let Some(end_point) = camera.viewport_to_world_2d(camera_transform, mouse_pos)
|
|
else {
|
|
continue;
|
|
};
|
|
let tangent = end_point - point;
|
|
|
|
// The start of the click-and-drag motion represents the point to add,
|
|
// while the difference with the current position represents the tangent.
|
|
control_points.points_and_tangents.push((point, tangent));
|
|
|
|
// Reset the edit move since we've consumed it.
|
|
edit_move.start = None;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// This system handles drawing the "preview" control point based on the state of [`MouseEditMove`].
|
|
fn draw_edit_move(
|
|
edit_move: Res<MouseEditMove>,
|
|
mouse_position: Res<MousePosition>,
|
|
mut gizmos: Gizmos,
|
|
camera: Query<(&Camera, &GlobalTransform)>,
|
|
) {
|
|
let Some(start) = edit_move.start else {
|
|
return;
|
|
};
|
|
let Some(mouse_pos) = mouse_position.0 else {
|
|
return;
|
|
};
|
|
let Ok((camera, camera_transform)) = camera.get_single() else {
|
|
return;
|
|
};
|
|
|
|
// Resources store data in viewport coordinates, so we need to convert to world coordinates
|
|
// to display them:
|
|
let Some(start) = camera.viewport_to_world_2d(camera_transform, start) else {
|
|
return;
|
|
};
|
|
let Some(end) = camera.viewport_to_world_2d(camera_transform, mouse_pos) else {
|
|
return;
|
|
};
|
|
|
|
gizmos.circle_2d(start, 10.0, Color::srgb(0.0, 1.0, 0.7));
|
|
gizmos.circle_2d(start, 7.0, Color::srgb(0.0, 1.0, 0.7));
|
|
gizmos.arrow_2d(start, end, Color::srgb(1.0, 0.0, 0.7));
|
|
}
|
|
|
|
/// This system handles all keyboard commands.
|
|
fn handle_keypress(
|
|
keyboard: Res<ButtonInput<KeyCode>>,
|
|
mut spline_mode: ResMut<SplineMode>,
|
|
mut cycling_mode: ResMut<CyclingMode>,
|
|
mut control_points: ResMut<ControlPoints>,
|
|
) {
|
|
// S => change spline mode
|
|
if keyboard.just_pressed(KeyCode::KeyS) {
|
|
*spline_mode = match *spline_mode {
|
|
SplineMode::Hermite => SplineMode::Cardinal,
|
|
SplineMode::Cardinal => SplineMode::B,
|
|
SplineMode::B => SplineMode::Hermite,
|
|
}
|
|
}
|
|
|
|
// C => change cycling mode
|
|
if keyboard.just_pressed(KeyCode::KeyC) {
|
|
*cycling_mode = match *cycling_mode {
|
|
CyclingMode::NotCyclic => CyclingMode::Cyclic,
|
|
CyclingMode::Cyclic => CyclingMode::NotCyclic,
|
|
}
|
|
}
|
|
|
|
// R => remove last control point
|
|
if keyboard.just_pressed(KeyCode::KeyR) {
|
|
control_points.points_and_tangents.pop();
|
|
}
|
|
}
|