|
1 | 1 | //! Bézier curves and splines. |
| 2 | +
|
| 3 | +#![allow(clippy::just_underscores_and_digits)] |
| 4 | + |
2 | 5 | use alloc::vec::Vec; |
3 | 6 | use core::{array::from_fn, fmt::Debug, marker::PhantomData}; |
4 | 7 |
|
@@ -369,7 +372,7 @@ where |
369 | 372 | // = (1 - b2) * p0 + b2 * p1 |
370 | 373 | // = p0 + b2 * (p1 - p0) |
371 | 374 |
|
372 | | - p0.add(&p1.sub(&p0).mul(b2)) // Affine part |
| 375 | + p0.add(&p1.sub(p0).mul(b2)) // Affine part |
373 | 376 | .add(&d0.mul(b1).add(&d1.mul(b3))) // Linear part |
374 | 377 | } |
375 | 378 |
|
@@ -401,7 +404,7 @@ where |
401 | 404 |
|
402 | 405 | // Only vectors as expected: |
403 | 406 | // b2·(p1 - p0) + b1·d0 + b3·d1 |
404 | | - p1.sub(&p0) |
| 407 | + p1.sub(p0) |
405 | 408 | .mul(b2) |
406 | 409 | .add(&d0.mul(b1).add(&d1.mul(b3))) |
407 | 410 | } |
@@ -445,7 +448,7 @@ where |
445 | 448 | .into_iter() |
446 | 449 | .flat_map(|Ray(p, d)| [p.add(&d.neg()), p.clone(), p.add(&d)]) |
447 | 450 | .collect(); |
448 | | - Self::new(pts[1..pts.len() - 1].into_iter().cloned()) |
| 451 | + Self::new(pts[1..pts.len() - 1].iter().cloned()) |
449 | 452 | } |
450 | 453 |
|
451 | 454 | /// Returns the point of `self` at the given *t* value. |
@@ -607,9 +610,9 @@ where |
607 | 610 | // = P0 - b1·P0 - b2·P0 - b3·P0 + b1·P1 + b2·P2 + b3·P3 |
608 | 611 | // = P0 + b1·(P1 - P0) + b2·(P2 - P0) + b3·(P3 - P0) |
609 | 612 |
|
610 | | - let v01 = p1.sub(&p0).mul(b1); |
611 | | - let v02 = &p2.sub(&p0).mul(b2); |
612 | | - let v03 = p3.sub(&p0).mul(b3); |
| 613 | + let v01 = p1.sub(p0).mul(b1); |
| 614 | + let v02 = p2.sub(p0).mul(b2); |
| 615 | + let v03 = p3.sub(p0).mul(b3); |
613 | 616 | p0.add(&v01.add(&v02).add(&v03).mul(1.0 / 2.0)) |
614 | 617 | } |
615 | 618 |
|
@@ -637,9 +640,9 @@ where |
637 | 640 | // = b1·P1 + b2·P2 + b3·P3 - b1·P0 - b2·P0 - b3·P0 |
638 | 641 | // = b1·(P1 - P0) + b2·(P2 - P0) + b3·(P3 - P0) |
639 | 642 |
|
640 | | - let v01 = p1.sub(&p0).mul(b1); |
641 | | - let v02 = p2.sub(&p0).mul(b2); |
642 | | - let v03 = p3.sub(&p0).mul(b3); |
| 643 | + let v01 = p1.sub(p0).mul(b1); |
| 644 | + let v02 = p2.sub(p0).mul(b2); |
| 645 | + let v03 = p3.sub(p0).mul(b3); |
643 | 646 | v01.add(&v02).add(&v03).mul(1.0 / 2.0) |
644 | 647 | } |
645 | 648 | } |
@@ -678,9 +681,9 @@ where |
678 | 681 | let b2 = 1.0 + 3.0 * t1 + 3.0 * t2 - 3.0 * t3; |
679 | 682 | let b3 = t3; |
680 | 683 |
|
681 | | - let v01 = p1.sub(&p0).mul(b1); |
682 | | - let v02 = p2.sub(&p0).mul(b2); |
683 | | - let v03 = p3.sub(&p0).mul(b3); |
| 684 | + let v01 = p1.sub(p0).mul(b1); |
| 685 | + let v02 = p2.sub(p0).mul(b2); |
| 686 | + let v03 = p3.sub(p0).mul(b3); |
684 | 687 | p0.add(&v01.add(&v02).add(&v03).mul(1.0 / 6.0)) |
685 | 688 | } |
686 | 689 |
|
@@ -708,9 +711,9 @@ where |
708 | 711 | // = b1·P1 + b2·P2 + b3·P3 - b1·P0 - b2·P0 - b3·P0 |
709 | 712 | // = b1·(P1 - P0) + b2·(P2 - P0) + b3·(P3 - P0) |
710 | 713 |
|
711 | | - let v01 = p1.sub(&p0).mul(b1); |
712 | | - let v02 = p2.sub(&p0).mul(b2); |
713 | | - let v03 = p3.sub(&p0).mul(b3); |
| 714 | + let v01 = p1.sub(p0).mul(b1); |
| 715 | + let v02 = p2.sub(p0).mul(b2); |
| 716 | + let v03 = p3.sub(p0).mul(b3); |
714 | 717 | v01.add(&v02).add(&v03).mul(1.0 / 6.0) |
715 | 718 | } |
716 | 719 | } |
|
0 commit comments