Skip to content

Commit

Permalink
Merge branch 'main' into 16230-move-ui-example-to-testbed
Browse files Browse the repository at this point in the history
  • Loading branch information
richchurcher committed Nov 5, 2024
2 parents 5310bf5 + a44b668 commit 04fa867
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Check for typos
uses: crate-ci/typos@v1.26.8
uses: crate-ci/typos@v1.27.0
- name: Typos info
if: failure()
run: |
Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_math/src/common_traits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ impl NormedVectorSpace for f32 {
///
/// 3. Importantly, the interpolation must be *subdivision-stable*: for any interpolation curve
/// between two (unnamed) values and any parameter-value pairs `(t0, p)` and `(t1, q)`, the
/// interpolation curve between `p` and `q` must be the *linear* reparametrization of the original
/// interpolation curve between `p` and `q` must be the *linear* reparameterization of the original
/// interpolation curve restricted to the interval `[t0, t1]`.
///
/// The last of these conditions is very strong and indicates something like constant speed. It
Expand All @@ -197,7 +197,7 @@ impl NormedVectorSpace for f32 {
/// / \
/// / \
/// / linear \
/// / reparametrization \
/// / reparameterization \
/// / t = t0 * (1 - s) + t1 * s \
/// / \
/// |-------------------------------------|
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_math/src/curve/adaptors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ where
}
}

/// A curve that has had its domain changed by a linear reparametrization (stretching and scaling).
/// A curve that has had its domain changed by a linear reparameterization (stretching and scaling).
/// Curves of this type are produced by [`Curve::reparametrize_linear`].
#[derive(Clone, Debug)]
#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
Expand Down
8 changes: 4 additions & 4 deletions crates/bevy_math/src/curve/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@ where
}
}

/// An error indicating that a linear reparametrization couldn't be performed because of
/// An error indicating that a linear reparameterization couldn't be performed because of
/// malformed inputs.
#[derive(Debug, Error, Display)]
#[display("Could not build a linear function to reparametrize this curve")]
Expand All @@ -912,8 +912,8 @@ pub enum LinearReparamError {
#[display("This curve has unbounded domain")]
SourceCurveUnbounded,

/// The target interval for reparametrization was unbounded.
#[display("The target interval for reparametrization is unbounded")]
/// The target interval for reparameterization was unbounded.
#[display("The target interval for reparameterization is unbounded")]
TargetIntervalUnbounded,
}

Expand Down Expand Up @@ -1195,7 +1195,7 @@ mod tests {
}

#[test]
fn reparametrization() {
fn reparameterization() {
let curve = function_curve(interval(1.0, f32::INFINITY).unwrap(), ops::log2);
let reparametrized_curve = curve
.by_ref()
Expand Down

0 comments on commit 04fa867

Please sign in to comment.