Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Merged by Bors] - Add generic cubic splines to bevy_math #7683

Closed
wants to merge 7 commits into from
Closed

[Merged by Bors] - Add generic cubic splines to bevy_math #7683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
520cd52
initial catmull-rom implementation
aevyrie Feb 15, 2023
18aa56f
general purpose cubic curves
aevyrie Feb 25, 2023
20d31ac
fix ci errors
aevyrie Feb 27, 2023
22a3303
Improve docs
aevyrie Feb 28, 2023
d8acb4d
Fix impl bugs
aevyrie Feb 28, 2023
44887ff
Add missing benchmark import
aevyrie Feb 28, 2023
f140a69
Fix doc typos
aevyrie Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 44 additions & 83 deletions benches/benches/bevy_math/bezier.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,128 +1,89 @@
use criterion::{black_box, criterion_group, criterion_main, Criterion};

use bevy_math::*;
use bevy_math::{prelude::*, *};

fn easing(c: &mut Criterion) {
let cubic_bezier = CubicBezierEasing::new(vec2(0.25, 0.1), vec2(0.25, 1.0));
let cubic_bezier = CubicSegment::new_bezier(vec2(0.25, 0.1), vec2(0.25, 1.0));
c.bench_function("easing_1000", |b| {
b.iter(|| {
(0..1000).map(|i| i as f32 / 1000.0).for_each(|t| {
cubic_bezier.ease(black_box(t));
black_box(cubic_bezier.ease(black_box(t)));
})
});
});
}

fn fifteen_degree(c: &mut Criterion) {
let bezier = Bezier::<Vec3A, 16>::new([
[0.0, 0.0, 0.0],
[0.0, 1.0, 0.0],
[1.0, 0.0, 0.0],
[1.0, 1.0, 1.0],
[0.0, 0.0, 0.0],
[0.0, 1.0, 0.0],
[1.0, 0.0, 0.0],
[1.0, 1.0, 1.0],
[0.0, 0.0, 0.0],
[0.0, 1.0, 0.0],
[1.0, 0.0, 0.0],
[1.0, 1.0, 1.0],
[0.0, 0.0, 0.0],
[0.0, 1.0, 0.0],
[1.0, 0.0, 0.0],
[1.0, 1.0, 1.0],
]);
c.bench_function("fifteen_degree_position", |b| {
b.iter(|| bezier.position(black_box(0.5)));
});
}

fn quadratic_2d(c: &mut Criterion) {
let bezier = QuadraticBezier2d::new([[0.0, 0.0], [0.0, 1.0], [1.0, 1.0]]);
c.bench_function("quadratic_position_Vec2", |b| {
b.iter(|| bezier.position(black_box(0.5)));
});
}

fn quadratic(c: &mut Criterion) {
let bezier = QuadraticBezier3d::new([[0.0, 0.0, 0.0], [0.0, 1.0, 0.0], [1.0, 1.0, 1.0]]);
c.bench_function("quadratic_position_Vec3A", |b| {
b.iter(|| bezier.position(black_box(0.5)));
});
}

fn quadratic_vec3(c: &mut Criterion) {
let bezier = Bezier::<Vec3, 3>::new([[0.0, 0.0, 0.0], [0.0, 1.0, 0.0], [1.0, 1.0, 1.0]]);
c.bench_function("quadratic_position_Vec3", |b| {
b.iter(|| bezier.position(black_box(0.5)));
});
}

fn cubic_2d(c: &mut Criterion) {
let bezier = CubicBezier2d::new([[0.0, 0.0], [0.0, 1.0], [1.0, 0.0], [1.0, 1.0]]);
let bezier = Bezier::new([[
vec2(0.0, 0.0),
vec2(0.0, 1.0),
vec2(1.0, 0.0),
vec2(1.0, 1.0),
]])
.to_curve();
c.bench_function("cubic_position_Vec2", |b| {
b.iter(|| bezier.position(black_box(0.5)));
b.iter(|| black_box(bezier.position(black_box(0.5))));
});
}

fn cubic(c: &mut Criterion) {
let bezier = CubicBezier3d::new([
[0.0, 0.0, 0.0],
[0.0, 1.0, 0.0],
[1.0, 0.0, 0.0],
[1.0, 1.0, 1.0],
]);
let bezier = Bezier::new([[
vec3a(0.0, 0.0, 0.0),
vec3a(0.0, 1.0, 0.0),
vec3a(1.0, 0.0, 0.0),
vec3a(1.0, 1.0, 1.0),
]])
.to_curve();
c.bench_function("cubic_position_Vec3A", |b| {
b.iter(|| bezier.position(black_box(0.5)));
b.iter(|| black_box(bezier.position(black_box(0.5))));
});
}

fn cubic_vec3(c: &mut Criterion) {
let bezier = Bezier::<Vec3, 4>::new([
[0.0, 0.0, 0.0],
[0.0, 1.0, 0.0],
[1.0, 0.0, 0.0],
[1.0, 1.0, 1.0],
]);
let bezier = Bezier::new([[
vec3(0.0, 0.0, 0.0),
vec3(0.0, 1.0, 0.0),
vec3(1.0, 0.0, 0.0),
vec3(1.0, 1.0, 1.0),
]])
.to_curve();
c.bench_function("cubic_position_Vec3", |b| {
b.iter(|| bezier.position(black_box(0.5)));
b.iter(|| black_box(bezier.position(black_box(0.5))));
});
}

fn build_pos_cubic(c: &mut Criterion) {
let bezier = CubicBezier3d::new([
[0.0, 0.0, 0.0],
[0.0, 1.0, 0.0],
[1.0, 0.0, 0.0],
[1.0, 1.0, 1.0],
]);
let bezier = Bezier::new([[
vec3a(0.0, 0.0, 0.0),
vec3a(0.0, 1.0, 0.0),
vec3a(1.0, 0.0, 0.0),
vec3a(1.0, 1.0, 1.0),
]])
.to_curve();
c.bench_function("build_pos_cubic_100_points", |b| {
b.iter(|| bezier.iter_positions(black_box(100)).collect::<Vec<_>>());
b.iter(|| black_box(bezier.iter_positions(black_box(100)).collect::<Vec<_>>()));
});
}

fn build_accel_cubic(c: &mut Criterion) {
let bezier = CubicBezier3d::new([
[0.0, 0.0, 0.0],
[0.0, 1.0, 0.0],
[1.0, 0.0, 0.0],
[1.0, 1.0, 1.0],
]);
let bezier = Bezier::new([[
vec3a(0.0, 0.0, 0.0),
vec3a(0.0, 1.0, 0.0),
vec3a(1.0, 0.0, 0.0),
vec3a(1.0, 1.0, 1.0),
]])
.to_curve();
c.bench_function("build_accel_cubic_100_points", |b| {
b.iter(|| bezier.iter_positions(black_box(100)).collect::<Vec<_>>());
b.iter(|| black_box(bezier.iter_positions(black_box(100)).collect::<Vec<_>>()));
});
}

criterion_group!(
benches,
easing,
fifteen_degree,
quadratic_2d,
quadratic,
quadratic_vec3,
cubic_2d,
cubic,
cubic_vec3,
cubic,
build_pos_cubic,
build_accel_cubic,
);
Expand Down
Loading