Compare commits

...

12 Commits

Author SHA1 Message Date
35881a8122 fix no_std 2024-01-05 15:50:26 +01:00
Dimitri Sabadie
f6fa4ecbce
Merge pull request #102 from phaazon/release/4.3.1
Prepare v4.3.1.
2023-11-22 19:13:05 +01:00
Dimitri Sabadie
e2f220ec15
Prepare v4.3.1. 2023-11-22 19:10:19 +01:00
Dimitri Sabadie
c3670d6b0a
Merge pull request #100 from perlindgren/master
Default for Spline
2023-11-22 00:09:57 +01:00
Per Lindgren
c6ba8476f2 Default for Spline 2023-10-27 21:20:24 +02:00
Dimitri Sabadie
389f4d182d
Update changelog (links). 2023-09-23 16:25:54 +02:00
Dimitri Sabadie
8af9151dac
Changelog fix. 2023-09-23 16:10:14 +02:00
Dimitri Sabadie
a82cf85619
Merge pull request #99 from phaazon/release/v4.3.0
Prepare v4.3.0.
2023-09-23 15:57:48 +02:00
Dimitri Sabadie
37d3cc5f29
Prepare v4.3.0. 2023-09-23 15:54:10 +02:00
Dimitri Sabadie
1e70ab882c
Rustfmt. 2023-09-23 15:40:58 +02:00
Dimitri Sabadie
2179c8300f
Merge pull request #98 from EmbarkStudios/master
Add `clear` method to `Spline`
2023-09-23 15:40:26 +02:00
Dimitri Sabadie
e7a9723ae0
Fix rustfmt. 2023-09-23 13:01:18 +02:00
6 changed files with 61 additions and 27 deletions

View File

