Skip to content

Commit

Permalink
Merge branch 'main' into extract-text-section
Browse files Browse the repository at this point in the history
  • Loading branch information
ickshonpe committed Oct 8, 2024
2 parents 6fef1e9 + 2f63ebc commit cb5051a
Show file tree
Hide file tree
Showing 9 changed files with 410 additions and 539 deletions.
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1300,13 +1300,13 @@ category = "Animation"
wasm = true

[[example]]
name = "cubic_curve"
path = "examples/animation/cubic_curve.rs"
name = "eased_motion"
path = "examples/animation/eased_motion.rs"
doc-scrape-examples = true

[package.metadata.example.cubic_curve]
name = "Cubic Curve"
description = "Bezier curve example showing a cube following a cubic curve"
[package.metadata.example.eased_motion]
name = "Eased Motion"
description = "Demonstrates the application of easing curves to animate an object"
category = "Animation"
wasm = true

Expand Down
6 changes: 3 additions & 3 deletions crates/bevy_math/src/common_traits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ pub trait VectorSpace:
/// on the parameter `t`. When `t` is `0`, `self` is recovered. When `t` is `1`, `rhs`
/// is recovered.
///
/// Note that the value of `t` is not clamped by this function, so interpolating outside
/// Note that the value of `t` is not clamped by this function, so extrapolating outside
/// of the interval `[0,1]` is allowed.
#[inline]
fn lerp(&self, rhs: Self, t: f32) -> Self {
*self * (1. - t) + rhs * t
fn lerp(self, rhs: Self, t: f32) -> Self {
self * (1. - t) + rhs * t
}
}

Expand Down
Loading

0 comments on commit cb5051a

Please sign in to comment.