max/splines
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86 from hokwangchoi/master

Browse Source 
Fix cubic_hermite interpolation
This commit is contained in:
Dimitri Sabadie 2022-07-27 00:42:23 +02:00 committed by GitHub
commit 8c952ae242
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/interpolate.rs
View File

@ -127,15 +127,16 @@ macro_rules! impl_Interpolate {
let three_t = t * 3.; let three_t = t * 3.;
let t2 = t * t; let t2 = t * t;
let t3 = t2 * t; let t3 = t2 * t;
let two_t3 = t3 * two_t; let two_t3 = t2 * two_t;
let three_t2 = t2 * three_t; let two_t2 = t * two_t;
let three_t2 = t * three_t;
// tangents // tangents
let m0 = (b.1 - x.1) / (b.0 - x.0); let m0 = (b.1 - x.1) / (b.0 - x.0) * (b.0 - a.0);
let m1 = (y.1 - a.1) / (y.0 - a.0); let m1 = (y.1 - a.1) / (y.0 - a.0) * (b.0 - a.0);
a.1 * (two_t3 - three_t2 + 1.) a.1 * (two_t3 - three_t2 + 1.)
+ m0 * (t3 - t2 * two_t + t) + m0 * (t3 - two_t2 + t)
+ b.1 * (three_t2 - two_t3) + b.1 * (three_t2 - two_t3)
+ m1 * (t3 - t2) + m1 * (t3 - t2)
} }
@ -192,15 +193,16 @@ macro_rules! impl_InterpolateT {
let three_t = t * 3.; let three_t = t * 3.;
let t2 = t * t; let t2 = t * t;
let t3 = t2 * t; let t3 = t2 * t;
let two_t3 = t3 * two_t; let two_t3 = t2 * two_t;
let three_t2 = t2 * three_t; let two_t2 = t * two_t;
let three_t2 = t * three_t;
// tangents // tangents
let m0 = (b.1 - x.1) / (Self::from(b.0 - x.0)); let m0 = (b.1 - x.1) / (Self::from(b.0 - x.0)) * (Self::from(b.0 - a.0));
let m1 = (y.1 - a.1) / (Self::from(y.0 - a.0)); let m1 = (y.1 - a.1) / (Self::from(y.0 - a.0)) * (Self::from(b.0 - a.0));
a.1 * (two_t3 - three_t2 + 1.) a.1 * (two_t3 - three_t2 + 1.)
+ m0 * (t3 - t2 * two_t + t) + m0 * (t3 - two_t2 + t)
+ b.1 * (three_t2 - two_t3) + b.1 * (three_t2 - two_t3)
+ m1 * (t3 - t2) + m1 * (t3 - t2)
} }