@ -1,6 +1,8 @@
# Changelog
* [4.1.2](#412)
* [4.3.1](#431)
* [4.3](#43)
* [4.2](#42)
* [4.1.1](#411)
* [4.1](#41)
* [4.0.3](#403)
@ -41,7 +43,20 @@
* [0.1.1](#011)
* [0.1](#01)
# 4.2.0
# 4.3.1
> Nov 22, 2023
- Add `Default` implementation for `Spline`. [c6ba847](https://github.com/phaazon/splines/commit/c6ba847)
# 4.3
> Sep 23, 2023
- Add support for `glam-0.23` and `glam-0.24`. [cdc48a4](https://github.com/phaazon/splines/commit/cdc48a4)
- Add `Spline::clear` to clear a spline keys without deallocating its internal storage. [eca09f1](https://github.com/phaazon/splines/commit/eca09f1)
# 4.2
> Feb 1, 2023

View File

@ -1,6 +1,6 @@
[package]
name = "splines"
version = "4.2.0"
version = "4.3.1"
license = "BSD-3-Clause"
authors = ["Dimitri Sabadie <dimitri.sabadie@gmail.com>"]
description = "Spline interpolation made easy"
@ -19,13 +19,13 @@ impl-cgmath = ["cgmath"]
impl-glam = ["glam"]
impl-nalgebra = ["nalgebra"]
serialization = ["serde"]
std = []
std = ["nalgebra/std"]
[dependencies]
cgmath = { version = ">=0.17, <0.19", optional = true }
glam = { version = ">=0.10, <0.25", optional = true }
nalgebra = { version = ">=0.21, <0.33", optional = true }
serde = { version = "1", features = ["derive"], optional = true }
nalgebra = { version = ">=0.21, <0.33", default-features = false, optional = true }
serde = { version = "1", features = ["derive"], optional = true }
[dev-dependencies]
float-cmp = ">=0.6, < 0.10"

View File

@ -1,6 +1,6 @@
edition = "2018"
fn_args_layout = "Tall"
fn_params_layout = "Tall"
force_explicit_abi = true
hard_tabs = false
max_width = 100

View File

@ -112,10 +112,15 @@ macro_rules! impl_Interpolate {
}
}
#[cfg(feature = "std")]
fn cosine(t: $t, a: Self, b: Self) -> Self {
let cos_nt = (1. - (t * $pi).cos()) * 0.5;
<Self as $crate::interpolate::Interpolate<$t>>::lerp(cos_nt, a, b)
}
#[cfg(not(feature = "std"))]
fn cosine(t: $t, a: Self, b: Self) -> Self {
unimplemented!();
}
fn lerp(t: $t, a: Self, b: Self) -> Self {
a * (1. - t) + b * t
@ -176,10 +181,15 @@ macro_rules! impl_InterpolateT {
}
}
#[cfg(feature = "std")]
fn cosine(t: $t, a: Self, b: Self) -> Self {
let cos_nt = (1. - (t * $pi).cos()) * 0.5;
<Self as $crate::interpolate::Interpolate<$t>>::lerp(cos_nt, a, b)
}
#[cfg(not(feature = "std"))]
fn cosine(t: $t, a: Self, b: Self) -> Self {
unimplemented!()
}
fn lerp(t: $t, a: Self, b: Self) -> Self {
let t = Self::from(t);
@ -232,6 +242,6 @@ macro_rules! impl_InterpolateT {
};
}
impl_Interpolate!(f32, f32, std::f32::consts::PI);
impl_Interpolate!(f64, f64, std::f64::consts::PI);
impl_InterpolateT!(f32, f64, std::f32::consts::PI);
impl_Interpolate!(f32, f32, f32::consts::PI);
impl_Interpolate!(f64, f64, f64::consts::PI);
impl_InterpolateT!(f32, f64, f32::consts::PI);

View File

@ -1,18 +1,27 @@
#[cfg(not(feature = "std"))]
use core::f32;
#[cfg(not(feature = "std"))]
use core::f64;
#[cfg(feature = "std")]
use std::f32;
#[cfg(feature = "std")]
use std::f64;
use crate::impl_Interpolate;
use nalgebra::{Quaternion, Vector1, Vector2, Vector3, Vector4, Vector5, Vector6};
impl_Interpolate!(f32, Vector1<f32>, std::f32::consts::PI);
impl_Interpolate!(f32, Vector2<f32>, std::f32::consts::PI);
impl_Interpolate!(f32, Vector3<f32>, std::f32::consts::PI);
impl_Interpolate!(f32, Vector4<f32>, std::f32::consts::PI);
impl_Interpolate!(f32, Vector5<f32>, std::f32::consts::PI);
impl_Interpolate!(f32, Vector6<f32>, std::f32::consts::PI);
impl_Interpolate!(f32, Quaternion<f32>, std::f32::consts::PI);
impl_Interpolate!(f32, Vector1<f32>, f32::consts::PI);
impl_Interpolate!(f32, Vector2<f32>, f32::consts::PI);
impl_Interpolate!(f32, Vector3<f32>, f32::consts::PI);
impl_Interpolate!(f32, Vector4<f32>, f32::consts::PI);
impl_Interpolate!(f32, Vector5<f32>, f32::consts::PI);
impl_Interpolate!(f32, Vector6<f32>, f32::consts::PI);
impl_Interpolate!(f32, Quaternion<f32>, f32::consts::PI);
impl_Interpolate!(f64, Vector1<f64>, std::f64::consts::PI);
impl_Interpolate!(f64, Vector2<f64>, std::f64::consts::PI);
impl_Interpolate!(f64, Vector3<f64>, std::f64::consts::PI);
impl_Interpolate!(f64, Vector4<f64>, std::f64::consts::PI);
impl_Interpolate!(f64, Vector5<f64>, std::f64::consts::PI);
impl_Interpolate!(f64, Vector6<f64>, std::f64::consts::PI);
impl_Interpolate!(f64, Quaternion<f64>, std::f64::consts::PI);
impl_Interpolate!(f64, Vector1<f64>, f64::consts::PI);
impl_Interpolate!(f64, Vector2<f64>, f64::consts::PI);
impl_Interpolate!(f64, Vector3<f64>, f64::consts::PI);
impl_Interpolate!(f64, Vector4<f64>, f64::consts::PI);
impl_Interpolate!(f64, Vector5<f64>, f64::consts::PI);
impl_Interpolate!(f64, Vector6<f64>, f64::consts::PI);
impl_Interpolate!(f64, Quaternion<f64>, f64::consts::PI);

View File

@ -1,6 +1,6 @@
//! Spline curves and operations.
#[cfg(feature = "std")]
// #[cfg(feature = "std")]
use crate::interpolate::{Interpolate, Interpolator};
use crate::interpolation::Interpolation;
use crate::key::Key;
@ -27,7 +27,7 @@ use std::cmp::Ordering;
/// for the required interpolation mode, you get `None`.
/// - [`Spline::clamped_sample`]: behaves like [`Spline::sample`] but will return either the first
/// or last key if out of bound; it will return `None` if not enough key.
#[derive(Debug, Clone)]
#[derive(Debug, Clone, Default)]
#[cfg_attr(
any(feature = "serialization", feature = "serde"),
derive(Deserialize, Serialize)
@ -55,7 +55,7 @@ impl<T, V> Spline<T, V> {
spline.internal_sort();
spline
}
/// Clear the spline by removing all keys. Keeps the underlying allocated storage, so adding
/// new keys should be faster than creating a new [`Spline`]
#[inline]