Update and fix implementors for the new API.
This commit is contained in:
Dimitri Sabadie
101
src/cgmath.rs
101
src/cgmath.rs
@ -1,92 +1,15 @@
|
||||
use cgmath::{
|
||||
BaseFloat, BaseNum, InnerSpace, Quaternion, Vector1, Vector2, Vector3, Vector4, VectorSpace,
|
||||
};
|
||||
use crate::impl_Interpolate;
|
||||
|
||||
use crate::interpolate::{
|
||||
cubic_bezier_def, cubic_hermite_def, quadratic_bezier_def, Additive, Interpolate, Linear, One,
|
||||
};
|
||||
use cgmath::{Quaternion, Vector1, Vector2, Vector3, Vector4};
|
||||
|
||||
macro_rules! impl_interpolate_vec {
|
||||
($($t:tt)*) => {
|
||||
impl<T> Linear<T> for $($t)*<T> where T: BaseNum {
|
||||
#[inline(always)]
|
||||
fn outer_mul(self, t: T) -> Self {
|
||||
self * t
|
||||
}
|
||||
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, Quaternion<f32>, std::f32::consts::PI);
|
||||
|
||||
#[inline(always)]
|
||||
fn outer_div(self, t: T) -> Self {
|
||||
self / t
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> Interpolate<T> for $($t)*<T>
|
||||
where Self: InnerSpace<Scalar = T>, T: Additive + BaseFloat + One {
|
||||
#[inline(always)]
|
||||
fn lerp(a: Self, b: Self, t: T) -> Self {
|
||||
a.lerp(b, t)
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn cubic_hermite(x: (Self, T), a: (Self, T), b: (Self, T), y: (Self, T), t: T) -> Self {
|
||||
cubic_hermite_def(x, a, b, y, t)
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn quadratic_bezier(a: Self, u: Self, b: Self, t: T) -> Self {
|
||||
quadratic_bezier_def(a, u, b, t)
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn cubic_bezier(a: Self, u: Self, v: Self, b: Self, t: T) -> Self {
|
||||
cubic_bezier_def(a, u, v, b, t)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl_interpolate_vec!(Vector1);
|
||||
impl_interpolate_vec!(Vector2);
|
||||
impl_interpolate_vec!(Vector3);
|
||||
impl_interpolate_vec!(Vector4);
|
||||
|
||||
impl<T> Linear<T> for Quaternion<T>
|
||||
where
|
||||
T: BaseFloat,
|
||||
{
|
||||
#[inline(always)]
|
||||
fn outer_mul(self, t: T) -> Self {
|
||||
self * t
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn outer_div(self, t: T) -> Self {
|
||||
self / t
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> Interpolate<T> for Quaternion<T>
|
||||
where
|
||||
Self: InnerSpace<Scalar = T>,
|
||||
T: Additive + BaseFloat + One,
|
||||
{
|
||||
#[inline(always)]
|
||||
fn lerp(a: Self, b: Self, t: T) -> Self {
|
||||
a.nlerp(b, t)
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn cubic_hermite(x: (Self, T), a: (Self, T), b: (Self, T), y: (Self, T), t: T) -> Self {
|
||||
cubic_hermite_def(x, a, b, y, t)
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn quadratic_bezier(a: Self, u: Self, b: Self, t: T) -> Self {
|
||||
quadratic_bezier_def(a, u, b, t)
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn cubic_bezier(a: Self, u: Self, v: Self, b: Self, t: T) -> Self {
|
||||
cubic_bezier_def(a, u, v, b, t)
|
||||
}
|
||||
}
|
||||
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, Quaternion<f64>, std::f64::consts::PI);
|
||||
|
||||
92
src/glam.rs
92
src/glam.rs
@ -1,88 +1,8 @@
|
||||
use crate::impl_Interpolate;
|
||||
use glam::{Quat, Vec2, Vec3, Vec3A, Vec4};
|
||||
|
||||
use crate::interpolate::{
|
||||
cubic_bezier_def, cubic_hermite_def, quadratic_bezier_def, Interpolate, Linear,
|
||||
};
|
||||
|
||||
macro_rules! impl_interpolate_vec {
|
||||
($($t:tt)*) => {
|
||||
impl Linear<f32> for $($t)* {
|
||||
#[inline(always)]
|
||||
fn outer_mul(self, t: f32) -> Self {
|
||||
self * t
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn outer_div(self, t: f32) -> Self {
|
||||
self / t
|
||||
}
|
||||
}
|
||||
|
||||
impl Interpolate<f32> for $($t)* {
|
||||
#[inline(always)]
|
||||
fn lerp(a: Self, b: Self, t: f32) -> Self {
|
||||
a.lerp(b, t)
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn cubic_hermite(
|
||||
x: (Self, f32),
|
||||
a: (Self, f32),
|
||||
b: (Self, f32),
|
||||
y: (Self, f32),
|
||||
t: f32,
|
||||
) -> Self {
|
||||
cubic_hermite_def(x, a, b, y, t)
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn quadratic_bezier(a: Self, u: Self, b: Self, t: f32) -> Self {
|
||||
quadratic_bezier_def(a, u, b, t)
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn cubic_bezier(a: Self, u: Self, v: Self, b: Self, t: f32) -> Self {
|
||||
cubic_bezier_def(a, u, v, b, t)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl_interpolate_vec!(Vec2);
|
||||
impl_interpolate_vec!(Vec3);
|
||||
impl_interpolate_vec!(Vec3A);
|
||||
impl_interpolate_vec!(Vec4);
|
||||
|
||||
impl Linear<f32> for Quat {
|
||||
#[inline(always)]
|
||||
fn outer_mul(self, t: f32) -> Self {
|
||||
self * t
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn outer_div(self, t: f32) -> Self {
|
||||
self / t
|
||||
}
|
||||
}
|
||||
|
||||
impl Interpolate<f32> for Quat {
|
||||
#[inline(always)]
|
||||
fn lerp(a: Self, b: Self, t: f32) -> Self {
|
||||
a.lerp(b, t)
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn cubic_hermite(x: (Self, f32), a: (Self, f32), b: (Self, f32), y: (Self, f32), t: f32) -> Self {
|
||||
cubic_hermite_def(x, a, b, y, t)
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn quadratic_bezier(a: Self, u: Self, b: Self, t: f32) -> Self {
|
||||
quadratic_bezier_def(a, u, b, t)
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn cubic_bezier(a: Self, u: Self, v: Self, b: Self, t: f32) -> Self {
|
||||
cubic_bezier_def(a, u, v, b, t)
|
||||
}
|
||||
}
|
||||
impl_Interpolate!(f32, Vec2, std::f32::consts::PI);
|
||||
impl_Interpolate!(f32, Vec3, std::f32::consts::PI);
|
||||
impl_Interpolate!(f32, Vec3A, std::f32::consts::PI);
|
||||
impl_Interpolate!(f32, Vec4, std::f32::consts::PI);
|
||||
impl_Interpolate!(f32, Quat, std::f32::consts::PI);
|
||||
|
||||
@ -1,70 +1,18 @@
|
||||
use nalgebra::{Scalar, Vector, Vector1, Vector2, Vector3, Vector4, Vector5, Vector6};
|
||||
use num_traits as nt;
|
||||
use simba::scalar::{ClosedAdd, ClosedDiv, ClosedMul, ClosedSub};
|
||||
use std::ops::Mul;
|
||||
use crate::impl_Interpolate;
|
||||
use nalgebra::{Quaternion, Vector1, Vector2, Vector3, Vector4, Vector5, Vector6};
|
||||
|
||||
use crate::interpolate::{
|
||||
cubic_bezier_def, cubic_hermite_def, quadratic_bezier_def, Additive, Interpolate, Linear, One,
|
||||
};
|
||||
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);
|
||||
|
||||
macro_rules! impl_interpolate_vector {
|
||||
($($t:tt)*) => {
|
||||
// implement Linear
|
||||
impl<T> Linear<T> for $($t)*<T>
|
||||
where T: Scalar +
|
||||
Copy +
|
||||
ClosedAdd +
|
||||
ClosedSub +
|
||||
ClosedMul +
|
||||
ClosedDiv {
|
||||
#[inline(always)]
|
||||
fn outer_mul(self, t: T) -> Self {
|
||||
self * t
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn outer_div(self, t: T) -> Self {
|
||||
self / t
|
||||
}
|
||||
}
|
||||
|
||||
impl<T, V> Interpolate<T> for $($t)*<V>
|
||||
where Self: Linear<T>,
|
||||
T: Additive + One + Mul<T, Output = T>,
|
||||
V: nt::One +
|
||||
nt::Zero +
|
||||
Additive +
|
||||
Scalar +
|
||||
ClosedAdd +
|
||||
ClosedMul +
|
||||
ClosedSub +
|
||||
Interpolate<T> {
|
||||
#[inline(always)]
|
||||
fn lerp(a: Self, b: Self, t: T) -> Self {
|
||||
Vector::zip_map(&a, &b, |c1, c2| Interpolate::lerp(c1, c2, t))
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn cubic_hermite(x: (Self, T), a: (Self, T), b: (Self, T), y: (Self, T), t: T) -> Self {
|
||||
cubic_hermite_def(x, a, b, y, t)
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn quadratic_bezier(a: Self, u: Self, b: Self, t: T) -> Self {
|
||||
quadratic_bezier_def(a, u, b, t)
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn cubic_bezier(a: Self, u: Self, v: Self, b: Self, t: T) -> Self {
|
||||
cubic_bezier_def(a, u, v, b, t)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl_interpolate_vector!(Vector1);
|
||||
impl_interpolate_vector!(Vector2);
|
||||
impl_interpolate_vector!(Vector3);
|
||||
impl_interpolate_vector!(Vector4);
|
||||
impl_interpolate_vector!(Vector5);
|
||||
impl_interpolate_vector!(Vector6);
|
||||
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);
|
||||
|
||||
Reference in New Issue
Block a user